- 29 Jun, 2006 1 commit
-
-
unknown authored
Mark events_stress.test as 'big' as it's very slow on some machines BitKeeper/etc/ignore: added server-tools/instance-manager/net_serv.cc mysql-test/t/events_stress.test: Slow test: only run when using --big mysql-test/t/rpl_ndb_auto_inc.test: Fix failing test
-
- 28 Jun, 2006 9 commits
-
-
unknown authored
into mysql.com:/home/my/mysql-5.1 sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
into moonbone.local:/home/evgen/mysql-5.1-new
-
unknown authored
into mysql.com:/home/my/mysql-5.1 BitKeeper/etc/ignore: auto-union sql/ha_ndbcluster_binlog.cc: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
into xiphis.org:/home/antony/work2/p4-bug12096.3-merge sql/mysqld.cc: Auto merged
-
unknown authored
mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/insert_select.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/key.test: Auto merged mysql-test/t/view_grant.test: Auto merged sql/field.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
BitKeeper/etc/ignore: added *.gcno
-
unknown authored
(Found by dgcov) mysql-test/r/show_check.result: Test SHOW PLUGIN. (Was not covered by test suite before) mysql-test/t/show_check.test: Test SHOW PLUGIN. (Was not covered by test suite before) mysys/my_handler.c: Added purecov comment for new, not executed code sql/filesort.cc: Added purecov comment for new, not executed code Removed 'purecov: inspected' from code covered by current testsuite sql/ha_ndbcluster_binlog.cc: Added purecov comment for new, not executed code sql/log_event.cc: Added purecov comment for new, not executed code sql/mysqld.cc: Added purecov comment for new, not executed code sql/sql_parse.cc: Added purecov comment for new, not executed code
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt sql/sql_partition.cc: Auto merged
-
unknown authored
- make sure to invalidate even if table is not binlogged
-
- 27 Jun, 2006 16 commits
-
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
-
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
-
unknown authored
into mysql.com:/data0/mysql-5.1
-
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
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt sql/sql_db.cc: Auto merged
-
unknown authored
-
unknown authored
- post merge fixes for 5.1
-
unknown authored
- post merge fixes for 5.1
-
unknown authored
into mysql.com:/home/hf/work/mysql-5.1.clean mysys/my_init.c: Auto merged sql/share/errmsg.txt: Auto merged
-
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
-
unknown authored
- correction of previous patch
-
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
-
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
-
- 26 Jun, 2006 12 commits
-
-
unknown authored
into mysql.com:/opt/local/work/mysql-5.1-runtime mysql-test/t/disabled.def: Auto merged mysql-test/t/events_stress.test: Auto merged
-
unknown authored
into mysql.com:/data0/mysql-5.1
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt sql/field.cc: Auto merged sql/field.h: Auto merged
-
unknown authored
into mysql.com:/opt/local/work/mysql-5.1-runtime mysql-test/r/sp-prelocking.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged strings/ctype-mb.c: Auto merged mysql-test/t/sp-prelocking.test: Manual merge.
-
unknown authored
into mysql.com:/opt/local/work/mysql-5.1-runtime mysql-test/r/information_schema.result: Auto merged sql/CMakeLists.txt: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/events.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/t/events_microsec.test: SCCS merged
-
unknown authored
into mysql.com:/usr/local/mysql/tmp-5.1
-
unknown authored
The 250 simultaneous events all accessing the same table caused the events_stress test to fail due to debug warnings about too many table waiters. Fixed by using three different tables. mysql-test/r/events_stress.result: Use three different MyISAM tables to avoid debug warnings about too many locks. mysql-test/t/events_stress.test: Use three different MyISAM tables to avoid debug warnings about too many locks.
-
unknown authored
into lmy004.:/work/mysql-5.1-runtime-bug16992 mysql-test/t/events.test: Auto merged mysql-test/t/events_grant.test: Auto merged sql/sql_show.cc: Auto merged
-
unknown authored
into mysql.com:/usr/local/mysql/tmp-5.1 sql/ha_ndbcluster_binlog.cc: Auto merged sql/sql_class.cc: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged support-files/mysql.spec.sh: Auto merged
-
unknown authored
into lmy004.:/work/mysql-5.1-runtime-bug18897 mysql-test/t/events_bugs.test: Auto merged sql/sql_parse.cc: Auto merged
-
- 25 Jun, 2006 2 commits
-
-
unknown authored
mysql-test/r/func_time.result: post-merge fix mysql-test/r/select.result: post-merge fix
-
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
-
