1. 01 Sep, 2005 32 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 43d488bc
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-merges
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      43d488bc
    • unknown's avatar
      Fixes after merging fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES · e72050de
      unknown authored
      and GRANT in multi-threaded environment" into 5.0 tree.
      
      
      sql/sql_acl.cc:
        After merge fixes.
      e72050de
    • unknown's avatar
      Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0 · a5e41d50
      unknown authored
      
      scripts/Makefile.am:
        Auto merged
      a5e41d50
    • unknown's avatar
      f11b8910
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423 · d0bd6be9
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-merges
      
      
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Manual merge.
      mysql-test/mysql-test-run.pl:
        Manual merge.
      mysql-test/r/grant2.result:
        Manual merge.
      mysql-test/t/grant2.test:
        Manual merge.
      sql/sql_acl.cc:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      d0bd6be9
    • unknown's avatar
      Fix for spelling miss and eol junk · 840e3735
      unknown authored
      
      client/mysqltest.c:
        Fix spelling error
      mysql-test/t/information_schema.test:
        Eol junk detected, added #
      mysql-test/t/rpl_slave_status.test:
        Missing ;
      mysql-test/t/sp.test:
        Eol junk detected, added #
      mysql-test/t/view.test:
        Eol junk detected, added #
      840e3735
    • unknown's avatar
      Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory. · 96e473e4
      unknown authored
      
      scripts/Makefile.am:
        Add "MYSQL_BASE_VERSION" to the list of substituted variables,
        for later (possible) use in "mysql_install_db" and "mysqld_safe".
      96e473e4
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · dd7c6d12
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/ndb_autodiscover2.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      mysql-test/t/rpl_drop.test:
        Auto merged
      mysql-test/t/rpl_drop_temp.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl_until.test:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Manual merge
      mysql-test/mysql-test-run.pl:
        Manual merge
      dd7c6d12
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 3331e074
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/ndb_autodiscover2.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      mysql-test/t/rpl_drop.test:
        Auto merged
      mysql-test/t/rpl_drop_temp.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl_until.test:
        Auto merged
      client/mysqltest.c:
        Manual merge
      mysql-test/t/mysqltest.test:
        Manual merge
      3331e074
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · c3f48766
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/kill.test:
        Auto merged
      mysql-test/t/ndb_autodiscover2.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      mysql-test/t/rpl_drop.test:
        Auto merged
      mysql-test/t/rpl_drop_temp.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      mysql-test/t/rpl_until.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      client/mysqltest.c:
        Merge with --parsing-disabled
      mysql-test/t/mysqltest.test:
        Manual merge
      c3f48766
    • unknown's avatar
      mysqltest improvements, updates after merge + test for 5.0 · 99725232
      unknown authored
      
      client/mysqltest.c:
        Fixes after merge
      mysql-test/r/type_newdecimal.result:
        Update results after correction of testcase
      mysql-test/t/flush_read_lock_kill.test:
        Found extra delimiter
      mysql-test/t/kill.test:
        Found extra delimiter
      mysql-test/t/rpl_loaddata.test:
        Found extra delimiter
      mysql-test/t/rpl_sp.test:
        Found extra delimiter
      mysql-test/t/strict.test:
        Convert "!$1292" to "--error 1292"
      mysql-test/t/type_newdecimal.test:
        Missing ;
      99725232
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 831b9133
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/grant2.result:
        Manual merge.
      mysql-test/t/grant2.test:
        Manual merge.
      831b9133
    • unknown's avatar
      Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in · 6e265308
      unknown authored
      multi-threaded environment".
      
      To avoid deadlocks between several simultaneously run account management 
      commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
      commands) we should always take table and internal locks during their
      execution in the same order. In other words we should first open and lock
      privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
      
      
      mysql-test/r/grant2.result:
        Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
        multi-threaded environment".
      mysql-test/t/grant2.test:
        Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
        multi-threaded environment".
      sql/mysqld.cc:
        acl_init/grant_init() are now used only at server start up so they always
        allocate temporary THD object and don't need argument for passing pointer
        to it.
      sql/sql_acl.cc:
        To avoid deadlocks between several simultaneously run account management 
        commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
        commands) we should always take table and internal locks during their
        execution in the same order. In other words we should first open and lock
        privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
        
        Changed acl_reload()/grant_reload() and change_password()/update_user_table()
        in such way that they obey this principle. Now in acl_reload()/grant_reload()/
        change_password() we open and lock privilege tables, then obtain internal
        locks and then call acl_load()/grant_load()/update_user_table() functions to
        do actual loading or updating.
      sql/sql_acl.h:
        acl_init/grant_init() are now used only at server start up so they always
        allocate temporary THD object and don't need argument for passing pointer
        to it. acl_reload()/grant_reload() now are able to report about their
        success or failure through return value.
      sql/sql_parse.cc:
        If reload_acl_and_cache() is called from SIGHUP handler we have to
        allocate temporary THD for execution of acl_reload()/grant_reload().
      6e265308
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a342ec64
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      a342ec64
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · c8054cfe
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
      
      
      client/mysqltest.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      c8054cfe
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · b6d6a462
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      b6d6a462
    • unknown's avatar
      mtr_process.pl: · f74763c7
      unknown authored
        Make sure mtr_kill_processes() is called with an array ref
        Corrected error string for STDERR redirect
      
      
      mysql-test/lib/mtr_process.pl:
        Make sure mtr_kill_processes() is called with an array ref
      f74763c7
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · e247b271
      unknown authored
      into  mysql.com:/export/space/pekka/ndb/version/my50
      
      e247b271
    • unknown's avatar
      ndb - fix ha_ndb crash on ordered index on nullable varchar · bc778260
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        fix ha_ndb crash on ordered index on nullable varchar
      mysql-test/t/ndb_index_ordered.test:
        fix ha_ndb crash on ordered index on nullable varchar
      sql/ha_ndbcluster.cc:
        fix ha_ndb crash on ordered index on nullable varchar
      bc778260
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 4a825923
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
      
      4a825923
    • unknown's avatar
      Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc · 65144ed9
      unknown authored
       - Temporary fix, disable x86 assembler.
      
      
      BUILD/compile-pentium-icc:
        Cleanup build script for icc
      extra/yassl/taocrypt/include/misc.hpp:
        Disable x86 assembler  when compiling with icc
      BUILD/compile-pentium-icc-yassl:
        New BitKeeper file ``BUILD/compile-pentium-icc-yassl''
      65144ed9
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316 · 623f1a62
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/rpl_flush_log_loop.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      mysql-test/t/rpl_drop_temp.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      client/mysqltest.c:
        Manual merge
      mysql-test/r/mysqltest.result:
        Manual merge
      mysql-test/t/flush.test:
        Manual merge
      mysql-test/t/mysqltest.test:
        Manual merge
      mysql-test/t/rpl_change_master.test:
        Manual merge
      mysql-test/t/rpl_until.test:
        Manual merge
      623f1a62
    • unknown's avatar
      Bug #11286 yassl incompatible with "load data infile" · c16f09cc
      unknown authored
       - Make sure that mysqltest always uses ssl when connecting to the server.
       - Pass a i32-bit int variable as argument to FIONREAD ioctl.
      
      
      client/mysqltest.c:
        Set the flag CLIENT_REMENBER_OPTIONS so that all connection attempts from mysqltest is done with the same settings.
        Old impl caused mysqltest to loose all it's settings in the second connection attempt, ex ssl settings.
      extra/yassl/src/socket_wrapper.cpp:
        64-bit Solaris requires the variable passed to FIONREAD be a 32-bit value.
        Using "int" unless _WIN32_ is defined.
      sql/sql_parse.cc:
        Update error message when sslaccepts fails. Must have been a copy and paste error.
      vio/viossl.c:
        Minor fixes
        Add timeout to DBUG_PRINT
        use function vio_ssl_fd to get sd from vio
        Remove extra whitespace
      vio/viosslfactories.c:
        Remove DBUG_PRINT("enter" in sslaccept and sslconnect as it tries to print out null strings. That is not suported on all platforms.
      c16f09cc
    • unknown's avatar
      Fix compiler warnings for mysqltest.c · db05b23c
      unknown authored
      
      client/mysqltest.c:
        Fix warnings
        Remove unused vars
      db05b23c
    • unknown's avatar
      Bug #3131 mysqltest fails on $2=$1 assignment in test · c7cc1ca0
      unknown authored
      
      client/mysqltest.c:
        Fix function var_copy to make it possible to assign one variable to another. 
        ex: let $1=$2
      mysql-test/r/mysqltest.result:
        Update test result
      mysql-test/t/mysqltest.test:
        Add test cases for variable to variable assignment
      c7cc1ca0
    • unknown's avatar
      Bug #12471 mysqltest, --error within loop affects wrong statement · 09864f91
      unknown authored
       - Move clearing of expected errors
      
      
      client/mysqltest.c:
        Move clear of expected errors to the query loop so that the expected error is reset even when the query is retrieved from the q_lines cache.
      mysql-test/r/mysqltest.result:
        Update test results
      mysql-test/t/mysqltest.test:
        Add test for bug#12471
      09864f91
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f81ecf6f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql/examples/ha_archive.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      f81ecf6f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7b275189
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      sql/examples/ha_archive.cc:
        Auto merged
      7b275189
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 3cec493b
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      myisam/mi_extra.c:
        Auto merged
      mysql-test/r/lowercase_table.result:
        Auto merged
      mysql-test/t/lowercase_table.test:
        Auto merged
      mysys/my_access.c:
        Auto merged
      BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
        Auto merged
      sql/examples/ha_tina.cc:
        Resolve conflict
      3cec493b
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-7156 · 639a5c07
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      639a5c07
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12325 · 7e61acc9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      7e61acc9
    • unknown's avatar
      Fix handling of filenames that start the same as reserved filenames · f8452cbc
      unknown authored
      on Windows. (Bug #12325)
      
      
      mysql-test/r/lowercase_table.result:
        Update results
      mysql-test/t/lowercase_table.test:
        Move test to new windows.test, since it is Windows-specific
      mysys/my_access.c:
        Check that we've matched the whole forbidden name.
      mysql-test/include/windows.inc:
        New BitKeeper file ``mysql-test/include/windows.inc''
      mysql-test/r/windows.result:
        New BitKeeper file ``mysql-test/r/windows.result''
      mysql-test/t/windows.test:
        New BitKeeper file ``mysql-test/t/windows.test''
      f8452cbc
  2. 31 Aug, 2005 8 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · a79fccc4
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix.test:
        Auto merged
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        Auto merged
      ndb/src/kernel/vm/SimulatedBlock.hpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Resolve conflicts
      sql/ha_innodb.cc:
        Resolve conflicts
      sql/item_strfunc.cc:
        Resolve conflicts
      a79fccc4
    • unknown's avatar
      8af463b2
    • unknown's avatar
      ed344d69
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 52549105
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      52549105
    • unknown's avatar
      added make of ndb sys file printer · e997ae1b
      unknown authored
      e997ae1b
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 84583bb7
      unknown authored
      into moonbone.local:/work/12861-bug-4.1-mysql
      
      84583bb7
    • unknown's avatar
      improved the ndb redo log reader · 2e5a56a6
      unknown authored
      2e5a56a6
    • unknown's avatar
      create.test, create.result, sql_select.cc, item.cc: · a664f3df
      unknown authored
        After merge fix for bug #12537
      
      
      sql/item.cc:
        After merge fix for bug #12537
      sql/sql_select.cc:
        After merge fix for bug #12537
      mysql-test/r/create.result:
        After merge fix for bug #12537
      mysql-test/t/create.test:
        After merge fix for bug #12537
      a664f3df