1. 16 Dec, 2004 2 commits
    • unknown's avatar
      Enlarged group item key_length by a varstring length field. · afc14126
      unknown authored
      Group item fields are implemented as varstrings nowadays.
      Made init_connect.test robust against existing t1.
      
      
      mysql-test/r/init_connect.result:
        Made init_connect.test robust against existing t1.
      mysql-test/t/init_connect.test:
        Made init_connect.test robust against existing t1.
      sql/sql_select.cc:
        Enlarged group item key_length by a varstring length field.
        Group item fields are implemented as varstrings nowadays.
      afc14126
    • unknown's avatar
      Data truncation reporting implementation (libmysql) + post review · d2d33183
      unknown authored
      fixes. Still to do: 
      -  deploy my_strtoll10 in limbysql.c
      - add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.
      
      
      include/my_time.h:
        More calls are shared between client and server (libmysql now performs
        more intelligent date->number and number->date conversions).
        TODO: rename those which are not starting with 'my_'
      include/mysql.h:
        MYSQL_BIND:
        - more elaborated comment
        - some of the ex-private members were given public names - 
          it's sometimes convenient to set bind->error to &bind->error_value.
          However Monty questions the idea, so it should be given
          more thought in future.
        - added new members to support data truncation.
        Added new return value of mysql_stmt_fetch, MYSQL_DATA_TRUNCATED.
      libmysql/libmysql.c:
        - added support for data truncation during fetch
        - implementation for is_binary_compatible: now conversion functions
          are used less frequently
        - we now use number_to_datetime and TIME_to_ulonglong for date->number and
          number->date conversions
      sql-common/my_time.c:
        - added implementation of date->number and number->date calls shared 
          between client and server (moved from time.cc).
      sql/field.cc:
        - implemented Field_time::store_time() to better support date->time
          conversions in prepared mode. After-review fixes.
      sql/field.h:
        - Field::store_time now returns int
      sql/mysql_priv.h:
        - removed date->number and number->date conversion functions headers
          (moved to my_time.h)
      sql/time.cc:
        - removed implementation of date->number and number->date conversion
          functions (moved to my_time.c)
      tests/client_test.c:
        - added a test case for data truncation; other test cases adjusted.
        - fixed my_process_stmt_result to set STMT_ATTR_UPDATE_MAX_LENGTH (tables
          are now printed out prettier).
      d2d33183
  2. 15 Dec, 2004 3 commits
  3. 14 Dec, 2004 6 commits
  4. 13 Dec, 2004 6 commits
    • unknown's avatar
      Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; · a3b0f750
      unknown authored
      
      BitKeeper/etc/ignore:
        added extra/created_include_files
      extra/Makefile.am:
        Make sure that mysqld_error.h and sql_state.h are not build in the same time.
      extra/comp_err.c:
        Fixed segfault bug
      libmysqld/Makefile.am:
        Added path to mysqld_error.h and sql_state.h
      libmysqld/examples/Makefile.am:
        Added path to mysqld_error.h and sql_state.h
      scripts/make_win_src_distribution.sh:
        Windows version fix
      a3b0f750
    • unknown's avatar
      Added missing errmsg.txt · ee0378e1
      unknown authored
      
      BitKeeper/etc/ignore:
        added extra/sql_state.h
      ee0378e1
    • unknown's avatar
      WL#1051, more maintanable error messages. · 11e8a837
      unknown authored
      
      BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
        Delete: include/mysqld_error.h
      BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
        Delete: include/sql_state.h
      BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
        Delete: sql/share/czech/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
        Delete: sql/share/danish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
        Delete: sql/share/dutch/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
        Delete: sql/share/french/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
        Delete: sql/share/estonian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
        Delete: sql/share/greek/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
        Delete: sql/share/german/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
        Delete: sql/share/english/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
        Delete: sql/share/norwegian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
        Delete: sql/share/italian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
        Delete: sql/share/korean/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
        Delete: sql/share/japanese/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
        Delete: sql/share/hungarian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
        Delete: sql/share/portuguese/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
        Delete: sql/share/polish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
        Delete: sql/share/norwegian-ny/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
        Delete: sql/share/romanian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
        Delete: sql/share/russian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
        Delete: sql/share/serbian/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
        Delete: sql/share/slovak/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
        Delete: sql/share/swedish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
        Delete: sql/share/spanish/errmsg.txt
      BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
        Delete: sql/share/ukrainian/errmsg.txt
      client/Makefile.am:
        Added pass to mysqld_error.j and sql_state.h
      extra/Makefile.am:
        Added rules to create mysqld_error.h and sql_state.h
      extra/comp_err.c:
        WL#1051
      include/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      libmysql/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      libmysql_r/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      server-tools/instance-manager/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      sql/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      sql/share/Makefile.am:
        Removed unnecessary loop over all languages; addred rule to creat <lang>.sys files
      tools/Makefile.am:
        Added pass to mysqld_error.h and sql_state.h
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      11e8a837
    • unknown's avatar
      Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061). · 5d32e21d
      unknown authored
      
      sql/ha_innodb.cc:
        Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
        It cant be put on commit because ALTER TABLE will commit on every 10000 rows.
        Therefore, this change must be done when a new temporary table is created
        in the ALTER TABLE.
      5d32e21d
    • unknown's avatar
      flush_read_lock_kill-master.opt: · 12515b76
      unknown authored
        don't make non-debug builds fail the testsuite
      
      
      mysql-test/t/flush_read_lock_kill-master.opt:
        don't make non-debug builds fail the testsuite
      12515b76
    • unknown's avatar
      Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061). · d6eb313c
      unknown authored
      
      
      sql/ha_innodb.cc:
        Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
        If AUTO_INCREMENT is given in the ALTER TABLE, this value is now set
        to the auto increment value of the table if the new value is creater or 
        equal than the current value of the auto increment value. If the new value
        is less than the old value no error message is given and the old value 
        is not changed.
      d6eb313c
  5. 12 Dec, 2004 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bc520ff4
      unknown authored
      into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
      
      bc520ff4
    • unknown's avatar
      fix autobuild failures · 1cfe221b
      unknown authored
      
      server-tools/instance-manager/buffer.cc:
        fix typo
      server-tools/instance-manager/commands.cc:
        get rid of compiler warnings
      server-tools/instance-manager/guardian.cc:
        fix compiler warning
      server-tools/instance-manager/instance.cc:
        fix warnings
      server-tools/instance-manager/instance_map.cc:
        fix return value
      server-tools/instance-manager/instance_map.h:
        fix problem, caused autobuild failure. Looks like a gcc problem - 
        "friend class <name>" doesn't work if specified before enclosed class
        <name> (this is not present in newer gcc versions)
      1cfe221b
    • unknown's avatar
      Fix test results that may change from run to run · ea3e27ef
      unknown authored
      Added comments (from code review on pull)
      
      
      mysql-test/r/heap.result:
        Fix results that may change from run to run
      mysql-test/r/ps_5merge.result:
        Fix wrong result
      mysql-test/t/heap.test:
        Make results predictable
      sql/sql_show.cc:
        Add comments
        Fixed typo
      ea3e27ef
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b1d2c648
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      b1d2c648
  6. 10 Dec, 2004 6 commits
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b051075
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
      
      1b051075
    • unknown's avatar
      fix according to review · 7bebde1f
      unknown authored
      7bebde1f
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · d7516bd6
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      d7516bd6
    • unknown's avatar
      InnoDB: Reduce the stack space consumption of ON UPDATE CASCADE · 19798cf7
      unknown authored
      operations.
      
      
      innobase/include/lock0lock.h:
        Added lock_clust_rec_read_check_and_lock_alt(),
        a variant of lock_clust_rec_read_check_and_lock()
        without the parameter "offsets".
      innobase/lock/lock0lock.c:
        Added lock_clust_rec_read_check_and_lock_alt(),
        a variant of lock_clust_rec_read_check_and_lock()
        without the parameter "offsets".
      innobase/row/row0ins.c:
        row_ins_foreign_check_on_constraint(): Do not allocate offsets
        from stack. This reduces the stack space consumption of
        ON UPDATE CASCADE operations by 400 bytes per cascaded UPDATE
        operation.
      19798cf7
    • unknown's avatar
      Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges · 09a44a23
      unknown authored
      mysqldump skips information_schema db
      'use' now can use information_schema db
      changed value of column 'Null' to 'NO' if column is not nullable
      
      
      client/mysqldump.c:
        mysqldump skips information_schema db
      mysql-test/r/alter_table.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/create.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ctype_collate.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ctype_recoding.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ctype_ujis.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/drop.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/func_sapdb.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/func_time.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/gis.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/information_schema.result:
        Added couple of tests
      mysql-test/r/information_schema_inno.result:
        Removed coulmn 'CONTRAINT_METOD' from TABLE_CONSTRAINTS
        Added column 'POSITION_IN_UNIQUE_CONSTRAINT' to KEY_COLUMN_USAGE
      mysql-test/r/innodb.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ndb_autodiscover.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/ps_1general.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/rpl000009.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/rpl_create_database.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/schema.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/select.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/show_check.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/sp.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/type_enum.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/r/type_ranges.result:
        changed value of column 'Null' to 'NO' if column is not nullable
      mysql-test/t/information_schema.test:
        Added couple of tests
      sql/sql_acl.cc:
        Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
      sql/sql_db.cc:
        'use' now can use information_schema db
      sql/sql_show.cc:
        code cleanup
        informaton_schema(IS) db now contains data about IS itself
      sql/sql_yacc.yy:
        A fix(wrong behavour of 'SHOW COLUMNS, SHOW KEYS' with 'where condition')
      09a44a23
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 87d2717b
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      87d2717b
  7. 09 Dec, 2004 9 commits
    • unknown's avatar
      instance.cc: · 026857d7
      unknown authored
        explicit setting of reconnect (no behaviour change)
      
      
      server-tools/instance-manager/instance.cc:
        explicit setting of reconnect (no behaviour change)
      026857d7
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 912e3967
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      912e3967
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0ed34ab5
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      
      client/mysqltest.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      tests/client_test.c:
        Auto merged
      0ed34ab5
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · d4aed64f
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      d4aed64f
    • unknown's avatar
      Changing the default of libmysqlclient : it's now NO reconnection. · 846f5af8
      unknown authored
      All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
      made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
      All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
      and fixes BUG#2555.
      
      
      VC++Files/libmysqltest/mytest.c:
        explicit mention of reconnect (no behaviour change)
      VC++Files/mysqlmanager/mysqlmanagerview.cpp:
        explicit mention of reconnect (no behaviour change)
      VC++Files/test1/mysql_thr.c:
        explicit mention of reconnect (no behaviour change)
      VC++Files/winmysqladmin/main.cpp:
        explicit mention of reconnect (no behaviour change)
      client/mysql.cc:
        explicit mention of reconnect if embedded (no behaviour change)
      client/mysqladmin.cc:
        explicit mention of reconnect (no behaviour change)
      client/mysqlbinlog.cc:
        explicit mention of reconnect (no behaviour change)
      client/mysqlcheck.c:
        explicit mention of reconnect (no behaviour change)
      client/mysqlimport.c:
        explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
        and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
        does LOCK TABLES where we mustn't reconnect...
      client/mysqlshow.c:
        explicit mention of reconnect (no behaviour change)
      client/mysqltest.c:
        explicit mention of reconnect (no behaviour change).
        Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
        but 5.0 is too touchy to change it now. I'm marking it TODO.
      libmysql/libmysql.c:
        explicit mention of reconnect (no behaviour change)
      libmysqld/examples/builder-sample/emb_samples.cpp:
        explicit mention of reconnect (no behaviour change)
      ndb/test/ndbapi/flex_bench_mysql.cpp:
        explicit mention of reconnect (no behaviour change)
      ndb/tools/restore/consumer_restorem.cpp:
        explicit mention of reconnect (no behaviour change)
      sql-common/client.c:
        Changing the default of libmysqlclient : it's now NO reconnection.
      sql/repl_failsafe.cc:
        explicit mention of reconnect (no behaviour change)
      sql/slave.cc:
        explicit mention of reconnect (no behaviour change)
      tests/client_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/connect_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/deadlock_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/insert_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/list_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/select_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/showdb_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/ssl_test.c:
        explicit mention of reconnect (no behaviour change)
      tests/thread_test.c:
        explicit mention of reconnect (no behaviour change)
      tools/mysqlmanager.c:
        explicit mention of reconnect (no behaviour change)
      846f5af8
    • unknown's avatar
      InnoDB: Changed interface to rec_get_offsets(), to reduce the use of · 49cc60c6
      unknown authored
      memory heaps.  This changeset plugs also a few memory leaks that
      were introduced with the compact InnoDB table format.
      
      
      innobase/btr/btr0btr.c:
        Changed interface to rec_get_offsets()
      innobase/btr/btr0cur.c:
        Changed interface to rec_get_offsets()
      innobase/btr/btr0pcur.c:
        Changed interface to rec_get_offsets()
      innobase/btr/btr0sea.c:
        Changed interface to rec_get_offsets()
      innobase/include/rem0rec.h:
        Changed interface to rec_get_offsets()
      innobase/include/rem0rec.ic:
        Changed interface to rec_get_offsets()
      innobase/lock/lock0lock.c:
        Changed interface to rec_get_offsets()
      innobase/page/page0cur.c:
        Changed interface to rec_get_offsets()
      innobase/page/page0page.c:
        Changed interface to rec_get_offsets()
      innobase/rem/rem0rec.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0ins.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0mysql.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0purge.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0row.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0sel.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0umod.c:
        Changed interface to rec_print()
      innobase/row/row0undo.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0upd.c:
        Changed interface to rec_get_offsets()
      innobase/row/row0vers.c:
        Changed interface to rec_get_offsets()
      innobase/trx/trx0rec.c:
        Changed interface to rec_get_offsets()
      49cc60c6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 35da65a8
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      35da65a8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b72dee6b
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im/mysql-5.0-im
      
      b72dee6b
    • unknown's avatar
      merge · e90509b8
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      server-tools/instance-manager/mysqlmanager.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      e90509b8
  8. 08 Dec, 2004 4 commits