1. 22 Jun, 2006 1 commit
    • unknown's avatar
      Patch to handle some bad situations resulting from the fix for BUG#19995. · ab28aa9c
      unknown authored
      
      sql/handler.cc:
        Generating table maps from all locks that can be available: THD::extra_lock,
        THD::lock, and THD::locked_tables.
      sql/sql_class.h:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      sql/sql_insert.cc:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      ab28aa9c
  2. 21 Jun, 2006 17 commits
  3. 20 Jun, 2006 17 commits
    • unknown's avatar
      Re-enable IM tests. · fb074e38
      unknown authored
      fb074e38
    • unknown's avatar
      Fix merge 5.0 -> 5.1. · a28e7eb4
      unknown authored
      
      mysql-test/r/im_life_cycle.result:
        Fix manual merge.
      a28e7eb4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d1e45ad8
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-merged
      
      
      d1e45ad8
    • unknown's avatar
      rpl_ndb_log.result: · 73d86f32
      unknown authored
        Corrected test case result
      
      
      mysql-test/r/rpl_ndb_log.result:
        Corrected test case result
      73d86f32
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · f2e74338
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/error/ndbd_exit_codes.c:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        manual merge
      f2e74338
    • unknown's avatar
      Bug #17297 Fix error messages · fa2673f1
      unknown authored
      fa2673f1
    • unknown's avatar
      Bug #17297 Fix error messages · c2620e1f
      unknown authored
      c2620e1f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · e26bcc2e
      unknown authored
      into moonbone.local:/work/tmp_merge-5.1-opt-mysql
      
      
      e26bcc2e
    • unknown's avatar
      rpl_ndb_log.result: · 6c2a6b47
      unknown authored
        Fixed failing test case
      
      
      mysql-test/r/rpl_ndb_log.result:
        Fixed failing test case
      6c2a6b47
    • unknown's avatar
      Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged · 46845cf3
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-merged
      
      
      BitKeeper/deleted/.del-im_life_cycle-im.opt:
        Delete: mysql-test/t/im_life_cycle-im.opt
      BitKeeper/deleted/.del-im_utils-im.opt:
        Delete: mysql-test/t/im_utils-im.opt
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/im_daemon_life_cycle.result:
        Auto merged
      mysql-test/r/im_utils.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/im_daemon_life_cycle-im.opt:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      server-tools/instance-manager/instance_map.cc:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        Manually merged.
      mysql-test/r/insert.result:
        Manually merged.
      mysql-test/t/im_daemon_life_cycle.imtest:
        Manually merged.
      mysql-test/t/im_life_cycle.imtest:
        Manually merged.
      mysql-test/t/im_utils.imtest:
        Manually merged.
      mysql-test/t/insert.test:
        Manually merged.
      server-tools/instance-manager/guardian.cc:
        Manually merged.
      server-tools/instance-manager/manager.cc:
        Manually merged.
      sql/sql_insert.cc:
        Manually merged.
      46845cf3
    • unknown's avatar
      c782aadd
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 · 89fc7fdb
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/myisam.test:
        Manual merge.
      89fc7fdb
    • unknown's avatar
      make_win_src_distribution.sh: · d556631b
      unknown authored
        Removed reference to missing "tools" directory
      mysql.spec.sh:
        Changed flag --with-yassl => --with-ssl
        Reverted accidental removal of the "make" call :-)
        Configure --with-embedded-server
        Corrected path to "libtool" command
        Corrected path to "libmysqld.a"
        Removed references to "safe_mysqld"
      
      
      support-files/mysql.spec.sh:
        Changed flag --with-yassl => --with-ssl
        Reverted accidental removal of the "make" call :-)
        Configure --with-embedded-server
        Corrected path to "libtool" command
        Corrected path to "libmysqld.a"
        Removed references to "safe_mysqld"
      scripts/make_win_src_distribution.sh:
        Removed reference to missing "tools" directory
      d556631b
    • unknown's avatar
      Merge · a25fc95d
      unknown authored
      
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      storage/ndb/Makefile.am:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      BUILD/compile-dist:
        SCCS merged
      netware/Makefile.am:
        SCCS merged
      netware/BUILD/compile-netware-END:
        SCCS merged
      a25fc95d
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge · 008b1e52
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
      
      
      storage/ndb/include/util/ConfigValues.hpp:
        Auto merged
      storage/ndb/src/common/util/ConfigValues.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        manual merge (n/a in 5.1)
      008b1e52
    • unknown's avatar
      BUG#20333 valgrind: mgmd event reporting dep on uninit value · 773e91d5
      unknown authored
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        user correct pointer
      773e91d5
    • unknown's avatar
      fix test result after BUG#20073 fix · e978c8eb
      unknown authored
      
      mysql-test/r/ndb_dd_dump.result:
        fix test result
      e978c8eb
  4. 19 Jun, 2006 5 commits