1. 19 Dec, 2003 16 commits
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6dbd1030
      unknown authored
      into teton.kitebird.com:/home/paul/mysql-4.1
      
      
      6dbd1030
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · aa2eb815
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      aa2eb815
    • unknown's avatar
      univ.i, ut0ut.h, ut0ut.c: · 6797087d
      unknown authored
        On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64
      
      
      innobase/ut/ut0ut.c:
        On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64
      innobase/include/ut0ut.h:
        On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64
      innobase/include/univ.i:
        On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64
      6797087d
    • unknown's avatar
      merge with lex pointer change patch · 4e8c3810
      unknown authored
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      4e8c3810
    • unknown's avatar
      Fixed memory overrun bug in DELETE ... ORDER BY · 7592a736
      unknown authored
      7592a736
    • unknown's avatar
      THD::lex now points to THD::main_lex like in 5.0 · 8d987f9e
      unknown authored
      All tests pass (client_test included)
      
      
      libmysqld/lib_sql.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/filesort.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/ha_innodb.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/ha_myisam.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_cmpfunc.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_create.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_func.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_subselect.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/item_sum.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/mysql_priv.h:
        THD::lex now points to THD::main_lex like in 5.0
      sql/mysqld.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/protocol.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/repl_failsafe.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/slave.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_acl.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_base.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_cache.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_class.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_class.h:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_delete.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_error.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_insert.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_lex.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_lex.h:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_parse.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_prepare.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_repl.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_select.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_table.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_union.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_update.cc:
        THD::lex now points to THD::main_lex like in 5.0
      sql/sql_yacc.yy:
        THD::lex now points to THD::main_lex like in 5.0
      8d987f9e
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69d65bd8
      unknown authored
      into teton.kitebird.com:/home/paul/mysql-4.1
      
      
      69d65bd8
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · bfe77e33
      unknown authored
      into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/sql_db.cc:
        Auto merged
      bfe77e33
    • unknown's avatar
      after merge fixes · 778a9029
      unknown authored
      778a9029
    • unknown's avatar
      Fix for Bug#2151: · ebf43374
      unknown authored
      "USE db"  affected the character set of further CREATE DATABASEs,
      which should have not happened.
      
      
      mysys/charset2html.c:
        It's earier to operate hex values when editing charset configuration file
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      ebf43374
    • unknown's avatar
      merge with 4.0.18 · 6988eaff
      unknown authored
      
      Build-tools/Bootstrap:
        Auto merged
      client/mysql.cc:
        Auto merged
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/t/auto_increment.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      6988eaff
    • unknown's avatar
      merge · 245b1385
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/type_enum.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      245b1385
    • unknown's avatar
      Fixes after merge with 4.0 · 9c2a63e3
      unknown authored
      Cleaned up embedded library access and query cache handling
      Changed min stack size to 128K (to allow longer MyISAM keys)
      Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      
      
      client/mysqldump.c:
        Fixed bugs found after merge
      include/mysql_embed.h:
        Disable query cache when using embedded version
      myisam/mi_check.c:
        Removed not used variable
      mysql-test/r/auto_increment.result:
        Fixed bugs found after merge
      mysql-test/r/bdb.result:
        Fixed bugs found after merge
      mysql-test/r/func_group.result:
        Fixed bugs found after merge
      mysql-test/r/func_str.result:
        Fixed bugs found after merge
      mysql-test/r/func_time.result:
        Fixed bugs found after merge
      mysql-test/r/group_by.result:
        Fixed bugs found after merge
      mysql-test/r/innodb.result:
        Fixed bugs found after merge
      mysql-test/r/insert.result:
        Fixed bugs found after merge
      mysql-test/r/join_outer.result:
        Fixed bugs found after merge
      mysql-test/r/loaddata.result:
        Fixed bugs found after merge
      mysql-test/r/multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/r/rpl_EE_error.result:
        Fixed bugs found after merge
      mysql-test/r/rpl_multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/symlink.result:
        Update results
      mysql-test/r/type_blob.result:
        Update results
      mysql-test/r/type_datetime.result:
        Update results
      mysql-test/r/type_decimal.result:
        Update results
      mysql-test/r/type_enum.result:
        Fixed bugs found after merge
      mysql-test/r/type_timestamp.result:
        Update results
      mysql-test/r/union.result:
        Update results
      mysql-test/r/warnings.result:
        Update results
      mysql-test/t/bdb.test:
        Fix test for 4.1
      mysql-test/t/innodb.test:
        Fix test for 4.1
      mysql-test/t/multi_update.test:
        Fix test for 4.1
      mysql-test/t/mysqldump.test:
        Fix test for 4.1
      mysql-test/t/rpl_EE_error.test:
        Fix test for 4.1
      mysql-test/t/rpl_multi_update.test:
        Fix test for 4.1
      mysql-test/t/union.test:
        Cleanup
      mysys/charset.c:
        Check results from my_once_alloc()
      mysys/my_handler.c:
        part of 4.0 merge
      sql-common/client.c:
        Part of 4.0 merge
      sql/field.cc:
        After merge fixes
      sql/field.h:
        After merge fixes
      sql/ha_innodb.cc:
        Remove duplicate include files
      sql/item.cc:
        Changed automatic int conversion to be of type binary
      sql/item.h:
        After merge fixes
      sql/item_func.cc:
        Changed automatic int conversion to be of type binary
      sql/item_func.h:
        After merge fixes
      sql/item_strfunc.cc:
        Added comments
      sql/item_subselect.cc:
        Indentation fixes
      sql/item_sum.cc:
        Changed automatic int conversion to be of type binary
      sql/item_sum.h:
        After merge fixes
      sql/mysql_priv.h:
        Cleanup embedded library access checks
      sql/mysqld.cc:
        Changed min stack size to 128K (to allow longer MyISAM keys)
      sql/set_var.cc:
        Fixed compiler warnings
      sql/share/czech/errmsg.txt:
        Better error message
      sql/share/danish/errmsg.txt:
        Better error message
      sql/share/dutch/errmsg.txt:
        Better error message
      sql/share/english/errmsg.txt:
        Better error message
      sql/share/estonian/errmsg.txt:
        Better error message
      sql/share/french/errmsg.txt:
        Better error message
      sql/share/greek/errmsg.txt:
        Better error message
      sql/share/hungarian/errmsg.txt:
        Better error message
      sql/share/italian/errmsg.txt:
        Better error message
      sql/share/japanese/errmsg.txt:
        Better error message
      sql/share/korean/errmsg.txt:
        Better error message
      sql/share/norwegian-ny/errmsg.txt:
        Better error message
      sql/share/norwegian/errmsg.txt:
        Better error message
      sql/share/polish/errmsg.txt:
        Better error message
      sql/share/romanian/errmsg.txt:
        Better error message
      sql/share/russian/errmsg.txt:
        Better error message
      sql/share/serbian/errmsg.txt:
        Better error message
      sql/share/slovak/errmsg.txt:
        Better error message
      sql/share/spanish/errmsg.txt:
        Better error message
      sql/share/swedish/errmsg.txt:
        Better error message
      sql/share/ukrainian/errmsg.txt:
        Better error message
      sql/sql_acl.h:
        Cleaned up embedded library acccess checks
      sql/sql_base.cc:
        After merge fixes
      sql/sql_client.cc:
        After merge fixes
      sql/sql_parse.cc:
        After merge fixes
        Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
        Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
      sql/sql_prepare.cc:
        Add missing arguments
      sql/sql_select.cc:
        After merge fixes
      sql/sql_update.cc:
        After merge fixes
      sql/sql_yacc.yy:
        Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      sql/table.cc:
        After merge fixes
      9c2a63e3
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 060122db
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      060122db
    • unknown's avatar
      - removed empty file mysql-test/t/rpl_temporary-master.opt · 11870d56
      unknown authored
      
      BitKeeper/deleted/.del-rpl_temporary-master.opt~545ad67e7e74bbe0:
        Delete: mysql-test/t/rpl_temporary-master.opt
      11870d56
    • unknown's avatar
      3344aefc
  2. 18 Dec, 2003 9 commits
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9d141adf
      unknown authored
      into teton.kitebird.com:/home/paul/mysql-4.1
      
      
      9d141adf
    • unknown's avatar
      Corrected faulty #if tests in udf_example.cc which made udf_test crash the server on some · fddddc2c
      unknown authored
      platforms.
      
      
      sql/udf_example.cc:
        Corrected faulty #if tests which made udf_test crash the server on some
        platforms.
      fddddc2c
    • unknown's avatar
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 24937ffc
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2126
      
      
      24937ffc
    • unknown's avatar
      Fix for #2126 · 195b8ac5
      unknown authored
      additional changes (after discussion with Monty)
      
      
      libmysql/libmysql.c:
        it's good to check my_thread_init() result as well
      sql/client_settings.h:
        0 is more relevant here
      195b8ac5
    • unknown's avatar
      Removed compiler warning · f562d0c2
      unknown authored
      Fixed not updated test from last changeset
      
      
      mysql-test/r/auto_increment.result:
        Updated results
      sql/mysqld.cc:
        Cleaned up pid file handling (to remove compiler warning)
      f562d0c2
    • unknown's avatar
      Simple cleanups · 15484ba2
      unknown authored
      
      mysql-test/t/auto_increment.test:
        Fixed wrong comment
      sql/opt_range.cc:
        Removed not used variable
      sql/sql_select.cc:
        Removed indentation level (This will also make merges into 4.1 easier)
      15484ba2
    • unknown's avatar
      29af6f37
    • unknown's avatar
      Fix for #2126 (mysql_server_init call shouldn't be needed) · 886307f2
      unknown authored
      now mysql_server_init is called from mysql_init with fake parameters
      mysql_once_init code included to mysql_server_init.
      embedded-specific initialization is in init_embedded_server function
      
      
      include/errmsg.h:
        this error won't happen
      include/mysql.h:
        declarations removed
      libmysql/client_settings.h:
        declaration of init_embedded_server/end_embedded_server added
      libmysql/errmsg.c:
        this error won't happen
      libmysql/libmysql.c:
        mysql_once_init -> mysql_server_init transformations
      libmysqld/embedded_priv.h:
        declaration deleted
      libmysqld/lib_sql.cc:
        mysql_server_init -> init_embedded_server
        mysql_server_end  -> end_embedded_server
      libmysqld/libmysqld.c:
        check for server_inited not needed now
      sql-common/client.c:
        mysql_server_init now called from mysql_init
      sql/client_settings.h:
        fake mysql_server_init for server code
      sql/net_serv.cc:
        we need MYSQL_CLIENT defined in embedded server
      sql/sql_client.cc:
        not needed now
      886307f2
  3. 17 Dec, 2003 10 commits
    • unknown's avatar
      Code cleanup · 6b1e06e6
      unknown authored
      
      client/mysql.cc:
        Don't call mysql_close() on not initialized object
      sql/field.cc:
        code cleanup
      6b1e06e6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · fd3235dc
      unknown authored
      into mysql.com:/my/mysql-4.0
      
      
      fd3235dc
    • unknown's avatar
      WorkLog #1323 (part 2) · 69cee792
      unknown authored
      New Statement: SHOW [STORAGE] ENGINES
      New System Variable: storage_engine
      New mysqld Argument: --default-storage-engine=
      
      
      include/mysqld_error.h:
        We now call handlers STORAGE ENGINEs
      include/sql_state.h:
        We now call handlers STORAGE ENGINEs
      mysql-test/r/create.result:
        table_type system variable becomes storage_engine
      mysql-test/r/key_cache.result:
        table_type system variable becomes storage_engine
      mysql-test/r/variables.result:
        table_type system variable becomes storage_engine
      mysql-test/r/warnings.result:
        Test for deprecated table_type system variable
      mysql-test/t/create.test:
        table_type system variable becomes storage_engine
      mysql-test/t/key_cache.test:
        table_type system variable becomes storage_engine
      mysql-test/t/variables.test:
        table_type system variable becomes storage_engine
      mysql-test/t/warnings.test:
        Test for deprecated table_type system variable
      sql/handler.cc:
        change name for consistency
      sql/handler.h:
        change name for consistency
      sql/lex.h:
        New keywords - ENGINES and STORAGE
      sql/mysql_priv.h:
        change name for consistency
      sql/mysqld.cc:
        New command like argument for default-storage-engine
      sql/set_var.cc:
        New system variable for storage_engine
      sql/set_var.h:
        New system variable for storage_engine
      sql/sql_lex.h:
        Change for consistancy
      sql/sql_parse.cc:
        Change for consistancy
      sql/sql_show.cc:
        Change for consistancy
      sql/sql_table.cc:
        Change for consistancy
      sql/sql_yacc.yy:
        New keywords: STORAGE and ENGINES
        Change table_types to storage_engines
        New statement: SHOW [STORAGE] ENGINES
      69cee792
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · fb361992
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      fb361992
    • unknown's avatar
      Fix for BUG#2145 "mysqld becomes unreliable if unable to create a relay log when replic starts": · f8d7b467
      unknown authored
      release the mutex before exiting the function, or it will be kept forever
      (=> START SLAVE, STOP SLAVE, etc will hang).
      
      
      sql/slave.cc:
        release the mutex before exiting the function, or it will be kept forever
        (=> START SLAVE, STOP SLAVE, etc will hang).
      f8d7b467
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8c5c4dd4
      unknown authored
      into teton.kitebird.com:/home/paul/mysql-4.1
      
      
      8c5c4dd4
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 · 6f8fbe54
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0
      
      
      sql/field.cc:
        Auto merged
      6f8fbe54
    • unknown's avatar
      fixed small error in types in sql/field.cc · b8286832
      unknown authored
      (char * -> const char*)
      
      
      sql/field.cc:
        fixed small error in types (char * -> const char*)
      b8286832
    • unknown's avatar
      9f03e483
    • unknown's avatar
      Merge with 4.0.17 · 0fb88806
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/Do-compile:
        Auto merged
      acinclude.m4:
        Auto merged
      configure.in:
        Auto merged
      dbug/dbug.c:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_base.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      innobase/row/row0umod.c:
        Auto merged
      innobase/row/row0upd.c:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_dbug.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/bdb.result:
        Auto merged
      mysql-test/r/func_op.result:
        Auto merged
      Build-tools/Bootstrap:
        Merge with 4.0
      client/mysql.cc:
        Merge with 4.0
      client/mysqldump.c:
        Merge with 4.0
      client/mysqltest.c:
        Use local version
      innobase/btr/btr0cur.c:
        Merge with 4.0 (Heikki should check if we should remove btr_cur_update_sec_rec_in_place()
      libmysql/libmysql.c:
        Merge with 4.0
      libmysqld/lib_sql.cc:
        Merge with 4.0
      myisam/mi_key.c:
        Merge with 4.0
      myisam/mi_search.c:
        Merge with 4.0
      mysql-test/r/binary.result:
        Merge with 4.0
      mysql-test/r/func_group.result:
        Merge with 4.0
      mysql-test/r/func_str.result:
        Merge with 4.0
      mysql-test/r/func_time.result:
        Merge with 4.0
      mysql-test/r/group_by.result:
        Merge with 4.0
      mysql-test/r/handler.result:
        Merge with 4.0
      mysql-test/r/innodb.result:
        Merge with 4.0
      mysql-test/r/insert.result:
        Merge with 4.0
      mysql-test/r/join_outer.result:
        Merge with 4.0
      mysql-test/r/loaddata.result:
        Merge with 4.0
      mysql-test/r/lowercase_table.result:
        Merge with 4.0
      mysql-test/r/multi_update.result:
        Merge with 4.0
      mysql-test/r/mysqldump.result:
        Merge with 4.0
      mysql-test/r/query_cache.result:
        Merge with 4.0
      mysql-test/r/rpl_max_relay_size.result:
        Merge with 4.0
      mysql-test/r/rpl_rotate_logs.result:
        Merge with 4.0
      mysql-test/r/rpl_trunc_binlog.result:
        Merge with 4.0
      mysql-test/r/select_found.result:
        Merge with 4.0
      mysql-test/r/symlink.result:
        Merge with 4.0
      mysql-test/r/truncate.result:
        Merge with 4.0
      mysql-test/r/type_blob.result:
        Merge with 4.0
      mysql-test/r/type_datetime.result:
        Merge with 4.0
      mysql-test/r/type_decimal.result:
        Merge with 4.0
      mysql-test/r/type_enum.result:
        Merge with 4.0
      mysql-test/r/type_timestamp.result:
        Merge with 4.0
      mysql-test/r/union.result:
        Merge with 4.0
      mysql-test/t/auto_increment.test:
        Merge with 4.0
      mysql-test/t/bdb.test:
        Merge with 4.0
      mysql-test/t/func_group.test:
        Merge with 4.0
      mysql-test/t/func_op.test:
        Merge with 4.0
      mysql-test/t/func_str.test:
        Merge with 4.0
      mysql-test/t/func_time.test:
        Merge with 4.0
      mysql-test/t/group_by.test:
        Merge with 4.0
      mysql-test/t/handler.test:
        Merge with 4.0
      mysql-test/t/innodb.test:
        Merge with 4.0
      mysql-test/t/insert.test:
        Merge with 4.0
      mysql-test/t/join_outer.test:
        Merge with 4.0
      mysql-test/t/limit.test:
        Merge with 4.0
      mysql-test/t/loaddata.test:
        Merge with 4.0
      mysql-test/t/lowercase_table.test:
        Merge with 4.0
      mysql-test/t/multi_update.test:
        Merge with 4.0
      mysql-test/t/mysqldump.test:
        Merge with 4.0
      mysql-test/t/query_cache.test:
        Merge with 4.0
      mysql-test/t/rpl_log_pos.test:
        Merge with 4.0
      mysql-test/t/rpl_max_relay_size.test:
        Merge with 4.0
      mysql-test/t/rpl_rotate_logs.test:
        Merge with 4.0
      mysql-test/t/rpl_trunc_binlog.test:
        Merge with 4.0
      mysql-test/t/select_found.test:
        Merge with 4.0
      mysql-test/t/symlink.test:
        Merge with 4.0
      mysql-test/t/truncate.test:
        Merge with 4.0
      mysql-test/t/type_blob.test:
        Merge with 4.0
      mysql-test/t/type_datetime.test:
        Merge with 4.0
      mysql-test/t/type_decimal.test:
        Merge with 4.0
      mysql-test/t/type_enum.test:
        Merge with 4.0
      mysql-test/t/type_timestamp.test:
        Merge with 4.0
      mysql-test/t/union.test:
        Merge with 4.0
      mysys/charset.c:
        Merge with 4.0
      mysys/my_init.c:
        Merge with 4.0
      mysys/my_symlink.c:
        Merge with 4.0
      mysys/my_thr_init.c:
        Merge with 4.0
      regex/reginit.c:
        Merge with 4.0
      sql/field.cc:
        Change fix_datetime() to print errors
      sql/field.h:
        Merge with 4.0
      sql/ha_innodb.cc:
        Merge with 4.0
      sql/item.cc:
        Merge with 4.0
      sql/item.h:
        Merge with 4.0
      sql/item_cmpfunc.cc:
        Merge with 4.0
      sql/item_func.cc:
        Merge with 4.0
      sql/item_func.h:
        Merge with 4.0
      sql/item_strfunc.cc:
        Merge with 4.0
      sql/item_strfunc.h:
        Merge with 4.0
      sql/item_sum.cc:
        Merge with 4.0
      sql/item_sum.h:
        Merge with 4.0
      sql/item_timefunc.cc:
        Merge with 4.0
      sql/lex.h:
        Merge with 4.0
      sql/log.cc:
        Merge with 4.0
      sql/log_event.cc:
        Merge with 4.0
      sql/log_event.h:
        Merge with 4.0
      sql/mysql_priv.h:
        Merge with 4.0
      sql/mysqld.cc:
        Merge with 4.0
      sql/nt_servc.cc:
        Merge with 4.0
      sql/opt_range.cc:
        Merge with 4.0
      sql/records.cc:
        Merge with 4.0
      sql/repl_failsafe.cc:
        Merge with 4.0
      sql/slave.cc:
        Merge with 4.0
      sql/sql_acl.cc:
        Merge with 4.0
      sql/sql_analyse.cc:
        Merge with 4.0
      sql/sql_base.cc:
        Merge with 4.0
      sql/sql_cache.cc:
        Merge with 4.0
      sql/sql_class.h:
        Merge with 4.0
      sql/sql_db.cc:
        Merge with 4.0
      sql/sql_delete.cc:
        Merge with 4.0
      sql/sql_insert.cc:
        Merge with 4.0
      sql/sql_load.cc:
        Merge with 4.0
      sql/sql_parse.cc:
        Merge with 4.0
      sql/sql_rename.cc:
        Merge with 4.0
      sql/sql_select.cc:
        Merge with 4.0
      sql/sql_show.cc:
        Merge with 4.0
      sql/sql_table.cc:
        Merge with 4.0
      sql/sql_update.cc:
        Merge with 4.0
      sql/sql_yacc.yy:
        Merge with 4.0
      sql/table.cc:
        Merge with 4.0
      sql/table.h:
        Merge with 4.0
      sql/time.cc:
        Merge with 4.0
      sql/uniques.cc:
        Merge with 4.0
      strings/ctype-tis620.c:
        Merge with 4.0
      strings/strto.c:
        Merge with 4.0
      support-files/mysql.server.sh:
        Merge with 4.0
      support-files/mysql.spec.sh:
        Merge with 4.0
      0fb88806
  4. 16 Dec, 2003 5 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · a8e8a249
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      mysql-test/r/rpl_rotate_logs.result:
        Auto merged
      a8e8a249
    • unknown's avatar
      Fix for BUG#2121 "Inadequate message "check permissions on master.info"": · 4790088f
      unknown authored
      more general message when slave can't start because of incorrect
      replication information, the previous one was sometimes a misleading
      indication (i.e. sometimes the problem had nothing to do with
      system permissions).
      The perfect fix would be to report the exact error to the client
      (instead of pointing the client to the error log); this is a bit
      of work so it's more a development task:
      WL#1088 "Move all hardcoded messages of replication to share/errmsg.txt".
      I was not able to modify the errmsg.txt in these sql/ subdirectories:
      
      danish
      dutch
      german
      italian
      portuguese
      russian
      spanish
      swedish
      ukrainian
      
      
      mysql-test/r/rpl_rotate_logs.result:
        result update
      sql/share/czech/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/english/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/estonian/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/french/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/greek/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/hungarian/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/japanese/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/korean/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/norwegian-ny/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/norwegian/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/polish/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/romanian/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      sql/share/slovak/errmsg.txt:
        More general message when slave can't start because of incorrect
        replication information, the previous one was sometimes a misleading
        indication (i.e. sometimes the problem had nothing to do with
        system permissions).
      4790088f
    • unknown's avatar
      - bumped up version number to 4.0.18, now that 4.0.17 has been · da741800
      unknown authored
         tagged/released
       - tagged ChangeSet@1.1655.1.3 as mysql-4.0.17
      
      
      configure.in:
         - bumped up version number to 4.0.18, now that 4.0.17 has been 
           tagged/released
      da741800
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 24794dbc
      unknown authored
      into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
      
      
      24794dbc
    • unknown's avatar
      Fixed parenthesis needed by valgrind-max. · 8af0acea
      unknown authored
      8af0acea