1. 21 Jun, 2006 11 commits
  2. 20 Jun, 2006 26 commits
    • unknown's avatar
      Re-enable IM tests. · a898dfc5
      unknown authored
      a898dfc5
    • unknown's avatar
      Fix merge 5.0 -> 5.1. · 6afc9c86
      unknown authored
      
      mysql-test/r/im_life_cycle.result:
        Fix manual merge.
      6afc9c86
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 6b31ac40
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-merged
      
      6b31ac40
    • unknown's avatar
      rpl_ndb_log.result: · 1774bc4b
      unknown authored
        Corrected test case result
      
      
      mysql-test/r/rpl_ndb_log.result:
        Corrected test case result
      1774bc4b
    • unknown's avatar
      Merge dator5.(none):/home/pappa/bug16000 · 8a4644ca
      unknown authored
      into  dator5.(none):/home/pappa/bug19281
      
      
      mysql-test/t/partition_mgm.test:
        Auto merged
      8a4644ca
    • unknown's avatar
      BUG#16000: .par file left behind plus unnecessary messages to error.log · ca4a74ce
      unknown authored
      New test cases
      
      
      mysql-test/r/partition_error.result:
        New test cases
      mysql-test/r/partition_mgm.result:
        New test cases
      mysql-test/t/partition_error.test:
        New test cases
      mysql-test/t/partition_mgm.test:
        New test cases
      ca4a74ce
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · c20d2d34
      unknown authored
      into  dator5.(none):/home/pappa/bug16000
      
      c20d2d34
    • unknown's avatar
      Merge dator5.(none):/home/pappa/bug19309 · bc5f8bf0
      unknown authored
      into  dator5.(none):/home/pappa/bug19281
      
      bc5f8bf0
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 3ce377e3
      unknown authored
      into  dator5.(none):/home/pappa/bug19309
      
      
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/partition.result:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      3ce377e3
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · dea20878
      unknown authored
      into  dator5.(none):/home/pappa/bug19281
      
      dea20878
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 83e763b2
      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
      83e763b2
    • unknown's avatar
      BUG#16000: .par file not removed plus errors to error log for normal errors · 7445ac49
      unknown authored
      
      sql/table.cc:
        Remove error printouts when error occurs during open frm as part of
        CREATE/ALTER TABLE
      sql/unireg.cc:
        Ensure .par file is removed after error
      7445ac49
    • unknown's avatar
      Bug #17297 Fix error messages · d6eb7c47
      unknown authored
      d6eb7c47
    • unknown's avatar
      Bug #17297 Fix error messages · feeefdc2
      unknown authored
      feeefdc2
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · d9870ca4
      unknown authored
      into moonbone.local:/work/tmp_merge-5.1-opt-mysql
      
      d9870ca4
    • unknown's avatar
      rpl_ndb_log.result: · f869fe1c
      unknown authored
        Fixed failing test case
      
      
      mysql-test/r/rpl_ndb_log.result:
        Fixed failing test case
      f869fe1c
    • unknown's avatar
      Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged · 9f93f15b
      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.
      9f93f15b
    • unknown's avatar
      Fixed test case · 73094bf5
      unknown authored
      73094bf5
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · d9075c3b
      unknown authored
      into  dator5.(none):/home/pappa/bug19281
      
      
      sql/ha_partition.cc:
        Auto merged
      d9075c3b
    • unknown's avatar
      6e748553
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 · 40587958
      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.
      40587958
    • unknown's avatar
      make_win_src_distribution.sh: · 2d097b07
      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
      2d097b07
    • unknown's avatar
      Merge · 2a886f5f
      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
      2a886f5f
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge · efec50a4
      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)
      efec50a4
    • unknown's avatar
      BUG#20333 valgrind: mgmd event reporting dep on uninit value · e989cdd4
      unknown authored
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        user correct pointer
      e989cdd4
    • unknown's avatar
      fix test result after BUG#20073 fix · 8d9e0c16
      unknown authored
      
      mysql-test/r/ndb_dd_dump.result:
        fix test result
      8d9e0c16
  3. 19 Jun, 2006 3 commits