1. 12 Jan, 2006 28 commits
  2. 11 Jan, 2006 12 commits
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my51 · 264df6d0
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51-rbr
      
      
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/test/ndbapi/test_event.cpp:
        Auto merged
      264df6d0
    • unknown's avatar
      ndb - wl#2972 (5.1, related) detached trigger fixes for multiops · 35c2846c
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        detached trigger fixes for multiops
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        detached trigger fixes for multiops
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        detached trigger fixes for multiops
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        detached trigger fixes for multiops
      storage/ndb/test/ndbapi/test_event_merge.cpp:
        detached trigger fixes for multiops
      35c2846c
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 09d2e055
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      09d2e055
    • unknown's avatar
      RBR test updates per lars request · 6c2c8482
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_EE_err.test:
        Splitting tests case per Lars review
      mysql-test/t/rpl_EE_err.test:
        Splitting tests case per Lars review
      mysql-test/r/rpl_EE_err.result:
        Splitting tests case per Lars review
      mysql-test/t/rpl_stm_EE_err2.test:
        New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
        New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
      mysql-test/r/rpl_stm_EE_err2.result:
        New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
      BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5:
        Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test
      BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db:
        Delete: mysql-test/t/rpl_row_EE_err.test
      BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d:
        Delete: mysql-test/r/rpl_row_EE_err.result
      6c2c8482
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9dc0942a
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      9dc0942a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0966a189
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      0966a189
    • unknown's avatar
      bug: replication of table spaces to work · 45a4daa4
      unknown authored
      bug: check if storage engine is enabled to avoif code dump
      
      
      BitKeeper/etc/ignore:
        Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list
      45a4daa4
    • unknown's avatar
      WL #1034 · af6d4026
      unknown authored
      - add a bit more debug messages
      - disable events.test for now due to a bug
      
      
      mysql-test/r/events.result:
        fix result
      mysql-test/t/disabled.def:
        make it disabled
      mysql-test/t/events.test:
        disable show processlist
      sql/event_executor.cc:
        a bit more debug messages
      af6d4026
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7355e7d5
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      7355e7d5
    • unknown's avatar
      Changes done from Jonas's review of pervious commit · bbed1ba9
      unknown authored
      
      mysql-test/t/ndb_dd_basic.test:
        Changed test.t1 back to t1 per Jonas's review
      mysql-test/r/ndb_dd_basic.result:
        Changed test.t1 back to t1 per Jonas's review
      bbed1ba9
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 21d71ab5
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      21d71ab5
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1e3dfe04
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      1e3dfe04