1. 10 Dec, 2004 2 commits
    • unknown's avatar
      fix according to review · 6bcee4f1
      unknown authored
      6bcee4f1
    • unknown's avatar
      Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges · c7d7c9ca
      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')
      c7d7c9ca
  2. 09 Dec, 2004 8 commits
    • unknown's avatar
      instance.cc: · 6f8ca251
      unknown authored
        explicit setting of reconnect (no behaviour change)
      
      
      server-tools/instance-manager/instance.cc:
        explicit setting of reconnect (no behaviour change)
      6f8ca251
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2fb4a502
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      
      2fb4a502
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · a5286aa9
      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
      a5286aa9
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · eed23437
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      
      eed23437
    • unknown's avatar
      Changing the default of libmysqlclient : it's now NO reconnection. · 40c2a887
      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)
      40c2a887
    • unknown's avatar
      InnoDB: Changed interface to rec_get_offsets(), to reduce the use of · 7945222c
      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()
      7945222c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 89e77b65
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im/mysql-5.0-im
      
      
      89e77b65
    • unknown's avatar
      merge · f7ef17dd
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      server-tools/instance-manager/mysqlmanager.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      f7ef17dd
  3. 08 Dec, 2004 6 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 04ddb612
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-5000
      
      
      04ddb612
    • unknown's avatar
      A fix for a crash in sp.test with -debug-max. · b80db00e
      unknown authored
      When the joins were not cleaned up before the tables
      were closed, a JOIN_TAB still held a pointer to a
      meanwhile closed table and tried to close it again
      during item cleanup...
      
      
      b80db00e
    • unknown's avatar
      InnoDB: Make btr_search_drop_page_hash_index() work with the compact · f9bd116c
      unknown authored
      record format without requiring the doubly linked list added by
      Heikki in ChangeSet@1.1627.16.2
      
      
      innobase/btr/btr0sea.c:
        btr_search_drop_page_hash_index(): support the compact record format
      innobase/ibuf/ibuf0ibuf.c:
        ibuf_insert_to_index_page(): Remove unnecessary computation of
        field offsets.
      innobase/row/row0ins.c:
        row_ins_index_entry_low(): Remove unnecessary computation of
        field offsets.
      f9bd116c
    • unknown's avatar
      Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20041027124510|04970 · 746799fb
      unknown authored
      
      innobase/btr/btr0sea.c:
        Exclude
      innobase/buf/buf0buf.c:
        Exclude
      innobase/buf/buf0lru.c:
        Exclude
      innobase/ha/ha0ha.c:
        Exclude
      innobase/include/buf0buf.h:
        Exclude
      innobase/include/ha0ha.h:
        Exclude
      innobase/include/hash0hash.h:
        Exclude
      746799fb
    • unknown's avatar
      row0mysql.c: · ff2c115b
      unknown authored
        Remove parameter from call to btr_search_validate().
      buf0buf.c:
        Initialize member "index" of buf_block_t.
      buf0buf.h:
        Add member "index" to buf_block_t.
      btr0sea.h:
        Remove parameter of btr_search_validate()
      btr0sea.c:
        Make use of the added member "index" of buf_block_t.
      
      
      innobase/btr/btr0sea.c:
        Make use of the added member "index" of buf_block_t.
      innobase/include/btr0sea.h:
        Remove parameter of btr_search_validate()
      innobase/include/buf0buf.h:
        Add member "index" to buf_block_t.
      innobase/buf/buf0buf.c:
        Initialize member "index" of buf_block_t.
      innobase/row/row0mysql.c:
        Remove parameter from call to btr_search_validate().
      ff2c115b
    • unknown's avatar
      - VARCHAR(n) with binary character set is now displayed as VARBINARY(N). · 22b16624
      unknown authored
      - CREATE TABLE t1 SELECT BINARY 'literal'
        now creates a VARBINARY() column, not a BINARY().
      
      
      22b16624
  4. 07 Dec, 2004 4 commits
    • unknown's avatar
      Added some tests for new varchar. · 3a994c8a
      unknown authored
      3a994c8a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d11d6d69
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      configure.in:
        Auto merged
      sql/handler.h:
        Auto merged
      d11d6d69
    • unknown's avatar
      Update results for new varchar handling · 9ca50fe1
      unknown authored
      Fixed compiler warnings
      String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      
      
      myisam/myisampack.c:
        Indentation cleanup
      mysql-test/r/analyse.result:
        Update results for new varchar handling
      mysql-test/r/case.result:
        Update results for new varchar handling
      mysql-test/r/cast.result:
        Update results for new varchar handling
      mysql-test/r/create.result:
        Update results for new varchar handling
      mysql-test/r/ctype_mb.result:
        Update results for new varchar handling
      mysql-test/r/ctype_ucs.result:
        Update results for new varchar handling
      mysql-test/r/ctype_utf8.result:
        Update results for new varchar handling
      mysql-test/r/func_group.result:
        Update results for new varchar handling
      mysql-test/r/func_str.result:
        Update results for new varchar handling
      mysql-test/r/func_system.result:
        Update results for new varchar handling
      mysql-test/r/heap.result:
        Update results for new varchar handling
      mysql-test/r/heap_hash.result:
        Update results for new varchar handling
      mysql-test/r/information_schema.result:
        Update results for new varchar handling
      mysql-test/r/metadata.result:
        Update results for new varchar handling
      mysql-test/r/null.result:
        Update results for new varchar handling
      mysql-test/r/ps_2myisam.result:
        Update results for new varchar handling
      mysql-test/r/ps_3innodb.result:
        Update results for new varchar handling
      mysql-test/r/ps_4heap.result:
        Update results for new varchar handling
      mysql-test/r/ps_5merge.result:
        Update results for new varchar handling
      mysql-test/r/ps_6bdb.result:
        Update results for new varchar handling
      mysql-test/r/subselect.result:
        Update results for new varchar handling
      mysql-test/r/type_ranges.result:
        Update results for new varchar handling
      mysql-test/r/union.result:
        Update results for new varchar handling
      mysql-test/t/heap.test:
        Update results for new varchar handling
      mysql-test/t/type_ranges.test:
        Added extra test to test generated type for string functions
      sql/field.cc:
        Update results for new varchar handling
      sql/field.h:
        Update results for new varchar handling
        We have to use orig_table instead of table as 'table' may point to a new field in the created table
      sql/field_conv.cc:
        Update results for new varchar handling
      sql/ha_heap.cc:
        Indentation fixes
      sql/ha_innodb.cc:
        Update results for new varchar handling
      sql/item.cc:
        Update results for new varchar handling
        Remove compiler warnings
        String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      sql/item.h:
        Update results for new varchar handling
      sql/item_func.cc:
        Update results for new varchar handling
        String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      sql/item_func.h:
        ANALYZE now return VARCHAR columns
      sql/procedure.h:
        Update results for new varchar handling
      sql/sql_acl.cc:
        After merge fixes
      sql/sql_select.cc:
        Update results for new varchar handling
        String results in temporary tables are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
      sql/sql_show.cc:
        After merge fixes
      sql/sql_table.cc:
        After merge fixes
      strings/ctype-tis620.c:
        After merge fixes
      tests/client_test.c:
        Fixed results, as in MySQL 5.0 strings in CREATE ... SELECT are creates VARCHAR columns
      9ca50fe1
    • unknown's avatar
      Fixes for changes in handler interface so that tina can compile in 5.0. · c4cc1173
      unknown authored
      
      sql/examples/ha_tina.cc:
        Fixes for changes to handler interface.
      c4cc1173
  5. 06 Dec, 2004 13 commits
    • unknown's avatar
      Removed the need for our own sanity check file (which was just the default anyways). · 3a5f7eab
      unknown authored
      
      BitKeeper/deleted/.del-sanity.m4~bce40721a813daac:
        Delete: config/ac-macros/sanity.m4
      configure.in:
        Removed the need for our own sanity check.
      3a5f7eab
    • unknown's avatar
      Merge with new VARCHAR code · 8379b61e
      unknown authored
      
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Auto merged
      BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      heap/hp_create.c:
        Auto merged
      heap/hp_delete.c:
        Auto merged
      heap/hp_hash.c:
        Auto merged
      heap/hp_write.c:
        Auto merged
      include/decimal.h:
        Auto merged
      include/m_ctype.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      myisam/mi_write.c:
        Auto merged
      mysql-test/r/ctype_tis620.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/endspace.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      mysql-test/t/type_blob.test:
        Auto merged
      ndb/src/common/util/NdbSqlUtil.cpp:
        Auto merged
      scripts/mysql_fix_privilege_tables.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/structs.h:
        Auto merged
      sql/table.cc:
        Auto merged
      strings/ctype-czech.c:
        Auto merged
      strings/ctype-uca.c:
        Auto merged
      strings/ctype-utf8.c:
        Auto merged
      strings/ctype-win1250ch.c:
        Auto merged
      strings/decimal.c:
        Auto merged
      tests/client_test.c:
        Auto merged
      mysql-test/r/bdb.result:
        Merge with VARCHAR code
      mysql-test/r/heap.result:
        Merge with VARCHAR code
      mysql-test/r/innodb.result:
        Merge with VARCHAR code
      mysql-test/r/select.result.es:
        Merge with VARCHAR code
      mysql-test/t/bdb.test:
        Merge with VARCHAR code
      mysql-test/t/heap.test:
        Merge with VARCHAR code
      mysql-test/t/innodb.test:
        Merge with VARCHAR code
      sql/field.cc:
        Merge with VARCHAR code
      sql/item.cc:
        Merge with VARCHAR code
      sql/sql_acl.cc:
        Merge with VARCHAR code
      sql/sql_parse.cc:
        Merge with VARCHAR code
      sql/sql_table.cc:
        Merge with VARCHAR code
      sql/sql_update.cc:
        Merge with VARCHAR code
      sql/table.h:
        Merge with VARCHAR code
      strings/ctype-mb.c:
        Don't pad my_like_range with max_str for simple LIKE expression
      strings/ctype-tis620.c:
        Merge with VARCHAR code
      strings/ctype-ucs2.c:
        Added new argument to my_strnncollsp_ucs2()
        Simply code
      8379b61e
    • unknown's avatar
      Merge · e0dad055
      unknown authored
      
      sql/handler.h:
        Auto merged
      e0dad055
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 19a95482
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      19a95482
    • unknown's avatar
      After merge fixes · a1fba2da
      unknown authored
      Fixed compiler warnings
      Fix core dump when sending SIGHUP to mysqld
      
      
      mysql-test/r/drop_temp_table.result:
        After merge fixes
      mysql-test/r/grant.result:
        After merge fixes
      mysql-test/r/group_min_max.result:
        After merge fixes
      mysql-test/r/innodb.result:
        After merge fixes
      mysql-test/r/insert_select.result:
        After merge fixes
      mysql-test/r/rpl_charset.result:
        After merge fixes
      mysql-test/r/rpl_create_database.result:
        After merge fixes
      mysql-test/r/rpl_loaddata_rule_m.result:
        After merge fixes
      mysql-test/t/rpl_charset.test:
        After merge fixes
      mysql-test/t/rpl_create_database.test:
        After merge fixes
      sql-common/client.c:
        After merge fixes
      sql/item.cc:
        After merge fixes
      sql/mysqld.cc:
        Fix core dump when sending SIGHUP to mysqld
      sql/sql_acl.cc:
        Better comment
      sql/sql_derived.cc:
        Fixed comment
        Added missing DBUG_RETURN
      sql/sql_insert.cc:
        Fixed compiler warnings
        After merge fixes
      sql/sql_lex.cc:
        After merge fixes
        Removed compiler warnings
      sql/sql_parse.cc:
        After merge fixes
      sql/sql_select.cc:
        More debugging
      sql/sql_table.cc:
        Added missing DBUG_VOID_RETURN
      sql/sql_update.cc:
        Fixed compiler warning
      sql/sql_view.cc:
        Added missing DBUG_RETURN
        Fixed compiler warnings
        Added flag to signal that the view is a derived table
      a1fba2da
    • unknown's avatar
      int decimal_is_zero(decimal *from); · a4a69f73
      unknown authored
      a4a69f73
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 399e2ae3
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      399e2ae3
    • unknown's avatar
      strings/decimal.c · 66531aa4
      unknown authored
          handle test_ro(".999", 0, HALF_UP, "1");
      
      
      strings/decimal.c:
        handle test_ro(".999", 0, HALF_UP, "1");
      66531aa4
    • unknown's avatar
      Merge with 4.1 · 796bd7de
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BUILD/SETUP.sh:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      configure.in:
        Auto merged
      innobase/include/lock0lock.h:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/r/lowercase_table3.result:
        Auto merged
      mysql-test/r/rpl_start_stop_slave.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/rpl_until.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_myisam.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_rename.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/log_event.cc:
        Merge with 4.1
        Trivial cleanup
      796bd7de
    • unknown's avatar
      Removed need for storage engines to write a default external_lock() call. · 9740a876
      unknown authored
      
      sql/examples/ha_archive.cc:
        Removed external_lock call (no longer needed, we can now use the default).
      sql/examples/ha_archive.h:
        No need for an external_lock() call.
      sql/handler.h:
        Added default return value for external_lock().
      9740a876
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8b7b9326
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      8b7b9326
    • unknown's avatar
      Fix for bugs #6955 SHOW PROCEDURE STATUS crashes the server, · bbdb2d28
      unknown authored
      #6950 mysql-nt.exe error when click on sql or database on mysql control center
      
      
      bbdb2d28
    • unknown's avatar
      Add support for up to VARCHAR (size up to 65535) · a8ea31fa
      unknown authored
      Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
      Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
      Added support for VARCHAR KEYS to heap
      Removed support for ISAM
      Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
      Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
      
      
      BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
        Delete: sql/ha_isam.cc
      BitKeeper/deleted/.del-_cache.c~b5d80b5c3ae233b1:
        Delete: isam/_cache.c
      BitKeeper/deleted/.del-_dbug.c~88d7964ae5e3c9bd:
        Delete: isam/_dbug.c
      BitKeeper/deleted/.del-_dynrec.c~48dd758f5a5450df:
        Delete: isam/_dynrec.c
      BitKeeper/deleted/.del-_key.c~ce62d47a6c681084:
        Delete: isam/_key.c
      BitKeeper/deleted/.del-_locking.c~dea4cdc6ea425c67:
        Delete: isam/_locking.c
      BitKeeper/deleted/.del-_packrec.c~47ae1b16c007e9be:
        Delete: isam/_packrec.c
      BitKeeper/deleted/.del-_page.c~148b1a613d052ee8:
        Delete: isam/_page.c
      BitKeeper/deleted/.del-_search.c~f509292aa1ff18ff:
        Delete: isam/_search.c
      BitKeeper/deleted/.del-_statrec.c~58d9263b3475d58b:
        Delete: isam/_statrec.c
      BitKeeper/deleted/.del-changed.c~d075de80a314b02d:
        Delete: isam/changed.c
      BitKeeper/deleted/.del-close.c~fd62629496ee5bcc:
        Delete: isam/close.c
      BitKeeper/deleted/.del-create.c~96cecc433c0c2242:
        Delete: isam/create.c
      BitKeeper/deleted/.del-delete.c~65ee8daaa75a14b6:
        Delete: isam/delete.c
      BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
        Delete: isam/extra.c
      BitKeeper/deleted/.del-info.c~96cfb747af8da0d:
        Delete: isam/info.c
      BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
        Delete: isam/isamchk.c
      BitKeeper/deleted/.del-isamlog.c~85b6b31c6e2b8519:
        Delete: isam/isamlog.c
      BitKeeper/deleted/.del-log.c~55a973013d55cade:
        Delete: isam/log.c
      BitKeeper/deleted/.del-open.c~95b3b75042fae00a:
        Delete: isam/open.c
      BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
        Delete: isam/pack_isam.c
      BitKeeper/deleted/.del-panic.c~f7fd71605324f8f3:
        Delete: isam/panic.c
      BitKeeper/deleted/.del-range.c~142f1f8ac4948082:
        Delete: isam/range.c
      BitKeeper/deleted/.del-rfirst.c~66f494291dc005d3:
        Delete: isam/rfirst.c
      BitKeeper/deleted/.del-rkey.c~cc54c6498352f999:
        Delete: isam/rkey.c
      BitKeeper/deleted/.del-rlast.c~d1fe1866139e9866:
        Delete: isam/rlast.c
      BitKeeper/deleted/.del-rnext.c~b308eaa1e11ea7de:
        Delete: isam/rnext.c
      BitKeeper/deleted/.del-rprev.c~b359f71fdea4bbce:
        Delete: isam/rprev.c
      BitKeeper/deleted/.del-rrnd.c~7fcfcce88d4a5200:
        Delete: isam/rrnd.c
      BitKeeper/deleted/.del-rsame.c~75a62d5548103a15:
        Delete: isam/rsame.c
      BitKeeper/deleted/.del-rsamepos.c~5b5652dd2cda6d5d:
        Delete: isam/rsamepos.c
      BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
        Delete: isam/sort.c
      BitKeeper/deleted/.del-static.c~3a1354b84f4a9cc7:
        Delete: isam/static.c
      BitKeeper/deleted/.del-test1.c~64d52e9412d457ed:
        Delete: isam/test1.c
      BitKeeper/deleted/.del-test2.c~2f9a632cab572958:
        Delete: isam/test2.c
      BitKeeper/deleted/.del-test3.c~e8a7a4afe8a087:
        Delete: isam/test3.c
      BitKeeper/deleted/.del-isamdef.h~ac8d49e7e2201c66:
        Delete: isam/isamdef.h
      BitKeeper/deleted/.del-update.c~670264f51dc44934:
        Delete: isam/update.c
      BitKeeper/deleted/.del-write.c~8f1918b1f6770e54:
        Delete: isam/write.c
      BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
        Delete: isam/Makefile.am
      BitKeeper/deleted/.del-make-ccc~3ee55391eda0b0ab:
        Delete: isam/make-ccc
      BitKeeper/deleted/.del-ChangeLog~208984fb7a51e568:
        Delete: isam/ChangeLog
      BitKeeper/deleted/.del-test_all.res~c2aafb49a3a77db7:
        Delete: isam/test_all.res
      BitKeeper/deleted/.del-test_all~93c701e44a9c5b65:
        Delete: isam/test_all
      BitKeeper/deleted/.del-.cvsignore~54f6f0f2d5012561:
        Delete: isam/.cvsignore
      BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
        Delete: sql/ha_isammrg.cc
      BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
        Delete: sql/ha_isam.h
      BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
        Delete: sql/ha_isammrg.h
      acinclude.m4:
        Remove ISAM
      client/mysqldump.c:
        FIELD_TYPE -> MYSQL_TYPE
      client/mysqltest.c:
        Add missing DBUG_RETURN
      configure.in:
        Remove ISAM
      heap/heapdef.h:
        Add support for VARCHAR
      heap/hp_create.c:
        Add support for VARCHAR
      heap/hp_delete.c:
        Add support for VARCHAR
      heap/hp_hash.c:
        Add support for VARCHAR
        (VARCHAR keys was not supported before)
      heap/hp_rkey.c:
        Add support for VARCHAR
      heap/hp_update.c:
        Add support for VARCHAR
      heap/hp_write.c:
        Add support for VARCHAR
        (Added flag SEARCH_UPDATE to mark that this is an update)
      include/decimal.h:
        Remove not needed my_global.h
      include/m_ctype.h:
        Add support for VARCHAR
      include/my_base.h:
        Add support for VARCHAR
      include/my_handler.h:
        Moved general purpose macro from MyISAM code
      include/mysql_com.h:
        Add support for VARCHAR
      libmysql/libmysql.c:
        Add support for VARCHAR
      libmysqld/Makefile.am:
        Removed ISAM
      myisam/ft_static.c:
        Add support for VARCHAR
      myisam/ft_test1.c:
        Add support for VARCHAR
      myisam/ft_update.c:
        Add support for VARCHAR
      myisam/mi_check.c:
        Add support for VARCHAR
      myisam/mi_create.c:
        Add support for VARCHAR
        - VARCHAR key segments are marked with HA_VAR_LENGTH_PART
      myisam/mi_key.c:
        Add support for VARCHAR
        Fixed bug in old VARCHAR code when reading index-only
      myisam/mi_range.c:
        Fixed comment style
      myisam/mi_rnext_same.c:
        Handle case where equal keys can be of different length
      myisam/mi_search.c:
        Add support for VARCHAR
      myisam/mi_test1.c:
        Add support for VARCHAR
      myisam/mi_unique.c:
        Add support for VARCHAR
        (Some new code to handle keys that are equal but have different lengths)
      myisam/mi_write.c:
        Fixed comment
      myisam/myisamchk.c:
        Better infotext if wrong type
      mysql-test/r/bdb.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/create.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/ctype_tis620.result:
        Updated old result and new results for VARCHAR
        (Old code sorted tis620 wrong)
      mysql-test/r/ctype_ucs.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/endspace.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/func_like.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/heap.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/innodb.result:
        Updated old result. This will change a bit when also InnoDB supports VARCHAR
      mysql-test/r/merge.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/myisam.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/mysqldump.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/order_by.result:
        Updated old result and new results for VARCHAR
        (Key length is different for VARCHAR)
      mysql-test/r/ps.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/ps_1general.result:
        Updated results for new .frm version
        Don't print seconds in show full process list as this may change
      mysql-test/r/ps_2myisam.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/ps_3innodb.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/ps_4heap.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/ps_5merge.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/ps_6bdb.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/select.result.es:
        Updated results by hand
      mysql-test/r/select.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/select_found.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/show_check.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/strict.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/subselect.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/system_mysql_db.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/type_blob.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/type_ranges.result:
        Updated old result and new results for VARCHAR
      mysql-test/r/type_ranges.result.es:
        Updated some results by hand
      mysql-test/t/bdb.test:
        Test VARCHAR
      mysql-test/t/ctype_ucs.test:
        Some fixes related to VARCHAR
      mysql-test/t/endspace.test:
        Fixes to make it easier to compare columns with end space
      mysql-test/t/heap.test:
        Test VARCHAR
      mysql-test/t/innodb.test:
        Prepare for testing VARCHAR
      mysql-test/t/myisam.test:
        Test VARCHAR
      mysql-test/t/ps_1general.test:
        Don't show seconds for show processlist
      mysql-test/t/ps_4heap.test:
        Update for VARCHAR
      mysql-test/t/strict.test:
        Fix test for VARCHAR
      mysql-test/t/type_blob.test:
        Update test for VARCHAR
        Note that now you can't store 'a' and 'a ' in an unique varchar/text index if the column is not binary
      mysys/my_handler.c:
        Add support for VARCHAR
      ndb/src/common/util/NdbSqlUtil.cpp:
        Fix for usage of strnncollsp
      scripts/mysql_fix_privilege_tables.sh:
        Simple fix so that my_print_defaults works
      sql/Makefile.am:
        Remove ISAM
      sql/field.cc:
        Add support for VARCHAR
        Fixed the keys for blob's are compared with strnncollsp
        Ensure that old tables from MySQL 4.0 works as they did before.
        (Old VARCHAR will be converted to new VARCHAR on ALTER TABLE)
      sql/field.h:
        Add support for VARCHAR
      sql/field_conv.cc:
        Change FIELD_TYPE_VAR_STRING -> MYSQL_TYPE_VARCHAR
        Added usage of HA_KEY_BLOB_LENGTH
      sql/ha_berkeley.cc:
        Add support for VARCHAR
        Added usage of table->insert_or_update if we would ever want to know in key_cmp if we are changing keys
      sql/ha_heap.cc:
        Add support for VARCHAR
      sql/ha_innodb.cc:
        Changed MYSQL_TYPE_VAR_STRING to MYSQL_TYPE_VARCHAR.
        Waiting for Heikki to add full VARCHAR support
      sql/ha_innodb.h:
        InnoDB doesn't support full VARCHAR yet
      sql/ha_myisam.cc:
        Add support for VARCHAR
      sql/ha_ndbcluster.cc:
        Add support for VARCHAR
      sql/handler.h:
        Added HA_NO_VARCHAR for table handler that doesn't support VARCHAR. In this case MySQL will create a normal CHAR instead
      sql/item.cc:
        Fixed access of already freed memory
        Added support of VARCHAR
        - varchar length is now checked in mysql_prepare
      sql/item_cmpfunc.cc:
        Added new parameter to strncollsp
      sql/item_sum.cc:
        Added new parameter to strncollsp
        FIELD_TYPE -> MYSQL_TYPE
      sql/key.cc:
        Add support for VARCHAR
      sql/opt_range.cc:
        Remove character set parameter from set_key_image()
      sql/opt_sum.cc:
        Remove character set parameter from set_key_image()
      sql/protocol.cc:
        Return MYSQL_TYPE_VAR_STRING instead of MYSQL_TYPE_VARCHAR to clients (to not cause compatiblity problems)
      sql/sql_acl.cc:
        Change key handling code so that we can use CHAR or VARCHAR for the user table columns
      sql/sql_base.cc:
        Remove old, not used code
      sql/sql_help.cc:
        Remove charset from get_key_image
      sql/sql_parse.cc:
        Ensure that OPTION_TABLE_LOCK is cleared ASAP; This fixed a problem in BDB transaction code when one used LOCK TABLES on a BDB table
        Added support for VARCHAR
        Moved field length checking and VARCHAR -> TEXT convert to mysql_prepare (as we need the know the character set for the column)
      sql/sql_select.cc:
        Added support of VARCHAR
        Added heuristic to use fixed size rows for tmp tables if we are using only a few short VARCHAR's
      sql/sql_string.cc:
        Added extra argument to strnncollsp
      sql/sql_table.cc:
        Add support for VARCHAR
        Automaticly convert (with warning) big VARCHAR (but not CHAR) to TEXT
        If handler doesn't support VARCHAR convert VARCHAR to CHAR
      sql/sql_update.cc:
        Fixed compiler warning
      sql/sql_yacc.yy:
        Add support for VARCHAR
      sql/strfunc.cc:
        Fixed valgrind warning
      sql/structs.h:
        Added 'table' to KEY structure to make life easier for some handler functions
      sql/table.cc:
        Add support for VARCHAR
        - New .frm version
        - FIELD_TYPE -> MYSQL_TYPE
      sql/table.h:
        Added insert_or_update; A bool flag a handler can set/reset if needed (for handler internal usage)
      sql/unireg.h:
        Add support for VARCHAR
      strings/ctype-big5.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-bin.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
      strings/ctype-czech.c:
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-gbk.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-latin1.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
      strings/ctype-mb.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-simple.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-sjis.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-tis620.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-uca.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
      strings/ctype-ucs2.c:
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/ctype-utf8.c:
        Added new argument to strnncollsp() to allow one to define if end space are significant or not
      strings/ctype-win1250ch.c:
        Changed my_like_range... to correctly calculate min_length & max_length
      strings/decimal.c:
        Fixed include files usage
        Fixed some compiler warnings
      tests/client_test.c:
        Ensure tests works with VARCHAR
      a8ea31fa
  6. 05 Dec, 2004 1 commit
    • unknown's avatar
      Fix test results · 289d3b2e
      unknown authored
      
      mysql-test/r/index_merge_ror_cpk.result:
        Portability fix
      mysql-test/r/innodb.result:
        Update results
      mysql-test/t/index_merge_ror_cpk.test:
        Portability fix
      289d3b2e
  7. 04 Dec, 2004 4 commits
    • unknown's avatar
      Fixing problem with case insitive file systems. · 623c7338
      unknown authored
      Would you believe that I wrote all of this on a Mac? I just happen to be not using HFS for the partition I did this work on. Oops :)
      
      
      config/ac-macros/alloca.m4:
        mvdir
      config/ac-macros/character_sets.m4:
        mvdir
      config/ac-macros/check_cpu.m4:
        mvdir
      config/ac-macros/compiler_flag.m4:
        mvdir
      config/ac-macros/ha_archive.m4:
        mvdir
      config/ac-macros/ha_berkeley.m4:
        mvdir
      config/ac-macros/ha_example.m4:
        mvdir
      config/ac-macros/ha_innodb.m4:
        mvdir
      config/ac-macros/ha_isam.m4:
        mvdir
      config/ac-macros/ha_ndbcluster.m4:
        mvdir
      config/ac-macros/ha_tina.m4:
        mvdir
      config/ac-macros/large_file.m4:
        mvdir
      config/ac-macros/misc.m4:
        mvdir
      config/ac-macros/mysqlfs.m4:
        mvdir
      config/ac-macros/openssl.m4:
        mvdir
      config/ac-macros/readline.m4:
        mvdir
      config/ac-macros/sanity.m4:
        mvdir
      config/ac-macros/zlib.m4:
        mvdir
      configure.in:
        Fix silly little problem with case insensitive filesystems.
        
        Funny thing is that I wrote all this on a Mac, but I don't use HFS on that partition so I never noticed that it would be an issue.
        
        Oops :)
      623c7338
    • unknown's avatar
      ndb: fix solaris (etc) ndb startup problem in mysql-test-run · f8cdf570
      unknown authored
      
      ndb/src/common/util/NdbOut.cpp:
        avoid printf("%s", (char*)0)
      f8cdf570
    • unknown's avatar
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0/ · 107ef617
      unknown authored
      into avenger.(none):/export/brian/mysql/acinclude-5.0
      
      
      107ef617
  8. 03 Dec, 2004 2 commits