Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-06-30 11:42:41+02:00, tomas@stripped +12 -0
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/lib/mtr_cases.pl@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +1 -0
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_alter_table.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_alter_table2.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_alter_table3.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_autodiscover3.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +25 -7
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_binlog_ddl_multi.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_binlog_log_bin.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_binlog_multi.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_cache_multi.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_cache_multi2.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/ndb_single_user.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +0 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
mysql-test/t/rpl_ndb_ctype_ucs2_def.test@stripped, 2007-06-30 11:42:34+02:00, tomas@stripped +1 -1
ndb test suite cleanup + making ndb_autodiscover3 less flaky
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: whalegate.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-new-ndb
--- 1.58/mysql-test/lib/mtr_cases.pl 2007-04-27 19:03:47 +02:00
+++ 1.59/mysql-test/lib/mtr_cases.pl 2007-06-30 11:42:34 +02:00
@@ -611,6 +611,7 @@
["include/big_test.inc", "big_test", 1],
["include/have_debug.inc", "need_debug", 1],
["include/have_ndb.inc", "ndb_test", 1],
+ ["include/have_multi_ndb.inc", "ndb_test", 1],
["include/have_ndb_extra.inc", "ndb_extra", 1],
["require_manager", "require_manager", 1],
);
--- 1.37/mysql-test/t/ndb_alter_table.test 2006-12-18 07:46:37 +01:00
+++ 1.38/mysql-test/t/ndb_alter_table.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--- 1.4/mysql-test/t/ndb_cache_multi.test 2006-05-31 23:34:21 +02:00
+++ 1.5/mysql-test/t/ndb_cache_multi.test 2007-06-30 11:42:34 +02:00
@@ -1,5 +1,4 @@
-- source include/have_query_cache.inc
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--- 1.3/mysql-test/t/ndb_alter_table2.test 2006-04-19 11:21:30 +02:00
+++ 1.4/mysql-test/t/ndb_alter_table2.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--- 1.6/mysql-test/t/ndb_cache_multi2.test 2007-03-09 18:09:54 +01:00
+++ 1.7/mysql-test/t/ndb_cache_multi2.test 2007-06-30 11:42:34 +02:00
@@ -1,5 +1,4 @@
-- source include/have_query_cache.inc
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--- 1.1/mysql-test/t/rpl_ndb_ctype_ucs2_def.test 2007-06-29 07:44:03 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_ctype_ucs2_def.test 2007-06-30 11:42:34 +02:00
@@ -1,6 +1,6 @@
--source include/have_ucs2.inc
--source include/have_ndb.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
#
# MySQL Bug#15276: MySQL ignores collation-server
--- 1.7/mysql-test/t/ndb_single_user.test 2007-04-16 14:16:00 +02:00
+++ 1.8/mysql-test/t/ndb_single_user.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/ndb_default_cluster.inc
-- source include/not_embedded.inc
--- 1.10/mysql-test/t/ndb_alter_table3.test 2006-07-08 03:25:55 +02:00
+++ 1.11/mysql-test/t/ndb_alter_table3.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--- 1.11/mysql-test/t/ndb_autodiscover3.test 2007-04-05 09:13:16 +02:00
+++ 1.12/mysql-test/t/ndb_autodiscover3.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/ndb_default_cluster.inc
-- source include/not_embedded.inc
@@ -10,6 +9,9 @@
drop table if exists t1, t2;
--enable_warnings
+connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (con2,127.0.0.1,root,,test,$MASTER_MYPORT1,);
+
# Workaround for Bug#27644
# ndb: connecting api node/mysqld may "steal" node_id from running mysqld
# - let ndb_waiter use a fixed node id so "steal" cannot happen
@@ -27,8 +29,14 @@
--exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
# Wait for mysqld to reconnect and exit from readonly mode
-# Should preferrably be a "while (!"select ndb_readonly")" loop
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
+--connection server1
--error 1297
insert into t1 values (2);
--error 1296
@@ -47,8 +55,13 @@
--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
# to ensure mysqld has connected again, and recreated system tables
---exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
--connection server2
--error ER_NO_SUCH_TABLE
select * from t2;
@@ -66,8 +79,13 @@
--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
# to ensure mysqld has connected again, and recreated system tables
---exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
--connection server1
--error ER_NO_SUCH_TABLE
select * from t2;
--- 1.15/mysql-test/t/ndb_binlog_ddl_multi.test 2007-04-18 23:08:53 +02:00
+++ 1.16/mysql-test/t/ndb_binlog_ddl_multi.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/have_binlog_format_row.inc
--- 1.8/mysql-test/t/ndb_binlog_multi.test 2007-04-18 23:08:53 +02:00
+++ 1.9/mysql-test/t/ndb_binlog_multi.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/have_binlog_format_row.inc
--- 1.2/mysql-test/t/ndb_binlog_log_bin.test 2007-04-18 23:08:53 +02:00
+++ 1.3/mysql-test/t/ndb_binlog_log_bin.test 2007-06-30 11:42:34 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/have_binlog_format_row.inc
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2545) | tomas | 30 Jun |
