1. 28 Jun, 2006 2 commits
  2. 27 Jun, 2006 16 commits
    • unknown's avatar
      24cb5235
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 85a6c26c
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      85a6c26c
    • unknown's avatar
      62722a4d
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · bc9d94cb
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
      
      
      bc9d94cb
    • unknown's avatar
      rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result: · ea7f1a61
      unknown authored
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
        new file
      
      
      mysql-test/r/rpl_ndb_dd_partitions.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/rpl_ndb_dd_partitions.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      ea7f1a61
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1 · eb8c3ade
      unknown authored
      into  mysql.com:/data0/mysql-5.1
      
      
      eb8c3ade
    • unknown's avatar
      Many files: · cea60fb1
      unknown authored
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
        new file
      
      
      mysql-test/t/ndb_partition_error.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_key.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_list.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_range.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_blob_partition.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_dd_backuprestore.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_error.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_key.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_list.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_range.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_blob_partition.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_dd_backuprestore.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      cea60fb1
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · bddaa6f2
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
      
      
      sql/sql_db.cc:
        Auto merged
      bddaa6f2
    • unknown's avatar
      changed signature of get_default_no_partitions · d4cb502c
      unknown authored
      d4cb502c
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · 39fa14dd
      unknown authored
      - post merge fixes for 5.1
      
      
      39fa14dd
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · da70a12c
      unknown authored
      - post merge fixes for 5.1
      
      
      da70a12c
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-5.0.19672 · 7ad755e7
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.1.clean
      
      
      mysys/my_init.c:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      7ad755e7
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 89dbf165
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        manual merge
      89dbf165
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · d2da3c96
      unknown authored
      - correction of previous patch
      
      
      d2da3c96
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 6848be9c
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        manual merge
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        manual merge
      storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
        manual merge
      storage/ndb/include/kernel/signaldata/TupFrag.hpp:
        manual merge
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        manual merge
      storage/ndb/tools/restore/Restore.cpp:
        manual merge
      storage/ndb/tools/restore/Restore.hpp:
        manual merge
      storage/ndb/tools/restore/consumer_restore.cpp:
        manual merge
      6848be9c
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · 0335013f
      unknown authored
      - make sure to allocate just enough pages in the fragments by using the actual
        row count from the backup, to avoid over allocation of pages to fragments, and
        thus avoid the bug
      
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - distribute fragment complete to all participants to update row count
      ndb/include/kernel/signaldata/BackupContinueB.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - time slica writing of fragment info to ctl file
      ndb/include/kernel/signaldata/BackupImpl.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
        - new signal fragment complete to all participants
      ndb/include/kernel/signaldata/BackupSignalData.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add min and max rows to dict tab info
      ndb/include/kernel/signaldata/LqhFrag.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to add frag req
      ndb/include/kernel/signaldata/TupFrag.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to add frag req
      ndb/include/ndbapi/NdbDictionary.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added get/set of min max rows
      ndb/src/common/debugger/signaldata/BackupImpl.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to dict tab info
      ndb/src/common/debugger/signaldata/LqhFrag.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new signal fragment complete to all participants
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added max and min rows to dict table object
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added max and min rows to dict table object
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
        - move memory allocation to fragment to after adding of attributes to get correct headsize
        - allocate pages to fragments according to min rows setting
      ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - grow page allocation starting from 2 irrespective of first page allocation
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bits on bytes and records
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bits on bytes and records
      ndb/src/ndbapi/NdbDictionary.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/tools/restore/Restore.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add retrieval of fragment info
      ndb/tools/restore/Restore.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add retrieval of fragment info
      ndb/tools/restore/consumer_restore.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - set min in restore to the actual row count (this is the actual bug fix)
      sql/ha_ndbcluster.cc:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - set min and max rows according to sql definition
      0335013f
  3. 26 Jun, 2006 12 commits
  4. 25 Jun, 2006 4 commits
    • unknown's avatar
      Post merge fix · 725ab9df
      unknown authored
      
      mysql-test/r/func_time.result:
        post-merge fix
      mysql-test/r/select.result:
        post-merge fix
      725ab9df
    • unknown's avatar
      Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge · c2575322
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/valgrind.supp:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      include/Makefile.am:
        manual merge
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/r/select.result:
        manual merge
      c2575322
    • unknown's avatar
      .del-make_win_src_distribution.sh~f80d8fca44e4e5f1: · d98a7999
      unknown authored
        Delete: scripts/make_win_src_distribution.sh
      Makefile.am:
        Unix and Windows now shares source package
      
      
      scripts/Makefile.am:
        Unix and Windows now shares source package
      BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
        Delete: scripts/make_win_src_distribution.sh
      d98a7999
    • unknown's avatar
      BUG#20677: Sporadic failure of test case 'ndb_binlog_multi'. · acd7132e
      unknown authored
      Start test case with a dummy table create and drop. This ensures that
      NDB event subscription is properly set up before the real test starts,
      which otherwise could sometimes cause INSERT events to be lost.
      
      
      mysql-test/r/ndb_binlog_multi.result:
        Start test with dummy table create/drop to avoid a race.
      mysql-test/t/ndb_binlog_multi.test:
        Start test with dummy table create/drop to avoid a race.
      acd7132e
  5. 24 Jun, 2006 5 commits
  6. 23 Jun, 2006 1 commit