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-18 15:36:10+02:00, tomas@stripped +80 -0
fixes Bug #25305 (and several other similar test tailures with the same symptom)
- make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_commit_after_flush.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -2
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_delete_no_where.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -2
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_insert_ignore.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -2
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_log.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -1
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update2.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -2
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update3.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -2
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_relayrotate.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -2
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_001.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -3
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_UUID.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -4
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_basic.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -3
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_blob.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -4
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_charset.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -4
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_func003.test@stripped, 2007-06-18 15:36:05+02:00, tomas@stripped +0 -5
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp003.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +0 -5
make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp006.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +0 -4
make tests wait until ndb connects properly
mysql-test/include/have_multi_ndb.inc@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +2 -4
make tests wait until ndb connects properly
mysql-test/include/have_ndb.inc@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -4
make tests wait until ndb connects properly
mysql-test/include/ndb_master-slave.inc@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +12 -0
New BitKeeper file ``mysql-test/include/ndb_master-slave.inc''
mysql-test/include/ndb_master-slave.inc@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +0 -0
mysql-test/include/ndb_not_readonly.inc@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +20 -24
make tests wait until ndb connects properly
mysql-test/t/rpl_commit_after_flush.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_delete_no_where.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_insert_ignore.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update2.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update3.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2innodb.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2myisam.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_UUID.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_auto_inc.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_bank.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_basic.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob2.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_charset.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular_simplex.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_commit_afterflush.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_advance.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_basic.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_partitions.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_ddl.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_delete_nowhere.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_db.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_table.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_extraCol.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +2 -2
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_func003.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_idempotent.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb2ndb.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +2 -4
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb_trans.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_insert_ignore.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_load.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_log.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -2
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update2.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update3.test@stripped, 2007-06-18 15:36:06+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_myisam2ndb.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -4
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_relayrotate.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_rep_ignore.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_row_001.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp003.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp006.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_stm_innodb.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sync.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_trig004.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_ndbapi_multi.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
mysql-test/t/rpl_relayrotate.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_001.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_UUID.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_2myisam.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +3 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_3innodb.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_7ndb.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +3 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_innodb.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_myisam.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_charset.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_func003.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_log.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_log_innodb.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp003.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp006_InnoDB.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +2 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_stm_log.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -0
make tests wait until ndb connects properly
mysql-test/t/rpl_truncate_7ndb.test@stripped, 2007-06-18 15:36:07+02:00, tomas@stripped +1 -1
make tests wait until ndb connects properly
# 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.8/mysql-test/t/rpl_multi_update2.test 2006-02-15 18:06:29 +01:00
+++ 1.9/mysql-test/t/rpl_multi_update2.test 2007-06-18 15:36:06 +02:00
@@ -5,5 +5,6 @@
# Default engine. #
#######################################################
--source include/not_ndb_default.inc
+--source include/master-slave.inc
let $engine_type=MyISAM;
--source extra/rpl_tests/rpl_multi_update2.test
--- 1.8/mysql-test/t/rpl_multi_update3.test 2006-02-15 18:20:46 +01:00
+++ 1.9/mysql-test/t/rpl_multi_update3.test 2007-06-18 15:36:06 +02:00
@@ -5,5 +5,6 @@
# Default engine. #
#######################################################
--source include/not_ndb_default.inc
+--source include/master-slave.inc
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_multi_update3.test
--- 1.1/mysql-test/t/rpl_ndb_innodb_trans.test 2006-09-05 16:52:03 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_innodb_trans.test 2007-06-18 15:36:06 +02:00
@@ -2,7 +2,7 @@
-- source include/have_ndb.inc
-- source include/have_innodb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
create table t1 (a int, unique(a)) engine=ndbcluster;
create table t2 (a int, unique(a)) engine=innodb;
--- 1.10/mysql-test/t/rpl_commit_after_flush.test 2006-05-17 15:06:06 +02:00
+++ 1.11/mysql-test/t/rpl_commit_after_flush.test 2007-06-18 15:36:06 +02:00
@@ -7,5 +7,6 @@
########################################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
+-- source include/master-slave.inc
let $engine_type=innodb;
-- source extra/rpl_tests/rpl_commit_after_flush.test
--- 1.6/mysql-test/t/rpl_insert_ignore.test 2006-05-17 15:06:08 +02:00
+++ 1.7/mysql-test/t/rpl_insert_ignore.test 2007-06-18 15:36:06 +02:00
@@ -3,6 +3,7 @@
#####################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
+-- source include/master-slave.inc
let $engine_type=innodb;
let $engine_type2=myisam;
-- source extra/rpl_tests/rpl_insert_ignore.test
--- 1.19/mysql-test/t/rpl_relayrotate.test 2006-04-25 10:57:26 +02:00
+++ 1.20/mysql-test/t/rpl_relayrotate.test 2007-06-18 15:36:07 +02:00
@@ -6,5 +6,6 @@
#######################################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
+-- source include/master-slave.inc
let $engine_type=innodb;
-- source extra/rpl_tests/rpl_relayrotate.test
--- 1.2/mysql-test/t/rpl_ndb_do_db.test 2007-01-04 04:08:22 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_do_db.test 2007-06-18 15:36:06 +02:00
@@ -7,7 +7,7 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--disable_warnings
DROP DATABASE IF EXISTS replica;
--- 1.3/mysql-test/t/rpl_ndb_do_table.test 2007-03-22 13:17:06 +01:00
+++ 1.4/mysql-test/t/rpl_ndb_do_table.test 2007-06-18 15:36:06 +02:00
@@ -7,7 +7,7 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--disable_warnings
DROP TABLE IF EXISTS t1, t2;
--- 1.1/mysql-test/t/rpl_ndb_extraCol.test 2006-11-03 15:04:58 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_extraCol.test 2007-06-18 15:36:06 +02:00
@@ -5,8 +5,8 @@
# Using NDB
###########################################
-- source include/have_binlog_format_row.inc
---source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
let $engine_type = 'NDB';
-- source extra/rpl_tests/rpl_extraSlave_Col.test
--- 1.2/mysql-test/t/rpl_ndb_rep_ignore.test 2007-01-04 04:08:52 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_rep_ignore.test 2007-06-18 15:36:07 +02:00
@@ -8,7 +8,7 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--disable_warnings
DROP DATABASE IF EXISTS replica;
--- 1.7/mysql-test/extra/rpl_tests/rpl_row_blob.test 2007-02-20 18:47:45 +01:00
+++ 1.8/mysql-test/extra/rpl_tests/rpl_row_blob.test 2007-06-18 15:36:05 +02:00
@@ -5,10 +5,6 @@
# correctly.
################################################
-# Includes
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-
# Pre test clean up section
connection master;
--disable_warnings
--- 1.1/mysql-test/t/rpl_ndb_2innodb.test 2006-02-27 14:52:34 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_2innodb.test 2007-06-18 15:36:06 +02:00
@@ -8,7 +8,7 @@
# test and to have control over the tests.
##############################################################
-- source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
connection slave;
-- source include/have_innodb.inc
connection master;
--- 1.1/mysql-test/t/rpl_ndb_2myisam.test 2006-02-27 14:52:53 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_2myisam.test 2007-06-18 15:36:06 +02:00
@@ -8,6 +8,6 @@
# test and to have control over the tests.
##############################################################
-- source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
SET storage_engine=ndb;
--source extra/rpl_tests/rpl_ndb_2multi_eng.test
--- 1.1/mysql-test/t/rpl_ndb_UUID.test 2006-02-15 21:44:21 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_UUID.test 2007-06-18 15:36:06 +02:00
@@ -2,5 +2,7 @@
# By JBM 2005-02-15 Wrapped to allow reuse of test code#
########################################################
--source include/have_ndb.inc
+--source include/have_binlog_format_row.inc
+--source include/ndb_master-slave.inc
let $engine_type=NDB;
--source extra/rpl_tests/rpl_row_UUID.test
--- 1.4/mysql-test/t/rpl_ndb_auto_inc.test 2006-10-24 18:21:20 +02:00
+++ 1.5/mysql-test/t/rpl_ndb_auto_inc.test 2007-06-18 15:36:06 +02:00
@@ -7,8 +7,8 @@
# Change: Augmented test to use with cluster
#####################################
--source include/have_ndb.inc
---source include/master-slave.inc
--source include/have_binlog_format_mixed_or_row.inc
+--source include/ndb_master-slave.inc
--echo ***************** Test 1 ************************
--echo
--- 1.1/mysql-test/t/rpl_ndb_blob2.test 2006-02-10 16:50:52 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_blob2.test 2007-06-18 15:36:06 +02:00
@@ -4,6 +4,8 @@
# code between engine tests #
#################################
-- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_blob.test
--- 1.1/mysql-test/t/rpl_ndb_charset.test 2006-02-15 22:10:50 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_charset.test 2007-06-18 15:36:06 +02:00
@@ -2,5 +2,7 @@
# By JBM 2005-02-15 Wrapped to allow reuse of test code#
########################################################
--source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_row_charset.test
--- 1.3/mysql-test/t/rpl_ndb_commit_afterflush.test 2006-05-20 12:35:03 +02:00
+++ 1.4/mysql-test/t/rpl_ndb_commit_afterflush.test 2007-06-18 15:36:06 +02:00
@@ -5,5 +5,6 @@
# By JBM 2004-02-15 #
#####################################
-- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_commit_after_flush.test
--- 1.11/mysql-test/t/rpl_ndb_dd_advance.test 2007-02-20 18:47:45 +01:00
+++ 1.12/mysql-test/t/rpl_ndb_dd_advance.test 2007-06-18 15:36:06 +02:00
@@ -11,7 +11,7 @@
--source include/not_embedded.inc
--source include/big_test.inc
#--source include/have_ndb_extra.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
#### Test start cleanup section #####
--disable_warnings
--- 1.1/mysql-test/t/rpl_ndb_dd_partitions.test 2006-06-27 18:44:10 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_dd_partitions.test 2007-06-18 15:36:06 +02:00
@@ -7,7 +7,7 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--echo --- Doing pre test cleanup ---
--- 1.3/mysql-test/t/rpl_ndb_ddl.test 2007-03-06 18:15:30 +01:00
+++ 1.4/mysql-test/t/rpl_ndb_ddl.test 2007-06-18 15:36:06 +02:00
@@ -23,8 +23,8 @@
# abort of the test case etc..
#
---source include/master-slave.inc
--source include/have_ndb.inc
+--source include/ndb_master-slave.inc
let $engine_type= NDB;
let $temp_engine_type= MEMORY;
let $show_binlog = 0;
--- 1.3/mysql-test/t/rpl_ndb_delete_nowhere.test 2006-04-19 10:20:08 +02:00
+++ 1.4/mysql-test/t/rpl_ndb_delete_nowhere.test 2007-06-18 15:36:06 +02:00
@@ -4,5 +4,6 @@
#########################################
--source include/have_ndb.inc
-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_delete_no_where.test
--- 1.2/mysql-test/t/rpl_ndb_func003.test 2006-08-22 09:48:12 +02:00
+++ 1.3/mysql-test/t/rpl_ndb_func003.test 2007-06-18 15:36:06 +02:00
@@ -7,6 +7,8 @@
# reduce test case code #
###################################
-- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_row_func003.test
-- source include/master-slave-end.inc
--- 1.1/mysql-test/t/rpl_ndb_innodb2ndb.test 2006-02-27 14:55:39 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_innodb2ndb.test 2007-06-18 15:36:06 +02:00
@@ -7,10 +7,8 @@
# to be able to use the same code for all these different
# test and to have control over the tests.
##############################################################
--- source include/have_innodb.inc
--- source include/master-slave.inc
-connection slave;
-- source include/have_ndb.inc
-connection master;
+-- source include/have_innodb.inc
+-- source include/ndb_master-slave.inc
SET storage_engine=innodb;
--source extra/rpl_tests/rpl_ndb_2multi_eng.test
--- 1.3/mysql-test/t/rpl_ndb_insert_ignore.test 2006-05-20 12:35:04 +02:00
+++ 1.4/mysql-test/t/rpl_ndb_insert_ignore.test 2007-06-18 15:36:06 +02:00
@@ -3,6 +3,7 @@
#####################################
-- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
let $engine_type2=myisam;
-- source extra/rpl_tests/rpl_insert_ignore.test
--- 1.1/mysql-test/t/rpl_ndb_log.test 2006-02-06 23:11:43 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_log.test 2007-06-18 15:36:06 +02:00
@@ -7,6 +7,7 @@
###################################
-- source include/have_binlog_format_row.inc
-- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_log.test
--- 1.2/mysql-test/t/rpl_ndb_multi_update2.test 2006-03-15 16:29:20 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_multi_update2.test 2007-06-18 15:36:06 +02:00
@@ -7,6 +7,7 @@
# Run this only for row based replication, as replication of
# auto_increment values are not supported with NDB as storage engine
-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
--source extra/rpl_tests/rpl_multi_update2.test
--- 1.2/mysql-test/t/rpl_ndb_multi_update3.test 2006-04-19 10:20:08 +02:00
+++ 1.3/mysql-test/t/rpl_ndb_multi_update3.test 2007-06-18 15:36:06 +02:00
@@ -4,5 +4,6 @@
############################################################
-- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_multi_update3.test
--- 1.1/mysql-test/t/rpl_ndb_myisam2ndb.test 2006-02-27 14:55:53 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_myisam2ndb.test 2007-06-18 15:36:07 +02:00
@@ -7,9 +7,6 @@
# to be able to use the same code for all these different
# test and to have control over the tests.
##############################################################
--- source include/master-slave.inc
-connection slave;
---source include/have_ndb.inc
-connection master;
+-- source include/ndb_master-slave.inc
SET storage_engine=myisam;
--source extra/rpl_tests/rpl_ndb_2multi_eng.test
--- 1.1/mysql-test/t/rpl_ndb_relayrotate.test 2006-02-15 18:39:22 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_relayrotate.test 2007-06-18 15:36:07 +02:00
@@ -4,5 +4,6 @@
############################################################
-- source include/have_ndb.inc
-- source include/have_ndb_extra.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_relayrotate.test
--- 1.1/mysql-test/t/rpl_ndb_row_001.test 2006-02-15 21:35:59 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_row_001.test 2007-06-18 15:36:07 +02:00
@@ -2,5 +2,7 @@
# By JBM 2005-02-15 Wrapped to allow reuse of test code#
########################################################
--source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_row_001.test
--- 1.1/mysql-test/t/rpl_ndb_sp003.test 2006-02-09 23:18:10 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_sp003.test 2007-06-18 15:36:07 +02:00
@@ -5,5 +5,7 @@
# For different engines #
#################################
-- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_sp003.test
--- 1.2/mysql-test/t/rpl_ndb_sp006.test 2006-02-09 23:02:26 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_sp006.test 2007-06-18 15:36:07 +02:00
@@ -5,5 +5,7 @@
# For different engines #
#################################
-- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_sp006.test
--- 1.1/mysql-test/t/rpl_ndb_trig004.test 2006-02-14 23:55:39 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_trig004.test 2007-06-18 15:36:07 +02:00
@@ -9,7 +9,7 @@
# Includes
-- source include/have_binlog_format_row.inc
-- source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_trig004.test
--- 1.3/mysql-test/t/rpl_row_blob_innodb.test 2006-02-15 19:01:01 +01:00
+++ 1.4/mysql-test/t/rpl_row_blob_innodb.test 2007-06-18 15:36:07 +02:00
@@ -7,6 +7,8 @@
########################################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=InnoDB;
-- source extra/rpl_tests/rpl_row_blob.test
--- 1.2/mysql-test/t/rpl_row_blob_myisam.test 2006-02-15 18:49:33 +01:00
+++ 1.3/mysql-test/t/rpl_row_blob_myisam.test 2007-06-18 15:36:07 +02:00
@@ -6,6 +6,8 @@
# Added to skip if ndb is default #
########################################################
-- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=myisam;
-- source extra/rpl_tests/rpl_row_blob.test
--- 1.2/mysql-test/t/rpl_row_log.test 2006-02-15 18:51:37 +01:00
+++ 1.3/mysql-test/t/rpl_row_log.test 2007-06-18 15:36:07 +02:00
@@ -11,6 +11,7 @@
########################################################
-- source include/not_ndb_default.inc
-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_log.test
--- 1.2/mysql-test/t/rpl_row_log_innodb.test 2006-02-15 19:02:38 +01:00
+++ 1.3/mysql-test/t/rpl_row_log_innodb.test 2007-06-18 15:36:07 +02:00
@@ -8,6 +8,7 @@
-- source include/not_ndb_default.inc
-- source include/have_binlog_format_row.inc
-- source include/have_innodb.inc
+-- source include/master-slave.inc
let $engine_type=InnoDB;
-- source extra/rpl_tests/rpl_log.test
--- 1.1/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test 2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test 2007-06-18 15:36:05 +02:00
@@ -2,8 +2,6 @@
# Test updated to use a wrapper #
#################################
--- source include/master-slave.inc
-
eval CREATE TABLE t1 (a INT) ENGINE=$engine_type;
begin;
--- 1.1/mysql-test/extra/rpl_tests/rpl_delete_no_where.test 2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_delete_no_where.test 2007-06-18 15:36:05 +02:00
@@ -2,8 +2,6 @@
# (not internally row-per-row but more like a TRUNCATE, MyISAM
# supports that), is replicated (BUG#13576).
--- source include/master-slave.inc
-
eval create table t1 (a int, b int) engine=$engine_type;
insert into t1 values(1,1);
sync_slave_with_master;
--- 1.1/mysql-test/extra/rpl_tests/rpl_insert_ignore.test 2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_insert_ignore.test 2007-06-18 15:36:05 +02:00
@@ -5,8 +5,6 @@
# Slave needs to be started with --innodb to store table in InnoDB.
# Same test for MyISAM (which had no bug).
--- source include/master-slave.inc
-
eval CREATE TABLE t1 (
a int unsigned not null auto_increment primary key,
b int unsigned,
--- 1.1/mysql-test/extra/rpl_tests/rpl_multi_update2.test 2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_multi_update2.test 2007-06-18 15:36:05 +02:00
@@ -2,8 +2,6 @@
# some replicate-* rules exist.
# (BUG#7011)
-source include/master-slave.inc;
-
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
--- 1.3/mysql-test/extra/rpl_tests/rpl_multi_update3.test 2006-08-29 10:47:27 +02:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_multi_update3.test 2007-06-18 15:36:05 +02:00
@@ -1,5 +1,3 @@
--- source include/master-slave.inc
-
##############################################################################
#
# Let's verify that multi-update with a subselect does not cause the slave to crash
--- 1.2/mysql-test/extra/rpl_tests/rpl_relayrotate.test 2007-04-17 13:41:14 +02:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_relayrotate.test 2007-06-18 15:36:05 +02:00
@@ -8,8 +8,6 @@
# The slave is started with max_binlog_size=16384 bytes,
# to force many rotations (approximately 30 rotations)
--- source include/master-slave.inc
-
# We have to sync with master, to ensure slave had time to start properly
# before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log.
connection master;
--- 1.3/mysql-test/extra/rpl_tests/rpl_row_001.test 2006-02-22 10:07:30 +01:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_row_001.test 2007-06-18 15:36:05 +02:00
@@ -1,6 +1,3 @@
--- source include/master-slave.inc
--- source include/have_binlog_format_row.inc
-
CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--- 1.5/mysql-test/extra/rpl_tests/rpl_row_UUID.test 2007-02-20 18:47:45 +01:00
+++ 1.6/mysql-test/extra/rpl_tests/rpl_row_UUID.test 2007-06-18 15:36:05 +02:00
@@ -5,10 +5,6 @@
# TEST: To test the UUID() in rbr #
#############################################################################
-# Includes
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-
# Begin clean up test section
connection master;
--- 1.6/mysql-test/extra/rpl_tests/rpl_row_charset.test 2007-03-29 21:37:58 +02:00
+++ 1.7/mysql-test/extra/rpl_tests/rpl_row_charset.test 2007-06-18 15:36:05 +02:00
@@ -1,10 +1,6 @@
# Replication of character sets.
# This test will fail if the server/client does not support enough charsets.
-# Requires statement logging
--- source include/have_binlog_format_row.inc
-
--- source include/master-slave.inc
--disable_warnings
set timestamp=1000000000;
drop database if exists mysqltest2;
--- 1.4/mysql-test/extra/rpl_tests/rpl_row_func003.test 2007-03-01 14:16:36 +01:00
+++ 1.5/mysql-test/extra/rpl_tests/rpl_row_func003.test 2007-06-18 15:36:05 +02:00
@@ -18,11 +18,6 @@
# Vs slave. #
#############################################################################
-# Includes
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-
-
# Begin clean up test section
connection master;
--disable_warnings
--- 1.3/mysql-test/extra/rpl_tests/rpl_row_sp003.test 2007-03-29 20:31:01 +02:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_row_sp003.test 2007-06-18 15:36:06 +02:00
@@ -3,11 +3,6 @@
# Original Date: Aug/13/2005 Created from Bug 12335 #
#############################################################################
-# Includes
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-
-
# Begin clean up test section
connection master;
--disable_warnings
--- 1.4/mysql-test/extra/rpl_tests/rpl_row_sp006.test 2007-02-20 18:47:45 +01:00
+++ 1.5/mysql-test/extra/rpl_tests/rpl_row_sp006.test 2007-06-18 15:36:06 +02:00
@@ -8,10 +8,6 @@
# to populate a table with data from the first table. #
#############################################################################
-# Includes
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-
# Begin clean up test section
connection master;
--disable_warnings
--- 1.5/mysql-test/extra/rpl_tests/rpl_row_basic.test 2007-01-22 18:08:43 +01:00
+++ 1.6/mysql-test/extra/rpl_tests/rpl_row_basic.test 2007-06-18 15:36:05 +02:00
@@ -1,6 +1,3 @@
---source include/have_binlog_format_row.inc
---source include/master-slave.inc
-
#
# Basic tests of row-level logging
#
--- 1.3/mysql-test/t/rpl_delete_no_where.test 2006-02-14 22:58:51 +01:00
+++ 1.4/mysql-test/t/rpl_delete_no_where.test 2007-06-18 15:36:06 +02:00
@@ -2,5 +2,6 @@
# By JBM 2006-02-14 added to skip test when NDB #
##################################################
-- source include/not_ndb_default.inc
+-- source include/master-slave.inc
let $engine_type=myisam;
-- source extra/rpl_tests/rpl_delete_no_where.test
--- 1.2/mysql-test/t/rpl_row_001.test 2006-02-15 18:48:57 +01:00
+++ 1.3/mysql-test/t/rpl_row_001.test 2007-06-18 15:36:07 +02:00
@@ -3,5 +3,7 @@
# Added to skip if ndb is default #
########################################################
-- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=MYISAM;
-- source extra/rpl_tests/rpl_row_001.test
--- 1.2/mysql-test/t/rpl_row_UUID.test 2006-02-15 18:52:09 +01:00
+++ 1.3/mysql-test/t/rpl_row_UUID.test 2007-06-18 15:36:07 +02:00
@@ -3,5 +3,7 @@
# Added to skip if ndb is default #
########################################################
-- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=myisam;
--source extra/rpl_tests/rpl_row_UUID.test
--- 1.2/mysql-test/t/rpl_row_basic_2myisam.test 2006-10-02 13:38:00 +02:00
+++ 1.3/mysql-test/t/rpl_row_basic_2myisam.test 2007-06-18 15:36:07 +02:00
@@ -1,3 +1,6 @@
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
+
let $type= 'MYISAM' ;
let $extra_index= ;
-- source extra/rpl_tests/rpl_row_basic.test
--- 1.2/mysql-test/t/rpl_row_basic_3innodb.test 2006-10-02 13:38:00 +02:00
+++ 1.3/mysql-test/t/rpl_row_basic_3innodb.test 2007-06-18 15:36:07 +02:00
@@ -1,4 +1,6 @@
-- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $type= 'INNODB' ;
let $extra_index= ;
--- 1.2/mysql-test/t/rpl_row_charset.test 2006-02-15 18:50:06 +01:00
+++ 1.3/mysql-test/t/rpl_row_charset.test 2007-06-18 15:36:07 +02:00
@@ -3,5 +3,7 @@
# Added to skip if ndb is default #
########################################################
-- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=myisam;
-- source extra/rpl_tests/rpl_row_charset.test
--- 1.2/mysql-test/t/rpl_row_func003.test 2006-02-15 19:01:47 +01:00
+++ 1.3/mysql-test/t/rpl_row_func003.test 2007-06-18 15:36:07 +02:00
@@ -7,5 +7,7 @@
########################################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=INNODB;
-- source extra/rpl_tests/rpl_row_func003.test
--- 1.2/mysql-test/t/rpl_row_sp003.test 2006-02-15 19:04:15 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp003.test 2007-06-18 15:36:07 +02:00
@@ -7,5 +7,7 @@
########################################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=INNODB;
-- source extra/rpl_tests/rpl_row_sp003.test
--- 1.2/mysql-test/t/rpl_row_sp006_InnoDB.test 2006-02-15 19:04:52 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp006_InnoDB.test 2007-06-18 15:36:07 +02:00
@@ -7,5 +7,7 @@
########################################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $engine_type=InnoDB;
-- source extra/rpl_tests/rpl_row_sp006.test
--- 1.3/mysql-test/t/rpl_stm_log.test 2006-08-30 09:22:41 +02:00
+++ 1.4/mysql-test/t/rpl_stm_log.test 2007-06-18 15:36:07 +02:00
@@ -1,5 +1,6 @@
# Requires statement logging
-- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/master-slave.inc
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_log.test
--- 1.16/mysql-test/include/have_ndb.inc 2007-01-16 09:38:07 +01:00
+++ 1.17/mysql-test/include/have_ndb.inc 2007-06-18 15:36:06 +02:00
@@ -2,8 +2,5 @@
disable_query_log;
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
enable_query_log;
-
-
-
-
--- 1.7/mysql-test/t/rpl_truncate_7ndb.test 2006-10-05 00:36:01 +02:00
+++ 1.8/mysql-test/t/rpl_truncate_7ndb.test 2007-06-18 15:36:07 +02:00
@@ -1,6 +1,6 @@
--source include/have_ndb.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--source include/have_binlog_format_mixed_or_row.inc
--disable_query_log
--- 1.4/mysql-test/t/rpl_ndb_circular_simplex.test 2007-04-17 08:36:11 +02:00
+++ 1.5/mysql-test/t/rpl_ndb_circular_simplex.test 2007-06-18 15:36:06 +02:00
@@ -1,6 +1,6 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
connection master;
CREATE TABLE t1 (a int key, b int) ENGINE=NDB;
--- 1.2/mysql-test/t/rpl_ndbapi_multi.test 2006-09-01 16:14:38 +02:00
+++ 1.3/mysql-test/t/rpl_ndbapi_multi.test 2007-06-18 15:36:07 +02:00
@@ -1,7 +1,7 @@
-- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-- source include/have_ndbapi_examples.inc
+-- source include/ndb_master-slave.inc
--exec echo Running ndbapi_simple_dual
--exec $NDB_EXAMPLES_DIR/ndbapi_simple_dual/ndbapi_simple_dual $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" $SLAVE_MYSOCK "localhost:$NDBCLUSTER_PORT_SLAVE" >> $NDB_EXAMPLES_OUTPUT
--- 1.5/mysql-test/include/have_multi_ndb.inc 2006-12-22 13:34:21 +01:00
+++ 1.6/mysql-test/include/have_multi_ndb.inc 2007-06-18 15:36:06 +02:00
@@ -11,6 +11,7 @@
flush tables;
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
enable_query_log;
# Check that server2 has NDB support
@@ -22,11 +23,8 @@
flush tables;
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
enable_query_log;
-
-# Check should be here as well...
-# # Check that second master mysqld has come out of redonly mode
-# --source include/ndb_not_readonly.inc
# Set the default connection to 'server1'
connection server1;
--- 1.1/mysql-test/include/ndb_not_readonly.inc 2006-12-22 13:57:31 +01:00
+++ 1.2/mysql-test/include/ndb_not_readonly.inc 2007-06-18 15:36:06 +02:00
@@ -1,31 +1,27 @@
# Check that server has come out ot readonly mode
---disable_query_log
-let $counter= 100;
+#
+# wait for server to connect properly to cluster
+#
+--error 0,ER_CHECK_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND
+delete from mysql.ndb_apply_status where server_id=0;
let $mysql_errno= 1;
+let $counter= 600;
while ($mysql_errno)
{
- --error 0, 1005
- create table check_read_only(a int) engine=NDB;
- sleep 0.1;
- if (!$counter)
+ # Table is readonly until the mysqld has connected properly
+ --error 0,ER_CHECK_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG
+ replace into mysql.ndb_apply_status values(0,0,"",0,0);
+ if ($mysql_errno)
{
- die("Failed while waiting for mysqld to come out of readonly mode");
+ if (!$counter)
+ {
+ die("Failed while waiting for mysqld to come out of readonly mode");
+ }
+ dec $counter;
+ --sleep 0.1
}
- dec $counter;
}
-
-let $counter= 100;
-let $mysql_errno= 1;
-while ($mysql_errno)
-{
- --error 0, 1036
- insert into check_read_only values(1);
- sleep 0.1;
- if (!$counter)
- {
- die("Failed while waiting for mysqld to come out of readonly mode");
- }
- dec $counter;
-}
-drop table check_read_only;
---enable_query_log
+delete from mysql.ndb_apply_status where server_id=0;
+#
+# connected
+#
--- 1.4/mysql-test/t/rpl_ndb_blob.test 2006-03-10 10:21:32 +01:00
+++ 1.5/mysql-test/t/rpl_ndb_blob.test 2007-06-18 15:36:06 +02:00
@@ -1,6 +1,6 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
#
# basic test of blob replication for NDB
--- 1.45/mysql-test/extra/rpl_tests/rpl_log.test 2007-03-30 10:26:59 +02:00
+++ 1.46/mysql-test/extra/rpl_tests/rpl_log.test 2007-06-18 15:36:05 +02:00
@@ -1,5 +1,4 @@
# Requires statement logging
--- source include/master-slave.inc
# Clean up old slave's binlogs.
# The slave is started with --log-slave-updates
--- 1.9/mysql-test/t/rpl_ndb_bank.test 2007-02-20 18:47:45 +01:00
+++ 1.10/mysql-test/t/rpl_ndb_bank.test 2007-06-18 15:36:06 +02:00
@@ -13,7 +13,7 @@
--source include/have_ndb.inc
--source include/have_ndb_extra.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
# kill any trailing processes
--system killall lt-bankTransactionMaker lt-bankTimer lt-bankMakeGL || true
--- 1.10/mysql-test/t/rpl_ndb_basic.test 2007-04-11 07:59:22 +02:00
+++ 1.11/mysql-test/t/rpl_ndb_basic.test 2007-06-18 15:36:06 +02:00
@@ -1,6 +1,6 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--- 1.6/mysql-test/t/rpl_ndb_dd_basic.test 2007-04-18 23:08:53 +02:00
+++ 1.7/mysql-test/t/rpl_ndb_dd_basic.test 2007-06-18 15:36:06 +02:00
@@ -1,6 +1,6 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--disable_warnings
DROP TABLE IF EXISTS t1;
--- 1.6/mysql-test/t/rpl_ndb_idempotent.test 2006-12-01 15:48:24 +01:00
+++ 1.7/mysql-test/t/rpl_ndb_idempotent.test 2007-06-18 15:36:06 +02:00
@@ -1,6 +1,6 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
#
# Currently test only works with ndb since it retrieves "old"
--- 1.1/mysql-test/t/rpl_ndb_load.test 2006-01-12 19:50:46 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_load.test 2007-06-18 15:36:06 +02:00
@@ -7,7 +7,7 @@
--source include/have_ndb.inc
--source include/have_ndb_extra.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--disable_warnings
# reset master
--- 1.4/mysql-test/t/rpl_ndb_multi.test 2006-12-01 15:48:24 +01:00
+++ 1.5/mysql-test/t/rpl_ndb_multi.test 2007-06-18 15:36:06 +02:00
@@ -1,7 +1,6 @@
---source include/have_ndb.inc
--source include/have_multi_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
# note: server2 is another "master" connected to the master cluster
--- 1.11/mysql-test/t/rpl_ndb_sync.test 2006-12-01 15:48:24 +01:00
+++ 1.12/mysql-test/t/rpl_ndb_sync.test 2007-06-18 15:36:07 +02:00
@@ -2,7 +2,7 @@
--source include/ndb_default_cluster.inc
--source include/not_embedded.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
#
# Currently test only works with ndb since it retrieves "old"
--- 1.3/mysql-test/t/rpl_row_basic_7ndb.test 2006-10-02 13:38:00 +02:00
+++ 1.4/mysql-test/t/rpl_row_basic_7ndb.test 2007-06-18 15:36:07 +02:00
@@ -1,4 +1,7 @@
-- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
+
let $type= 'NDB' ;
let $extra_index= ;
-- source extra/rpl_tests/rpl_row_basic.test
--- New file ---
+++ mysql-test/include/ndb_master-slave.inc 07/06/18 15:36:07
connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connection slave;
-- source include/have_ndb.inc
-- source include/master-slave-reset.inc
# Set the default connection to 'master'
connection master;
--- 1.1/mysql-test/t/rpl_ndb_circular.test 2007-04-12 16:13:46 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_circular.test 2007-06-18 15:36:06 +02:00
@@ -1,6 +1,6 @@
--source include/have_ndb.inc
--source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
# set up circular replication
--- 1.1/mysql-test/t/rpl_ndb_stm_innodb.test 2007-04-03 07:20:52 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_stm_innodb.test 2007-06-18 15:36:07 +02:00
@@ -1,7 +1,7 @@
--source include/have_ndb.inc
--source include/have_innodb.inc
--source include/have_binlog_format_mixed_or_statement.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
--connection master
create table t1 (a int key, b int) engine innodb;
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2527) BUG#25305 | tomas | 18 Jun |
