database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge from 5.5-mtr

Browse Source
This commit is contained in:
Bjorn Munch
2010-10-26 08:30:02 +02:00
parent 29f3d85df1 56354413f8
commit 32c86a488d
24 changed files with 191 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/mysqltest.test
View File

@ -331,7 +331,7 @@ eval select $mysql_errno as "after_!errno_masked_error" ;
--exec illegal_command
--cat_file does_not_exist
--perl
exit(1);
exit(2);
EOF
# ----------------------------------------------------------------------------

4
mysql-test/t/wait_timeout.test
View File

@ -53,7 +53,7 @@ while (!`select @aborted_clients`)
dec $retries;
if (!$retries)
{
Failed to detect that client has been aborted;
die Failed to detect that client has been aborted;
}
}
--enable_query_log
@ -108,7 +108,7 @@ while (!`select @aborted_clients`)
dec $retries;
if (!$retries)
{
Failed to detect that client has been aborted;
die Failed to detect that client has been aborted;
}
}
--enable_query_log