mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-18 22:35:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge from 5.5 main

Browse source
This commit is contained in:
Bjorn Munch 2011-03-22 15:40:25 +01:00
commit 139844ccef
122 changed files with 1437 additions and 2713 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/include/have_plugin_auth.inc
View file

@ -2,3 +2,4 @@ disable_query_log;
--require r/true.require
select (PLUGIN_LIBRARY LIKE 'auth_test_plugin%') as `TRUE` FROM INFORMATION_SCHEMA.PLUGINS
WHERE PLUGIN_NAME='test_plugin_server';
enable_query_log;

2
mysql-test/include/wait_for_status_var.inc
View file

@ -81,7 +81,7 @@ while (`$_query`)
sleep 0.1;
let $_show_status_value= query_get_value("SHOW $status_type STATUS LIKE '$status_var'", Value, 1);
let $_query= SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value');
if ($is_number)
if ($_is_number)
{
let $_query= SELECT NOT($_show_status_value $_status_var_comparsion $status_var_value);
}