1. 14 Jun, 2006 18 commits
  2. 13 Jun, 2006 7 commits
  3. 12 Jun, 2006 15 commits
    • unknown's avatar
      Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122 · 3e8008b1
      unknown authored
      into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
      
      
      mysql-test/r/partition_range.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      mysql-test/r/partition.result:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      sql/sql_partition.cc:
        manual merge
      3e8008b1
    • unknown's avatar
      Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 6b2d502a
      unknown authored
      into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
      
      
      mysql-test/r/partition.result:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      6b2d502a
    • unknown's avatar
      BUG#19122: Need to close handlers before drop/rename phase · 3166382d
      unknown authored
      Fixed comments
      
      
      sql/sql_partition.cc:
        Fixed comments
      3166382d
    • unknown's avatar
      BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE... · 14c0751c
      unknown authored
      BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE ADD/DROP/REORGANIZE partitions
      After review fix
      
      
      mysql-test/r/partition.result:
        Fixes for test
      mysql-test/t/partition.test:
        Fixes for test
      sql/lock.cc:
        After review fix
      sql/mysql_priv.h:
        After review fix
      sql/sql_partition.cc:
        After review fix
      14c0751c
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 · b5697a5f
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51
      
      
      b5697a5f
    • unknown's avatar
      Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695 · c5d38c17
      unknown authored
      into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
      
      
      sql/sql_partition.cc:
        Auto merged
      c5d38c17
    • unknown's avatar
      Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 3247d60d
      unknown authored
      into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
      
      
      BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
        Auto merged
      mysql-test/r/partition.result:
        manual merge
      mysql-test/r/partition_02myisam.result:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      sql/sql_partition.cc:
        manual merge
      sql/sql_partition.h:
        manual merge
      sql/sql_show.cc:
        manual merge
      sql/sql_table.cc:
        manual merge
      3247d60d
    • unknown's avatar
      Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · ad193962
      unknown authored
      into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
      
      
      sql/ha_partition.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      ad193962
    • unknown's avatar
      ndb - bug#19872 fix (sufficient for replication) · b66f3574
      unknown authored
      
      storage/ndb/test/ndbapi/test_event.cpp:
        test applier under merge events
        also fix run in 5.1 (check for data event)
      storage/ndb/test/run-test/daily-devel-tests.txt:
        add: test_event -n MergeEventOperationApplier_NR
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        allow idempotency INSoINS or DELoDEL
        does NOT check data section 2 (before data)
      b66f3574
    • unknown's avatar
      Added order by · def8e0ce
      unknown authored
      def8e0ce
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 334453f9
      unknown authored
      into  mysql.com:/home/marty/MySQL/mysql-5.1
      
      
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      334453f9
    • unknown's avatar
      sql_delete.cc: · 77446405
      unknown authored
        Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
      Many files:
        Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
      ndb_lock.result, ha_ndbcluster.cc:
        Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
      NdbDictionaryImpl.hpp:
        Fix of bad merge
      
      
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Fix of bad merge
      sql/ha_ndbcluster.cc:
        Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
      mysql-test/r/ndb_lock.result:
        Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
      sql/ha_ndbcluster_binlog.cc:
        Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
      mysql-test/r/rpl_ndb_basic.result:
        Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
      mysql-test/t/rpl_ndb_basic.test:
        Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
      sql/ha_ndbcluster_binlog.h:
        Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
      sql/sql_delete.cc:
        Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
      77446405
    • unknown's avatar
      Merge jonas@perch:src/51-jonas · 12655063
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      12655063
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 37d97b58
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      37d97b58
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 059d28f7
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      059d28f7