database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merging from the main to a local branch

Browse Source
This commit is contained in:
Andrei Elkin
2009-02-13 18:20:36 +02:00
parent 5fc4c37a80 bdbe393db1
commit de9da6dd32
133 changed files with 4189 additions and 5321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/wait_for_query_to_suceed.inc → mysql-test/include/wait_for_query_to_succeed.inc
View File

@ -1,5 +1,5 @@
#
# Run a query over and over until it suceeds ot timeout occurs
# Run a query over and over until it succeeds ot timeout occurs
#
@ -17,7 +17,7 @@ while ($mysql_errno)
if (!$counter)
{
die("Waited too long for query to suceed");
--die "Waited too long for query to succeed";
}
}
enable_abort_on_error;

3
mysql-test/include/wait_until_count_sessions.inc
View File

@ -82,7 +82,7 @@
# Created: 2009-01-14 mleich
#
let $wait_counter= 50;
let $wait_counter= 100;
if ($wait_timeout)
{
let $wait_counter= `SELECT $wait_timeout * 10`;
@ -108,5 +108,6 @@ if (!$success)
{
--echo # Timeout in wait_until_count_sessions.inc
--echo # Number of sessions expected: $count_sessions found: $current_sessions
SHOW PROCESSLIST;
}