into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
client/mysqltest.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/t/disabled.def:
manual merge
Restarting scan after call to delete_row().
mysql-test/include/rpl_multi_engine3.inc:
Injector thread was not given enough time.
mysql-test/t/disabled.def:
Disabling some tests.
sql/log_event.cc:
Moving scan init functions for Delete_rows_log_event.
Restarting scan for each found row.
mysql-test/t/rpl_ndb_dd_partitions.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_dd_partitions.test''
better replicaiton test cleanup to ensure better test predictability
+ some ndb test cleanup
client/mysqltest.c:
increase save_master_pos timeout to 30 seconds for higher test predictability
mysql-test/extra/rpl_tests/rpl_ddl.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/r/rpl_ndb_dd_advance.result:
better replicaiton test cleanup to ensure better test predictability
mysql-test/r/rpl_ndb_sync.result:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/disabled.def:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_bank.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_basic.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_dd_advance.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_dd_basic.test:
better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_sync.test:
better replicaiton test cleanup to ensure better test predictability
- Add variable "have_dynamic_loading" and use it to check if the udf test should be run.
mysql-test/include/have_udf.inc:
Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/r/have_udf.require:
Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/t/disabled.def:
Remove udf from disabled
sql/mysql_priv.h:
Add have_dlopen variable
sql/mysqld.cc:
Add have_dlopen variable
sql/set_var.cc:
Add have_dlopen variable and name it "have_dynamic_loading" in "SHOW VARIABLES"
This removes a warning about missing DBUG_ENTER while running tests
mysql-test/t/disabled.def:
Disable test rpl_ndb_multi_update3 that randomly fails on Intel64
into zim.(none):/home/ian/workspace/mysql-5.1-new
Updated bug message in disabled file -Brian
BitKeeper/etc/ignore:
auto-union
include/mysql.h:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql-common/client.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/parse_file.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
mysql-test/t/disabled.def:
Changing message to add in bug numnber
BitKeeper/etc/ignore:
Added mysql-test/r/udf.log to the ignore list
mysql-test/t/disabled.def:
Disable the udf test, per bug #18564. Permission by Brian
compile error fixes
BitKeeper/deleted/.del-rpl_ndb_sp007.test~72c66392eed0d74:
Delete: mysql-test/t/rpl_ndb_sp007.test
BitKeeper/deleted/.del-rpl_ndb_sp007.result~b1b713abfd655893:
Delete: mysql-test/r/rpl_ndb_sp007.result
mysql-test/t/disabled.def:
removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
sql/ha_ndbcluster.cc:
compile error fixes
Unable to reproduce failure: some of the 17400 tests pass, other have other failures.
The test in the bug report passes.
Enabling some tests that pass, rebranding others.
mysql-test/t/disabled.def:
Enabling tests that pass
Rebranding disabled tests
(nothing to document, this bug was not released).
mysql-test/t/disabled.def:
bug is fixed, enabling test case
mysql-test/t/rpl_rbr_to_sbr.test:
making test portable
mysql-test/r/rpl_rbr_to_sbr.result:
result update
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Auto merged
sql/rpl_injector.cc:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
manual merge
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
ndb: dict use define for number of pages in table definition