Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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-12 04:28:58+02:00, jmiller@stripped +13 -0
Many files:
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
New include files to replace the old mysqltest.c wait_for_slave_to_stop function. This should help with the stability of the tests that use stop slave or depend on slave failure. This should complete Bug#28497
mysql-test/include/wait_for_slave_io_to_stop.inc@stripped, 2007-06-12 04:24:39+02:00, jmiller@stripped +31 -0
New include files to replace the old mysqltest.c wait_for_slave_to_stop function. This should help with the stability of the tests that use stop slave or depend on slave failure. This should complete Bug#28497
mysql-test/include/wait_for_slave_io_to_stop.inc@stripped, 2007-06-12 04:24:39+02:00, jmiller@stripped +0 -0
mysql-test/include/wait_for_slave_sql_to_stop.inc@stripped, 2007-06-12 04:24:39+02:00, jmiller@stripped +31 -0
New include files to replace the old mysqltest.c wait_for_slave_to_stop function. This should help with the stability of the tests that use stop slave or depend on slave failure. This should complete Bug#28497
mysql-test/include/wait_for_slave_sql_to_stop.inc@stripped, 2007-06-12 04:24:39+02:00, jmiller@stripped +0 -0
mysql-test/include/wait_for_slave_to_stop.inc@stripped, 2007-06-12 04:24:39+02:00, jmiller@stripped +38 -0
New include files to replace the old mysqltest.c wait_for_slave_to_stop function. This should help with the stability of the tests that use stop slave or depend on slave failure. This should complete Bug#28497
mysql-test/include/wait_for_slave_to_stop.inc@stripped, 2007-06-12 04:24:39+02:00, jmiller@stripped +0 -0
mysql-test/t/rpl_critical_errors.test@stripped, 2007-06-12 04:26:42+02:00, jmiller@stripped +1 -1
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_dual_pos_advance.test@stripped, 2007-06-12 04:26:57+02:00, jmiller@stripped +1 -0
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_incident.test@stripped, 2007-06-12 04:27:10+02:00, jmiller@stripped +1 -1
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_known_bugs_detection.test@stripped, 2007-06-12 04:27:18+02:00, jmiller@stripped +2 -2
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_rotate_logs.test@stripped, 2007-06-12 04:27:33+02:00, jmiller@stripped +1 -1
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_row_inexist_tbl.test@stripped, 2007-06-12 04:27:50+02:00, jmiller@stripped +1 -1
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_row_stop_middle_update.test@stripped, 2007-06-12 04:28:14+02:00, jmiller@stripped +1 -1
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_row_until.test@stripped, 2007-06-12 04:28:24+02:00, jmiller@stripped +4 -4
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_stm_mystery22.test@stripped, 2007-06-12 04:28:36+02:00, jmiller@stripped +1 -1
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
mysql-test/t/rpl_stm_until.test@stripped, 2007-06-12 04:28:42+02:00, jmiller@stripped +4 -4
Updated test files. Updated to use new include. Result files had no changes. Bug#28497
# 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: jmiller
# Host: ndb08.mysql.com
# Root: /data1/mysql-5.1
--- 1.25/mysql-test/t/rpl_stm_until.test 2007-06-12 04:29:10 +02:00
+++ 1.26/mysql-test/t/rpl_stm_until.test 2007-06-12 04:29:10 +02:00
@@ -27,7 +27,7 @@
connection slave;
start slave until master_log_file='master-bin.000001', master_log_pos=323;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
# here table should be still not deleted
select * from t1;
--replace_result $MASTER_MYPORT MASTER_MYPORT
@@ -39,7 +39,7 @@
# again this table should be still not deleted
select * from t1;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 #
--query_vertical SHOW SLAVE STATUS
@@ -47,7 +47,7 @@
# try replicate all up to and not including the second insert to t2;
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
select * from t2;
--replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 #
@@ -64,7 +64,7 @@
# this should stop immediately as we are already there
start slave until master_log_file='master-bin.000001', master_log_pos=776;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
# here the sql slave thread should be stopped
--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
--replace_column 1 # 9 # 23 # 33 #
--- 1.2/mysql-test/t/rpl_known_bugs_detection.test 2007-06-12 04:29:10 +02:00
+++ 1.3/mysql-test/t/rpl_known_bugs_detection.test 2007-06-12 04:29:10 +02:00
@@ -25,7 +25,7 @@
INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;
SELECT * FROM t1;
connection slave;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_to_stop.inc
# show the error message
--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #
--query_vertical show slave status;
@@ -79,7 +79,7 @@
t1.field_3 = t2.field_c;
SELECT * FROM t1;
connection slave;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_to_stop.inc
# show the error message
--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #
--query_vertical show slave status;
--- 1.2/mysql-test/t/rpl_dual_pos_advance.test 2007-06-12 04:29:10 +02:00
+++ 1.3/mysql-test/t/rpl_dual_pos_advance.test 2007-06-12 04:29:10 +02:00
@@ -62,6 +62,7 @@
# select master_pos_wait("slave-bin.000001",137);
# wait_for_slave_to_stop;
+# Should use --source include/wait_for_slave_to_stop.inc
# then BUG#13861 causes t3 to show up below (because stopped too
# late).
--- New file ---
+++ mysql-test/include/wait_for_slave_io_to_stop.inc 07/06/12 04:24:39
###################################################
#Author: Jeb
#Date: 2007-06-11
#Purpose: used for io errors on the slave. If Slave gets an io
# error, the io trhead should stop
#Details:
# 1) Fill in and setup variables
# 2) loop through looking for
# sql threads to stop
# 3) If loops too long die.
####################################################
connection slave;
let $my_show= SHOW SLAVE STATUS;
let $sql_running= Slave_IO_Running;
let $row_number= 1;
let $run= 1;
let $counter= 300;
while ($run)
{
let $sql_result= query_get_value($my_show, $io_running, $row_number);
if (`SELECT '$sql_result' = 'No'`){
let $run= 0;
}
sleep 0.1;
if (!$counter){
die("Failed while waiting for slave IO thread to stop");
}
dec $counter;
}
--- New file ---
+++ mysql-test/include/wait_for_slave_sql_to_stop.inc 07/06/12 04:24:39
###################################################
#Author: Jeb
#Date: 2007-06-11
#Purpose: used for SQL errors on the slave. If Slave gets a sql
# error, the SQL trhead should stop
#Details:
# 1) Fill in and setup variables
# 2) loop through looking for
# sql threads to stop
# 3) If loops too long die.
####################################################
connection slave;
let $my_show= SHOW SLAVE STATUS;
let $sql_running= Slave_SQL_Running;
let $row_number= 1;
let $run= 1;
let $counter= 300;
while ($run)
{
let $sql_result= query_get_value($my_show, $sql_running, $row_number);
if (`SELECT '$sql_result' = 'No'`){
let $run= 0;
}
sleep 0.1;
if (!$counter){
die("Failed while waiting for slave SQL thread to stop");
}
dec $counter;
}
--- New file ---
+++ mysql-test/include/wait_for_slave_to_stop.inc 07/06/12 04:24:39
###################################################
#Author: Jeb
#Date: 2007-06-11
#Purpose: To replace the mysqltest.c executable
# wait_for_slave_to_stop function and
# return this to the test language.
#Details:
# 1) Fill in and setup variables
# 2) loop through looking for both
# io and sql threads to stop
# 3) If loops too long die.
####################################################
connection slave;
let $my_show= SHOW SLAVE STATUS;
let $io_running= Slave_IO_Running;
let $sql_running= Slave_SQL_Running;
let $row_number= 1;
let $run= 1;
let $counter= 300;
while ($run)
{
let $io_result= query_get_value($my_show, $io_running, $row_number);
if (`SELECT '$io_result' = 'No'`){
let $sql_result= query_get_value($my_show, $sql_running, $row_number);
if (`SELECT '$sql_result' = 'No'`){
let $run= 0;
}
}
sleep 0.1;
if (!$counter){
die("Failed while waiting for slave to stop");
}
dec $counter;
}
--- 1.2/mysql-test/t/rpl_row_inexist_tbl.test 2007-06-12 04:29:10 +02:00
+++ 1.3/mysql-test/t/rpl_row_inexist_tbl.test 2007-06-12 04:29:10 +02:00
@@ -23,7 +23,7 @@
connection slave;
# slave should have stopped because can't find table t1
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
# see if we have a good error message:
--replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 7 # 8 # 9 # 23 # 33 #
--- 1.2/mysql-test/t/rpl_row_stop_middle_update.test 2007-06-12 04:29:10 +02:00
+++ 1.3/mysql-test/t/rpl_row_stop_middle_update.test 2007-06-12 04:29:10 +02:00
@@ -20,7 +20,7 @@
# Rows_log_event (out of 3) but should wait until the last one is
# executed before stopping.
-wait_for_slave_to_stop;
+--source include/wait_for_slave_to_stop.inc
# check that we inserted all rows (waited until the last Rows event)
select count(*) from t1;
--- 1.3/mysql-test/t/rpl_row_until.test 2007-06-12 04:29:10 +02:00
+++ 1.4/mysql-test/t/rpl_row_until.test 2007-06-12 04:29:10 +02:00
@@ -28,7 +28,7 @@
connection slave;
start slave until master_log_file='master-bin.000001', master_log_pos=311;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
# here table should be still not deleted
select * from t1;
--replace_result $MASTER_MYPORT MASTER_MYPORT
@@ -40,7 +40,7 @@
# again this table should be still not deleted
select * from t1;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 #
--query_vertical SHOW SLAVE STATUS;
@@ -48,7 +48,7 @@
# try replicate all up to and not including the second insert to t2;
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=728;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
select * from t2;
--replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 #
@@ -65,7 +65,7 @@
# this should stop immediately as we are already there
start slave until master_log_file='master-bin.000001', master_log_pos=740;
sleep 2;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
# here the sql slave thread should be stopped
--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
--replace_column 1 # 9 # 23 # 33 #
--- 1.1/mysql-test/t/rpl_critical_errors.test 2007-06-12 04:29:10 +02:00
+++ 1.2/mysql-test/t/rpl_critical_errors.test 2007-06-12 04:29:10 +02:00
@@ -53,7 +53,7 @@
# Here the slave will only stop if the query above actually started
# inserting some rows into t2. Otherwise, it will hang forever.
-wait_for_slave_to_stop;
+--source include/wait_for_slave_to_stop.inc
# The following should be 0
SELECT COUNT(*) FROM t2;
--- 1.4/mysql-test/t/rpl_incident.test 2007-06-12 04:29:10 +02:00
+++ 1.5/mysql-test/t/rpl_incident.test 2007-06-12 04:29:10 +02:00
@@ -14,7 +14,7 @@
SELECT * FROM t1;
connection slave;
---wait_for_slave_to_stop
+--source include/wait_for_slave_to_stop.inc
# The 4 should not be inserted into the table, since the incident log
# event should have stop the slave.
--- 1.70/mysql-test/t/rpl_rotate_logs.test 2007-06-12 04:29:10 +02:00
+++ 1.71/mysql-test/t/rpl_rotate_logs.test 2007-06-12 04:29:10 +02:00
@@ -94,7 +94,7 @@
set insert_id=1234;
insert into t2 values(NULL);
connection slave;
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
#restart slave skipping one event
set global sql_slave_skip_counter=1;
--- 1.10/mysql-test/t/rpl_stm_mystery22.test 2007-06-12 04:29:10 +02:00
+++ 1.11/mysql-test/t/rpl_stm_mystery22.test 2007-06-12 04:29:10 +02:00
@@ -28,7 +28,7 @@
save_master_pos;
connection slave;
# wait until the slave tries to run the query, fails and aborts slave thread
-wait_for_slave_to_stop;
+--source include/wait_for_slave_sql_to_stop.inc
select * from t1 order by n;
delete from t1 where n = 2;
--disable_warnings
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2547) BUG#28497 | Jonathan Miller | 12 Jun |
