1. 13 Dec, 2004 1 commit
  2. 12 Dec, 2004 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b9520662
      unknown authored
      into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
      
      
      b9520662
    • unknown's avatar
      fix autobuild failures · 596876f9
      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)
      596876f9
    • unknown's avatar
      Fix test results that may change from run to run · 5ae35e32
      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
      5ae35e32
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 47c39015
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      47c39015
  3. 10 Dec, 2004 7 commits
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 57867f07
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
      
      
      57867f07
    • unknown's avatar
      fix according to review · 6bcee4f1
      unknown authored
      6bcee4f1
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9d946e8a
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      
      9d946e8a
    • unknown's avatar
      InnoDB: Reduce the stack space consumption of ON UPDATE CASCADE · 0404a607
      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.
      0404a607
    • 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
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · c418ae98
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      c418ae98
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3a2d0371
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      3a2d0371
  4. 09 Dec, 2004 11 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 · 450ac341
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      450ac341
    • unknown's avatar
      Content merge. · 101fdd4e
      unknown authored
      
      innobase/include/lock0lock.h:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/handler.h:
        content merge.
      101fdd4e
    • unknown's avatar
      Added support for a LOCK TABLES...WHERE ENGINE = InnoDB query which sets · 0f99fe72
      unknown authored
      transactional table locks to tables mentioned in the query. These locks
      are released at the end of the transaction automatically.
      This is fix for bugs #5655, #5998 and issue #3762.
      
      
      
      
      innobase/include/lock0lock.h:
        Added a new lock type LOCK_TABLE_TRANSACTIONAL.
      innobase/include/trx0trx.h:
        Added a varible to store the number of transactional table locks
        reserved by the transaction and stored in the trx_locks list.
      innobase/lock/lock0lock.c:
        Added a lock type LOCK_TABLE_TRANSACTIONAL.
      innobase/row/row0mysql.c:
        Added support for a transactional table lock.
      innobase/trx/trx0roll.c:
        Make compiler happy and format function.
      innobase/trx/trx0trx.c:
        Added information about number of explicit and transactional table locks in
        the innodb monitor.
      sql/ha_innodb.cc:
        Added support for a LOCK_TABLE_TRANSACTIONAL table lock (SQLCOM_LOCK_TABLES_TRANSACTIONAL).
        Transactional table locks are taken in the function ::transactional_table_lock().
      sql/ha_innodb.h:
        Added prototype for a function trandactional_table_lock().
      sql/handler.h:
        Added prototype for a virtual function transactional_table_lock().
        Handler does not need to implement this function.
      sql/lock.cc:
        Added a function transactional_lock_tables() to lock all tables in the list
        with transactional table lock. These locks can cause a deadlock and
        this error should be reported back to user.
      sql/mysql_priv.h:
        Added prototype for a function transactional_lock_tables().
      sql/sql_lex.h:
        Added SQLCOM_LOCK_TABLES_TRANSACTIONAL command.
      sql/sql_parse.cc:
        Added SQLCOM_LOCK_TABLES_TRANSACTIONAL command.
      sql/sql_yacc.yy:
        Added parsing rules for a LOCK TABLES...WHERE ENGINE = x;
      0f99fe72
    • 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
  5. 08 Dec, 2004 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0d12a95d
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      0d12a95d
    • 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
  6. 07 Dec, 2004 5 commits
    • unknown's avatar
      Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test · a37b15c6
      unknown authored
      
      client/mysqltest.c:
        More debugging
      mysql-test/t/system_mysql_db_fix.test:
        Fixed that mysql-test-run --ps-protocol works
      a37b15c6
    • 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
  7. 06 Dec, 2004 5 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