diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-16 19:03:50 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-16 19:03:50 +0300 |
commit | 277e783d13cd928d93e19ef16a91f352fde43868 (patch) | |
tree | f497d0113e8f33b049afe24b7ecc567a85135711 /mysql-test/include | |
parent | db84d00029b436994cc2a61dd88e7a65f941ef88 (diff) | |
parent | 0fb1527e9556940d30ab14b11742c03510db081d (diff) | |
download | mariadb-git-277e783d13cd928d93e19ef16a91f352fde43868.tar.gz |
Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam
into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
merge of bug 36011 to 5.1-bugteam
mysql-test/t/subselect.test:
merge of bug 36011 to 5.1-bugteam
Diffstat (limited to 'mysql-test/include')
-rw-r--r-- | mysql-test/include/wait_for_slave_sql_to_start.inc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/include/wait_for_slave_sql_to_start.inc b/mysql-test/include/wait_for_slave_sql_to_start.inc new file mode 100644 index 00000000000..14134725da4 --- /dev/null +++ b/mysql-test/include/wait_for_slave_sql_to_start.inc @@ -0,0 +1,31 @@ +################################################### +#Author: Mats (based on file written by Jeb) +#Date: 2008-05-06 +#Purpose: To wait for slave SQL thread to start +#Details: +# 1) Fill in and setup variables +# 2) loop through looking for both +# io and sql threads to start +# 3) If loops too long die. +#################################################### +connection slave; +let $row_number= 1; +let $run= 1; +let $counter= 300; + +while ($run) +{ + let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number); + if (`SELECT '$sql_result' = 'Yes'`){ + let $run= 0; + } + sleep 0.1; + if (!$counter){ + --echo "Failed while waiting for slave SQL to start" + query_vertical SHOW SLAVE STATUS; + exit; + } + dec $counter; +} + + |