1. 12 Jan, 2006 17 commits
  2. 11 Jan, 2006 23 commits
    • 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
    • unknown's avatar
      WL #1034 (Internal CRON) pre-push updates · 2fc956fa
      unknown authored
      - various fixes of test cases
      (hopefully the last pre-push update before the push)
      
      
      mysql-test/include/system_db_struct.inc:
        extend test case to include testing for event system table
      mysql-test/r/events.result:
        results of events test
      mysql-test/r/system_mysql_db.result:
        more testing - add structure of event system table
      mysql-test/t/events.test:
        test case for events (internal CRON)
      mysql-test/t/system_mysql_db_fix.test:
        drop event table and leave the test database empty
      scripts/mysql_create_system_tables.sh:
        add missing create table statement
      scripts/mysql_fix_privilege_tables.sql:
        don't specify the database. this fixes a failing test case which creates the
        tables not on mysql but on a test database and then tests again mysql.
      sql/event_executor.cc:
        if asked to stop -> stop.
      2fc956fa
    • unknown's avatar
      Test clean up and moving over from old clone. · 0c64879d
      unknown authored
      
      mysql-test/t/ndb_dd_basic.test:
        Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
      mysql-test/r/ndb_dd_basic.result:
        Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
      mysql-test/t/ndb_dd_ddl.test:
        New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
      mysql-test/r/ndb_dd_ddl.result:
        New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
      0c64879d
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new · db122ce4
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
      
      
      db122ce4
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8d1ea9e2
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      8d1ea9e2
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f59bbb4f
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new
      
      
      f59bbb4f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 012cd81b
      unknown authored
      into  mysql.com:/usr/local/mysql/tmpbuild2
      
      
      012cd81b
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bfa11000
      unknown authored
      into  mysql.com:/home/bkroot/mysql-5.1-new
      
      
      bfa11000
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · ca5f5594
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      ca5f5594
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 51b3a1d1
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
      
      
      51b3a1d1
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a66eafd6
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      sql/sql_show.cc:
        Auto merged
      a66eafd6
    • unknown's avatar
      WL #1034 (Internal CRON) pre-push fixes · b8ce8ad1
      unknown authored
      after another merge fixes.
      
      
      mysql-test/r/information_schema.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/mysqlcheck.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/sp.result:
        WL #1034 (Internal CRON)
        fix result
      sql/event.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/event_timed.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/share/errmsg.txt:
        readd error messages removed during manual update
      sql/sql_yacc.yy:
        fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
        merge. The merge wasn't good :(
      b8ce8ad1
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e4415012
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.1-new
      
      
      e4415012