mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint

Browse source 
into  mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
This commit is contained in:
ramil/ram@mysql.com/myoffice.izhnet.ru 2006-10-31 10:21:18 +04:00
commit 2d22e2ec84
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mysql-test/include/wait_for_query_to_suceed.inc Normal file
View file

@ -0,0 +1,25 @@
#
# Run a query over and over until it suceeds ot timeout occurs
#
let $counter= 100;
disable_abort_on_error;
disable_query_log;
disable_result_log;
eval $query;
while ($mysql_errno)
{
eval $query;
sleep 0.1;
dec $counter;
if (!$counter)
{
die("Waited too long for query to suceed");
}
}
enable_abort_on_error;
enable_query_log;
enable_result_log;

12
mysql-test/t/rename.test
View file

@ -43,8 +43,8 @@ select * from t3;
drop table if exists t1,t2,t3,t4; drop table if exists t1,t2,t3,t4;
# #
# Test-case for Bug #2397 RENAME TABLES is not blocked by # Bug #2397 RENAME TABLES is not blocked by
# FLUSH TABLES WITH READ LOCK # FLUSH TABLES WITH READ LOCK
# #
connect (con1,localhost,root,,); connect (con1,localhost,root,,);
@ -58,10 +58,14 @@ FLUSH TABLES WITH READ LOCK;
connection con1; connection con1;
send RENAME TABLE t1 TO t2, t3 to t4; send RENAME TABLE t1 TO t2, t3 to t4;
connection con2; connection con2;
sleep 1;
show tables; show tables;
UNLOCK TABLES; UNLOCK TABLES;
sleep 1;
# Wait for the the tables to be renamed
# i.e the query below succeds
let $query= select * from t2, t4;
source include/wait_for_query_to_suceed.inc;
show tables; show tables;
drop table t2, t4; drop table t2, t4;