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

merge to mysql-5.5

Browse Source
This commit is contained in:
Mikael Ronstrom
2011-01-14 09:58:21 +01:00
parent cba04a4645 cfa9a4bde6
commit 366232d26b
49 changed files with 1113 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mysql-test/include/plugin.defs Normal file
View File

@ -0,0 +1,41 @@
# Definition file for plugins.
#
# <lib name> <directory> <variable> [<plugin name>,...]
#
# The following variables will be set for a plugin, where PLUGVAR
# represents the variable name given as the 3rd item
#
# PLUGVAR: name of plugin file including extension .so or .dll
# PLUGVAR_DIR: name of directory where plugin was found
# PLUGVAR_OPT: mysqld option --plugin_dir=....
# PLUGVAR_LOAD: option --plugin_load=.... if the 4th element is present
#
# If a listed plugin is not found, the corresponding variables will be
# set to empty, they will not be unset.
#
# The PLUGVAR variable is not quoted, so you must remember to quote it
# when using it in an INSTALL PLUGIN command.
#
# The envorinment variables can be used in tests. If adding a new plugin,
# you are free to pick your variable name, but please keep it upper
# case for consistency.
#
# The _LOAD variable will have a form
#
# --plugin_load=<name1>=<lib_name>;<name2>=<lib_name>.....
#
# with name1, name2 etc from the comma separated list of plugin names
# in the optional 4th argument.
auth_test_plugin plugin/auth PLUGIN_AUTH test_plugin_server
qa_auth_interface plugin/auth PLUGIN_AUTH_INTERFACE qa_auth_interface
qa_auth_server plugin/auth PLUGIN_AUTH_SERVER qa_auth_server
qa_auth_client plugin/auth PLUGIN_AUTH_CLIENT qa_auth_client
udf_example sql UDF_EXAMPLE_LIB
ha_example storage/example EXAMPLE_PLUGIN EXAMPLE
semisync_master plugin/semisync SEMISYNC_MASTER_PLUGIN
semisync_slave plugin/semisync SEMISYNC_SLAVE_PLUGIN
ha_archive storage/archive ARCHIVE_PLUGIN
ha_blackhole storage/blackhole BLACKHOLE_PLUGIN
ha_federated storage/federated FEDERATED_PLUGIN
mypluglib plugin/fulltext SIMPLE_PARSER

22
mysql-test/include/wait_for_status_var.inc
View File

@ -50,8 +50,23 @@ if (!$_status_var_comparsion)
let $_status_var_comparsion= =;
}
# Get type of variable
let $_is_number= 0;
if (`SELECT '$status_var_value' REGEXP '^[\+\-]*[0-9]+(\.[0-9]+)*\$'`)
{
let $_is_number= 1;
}
let $_show_status_value= query_get_value("SHOW $status_type STATUS LIKE '$status_var'", Value, 1);
while (`SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value')`)
# Set way of comparing
let $_query= SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value');
if ($is_number)
{
let $_query= SELECT NOT($_show_status_value $_status_var_comparsion $status_var_value);
}
while (`$_query`)
{
if (!$_status_timeout_counter)
{
@ -65,4 +80,9 @@ while (`SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_va
dec $_status_timeout_counter;
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)
{
let $_query= SELECT NOT($_show_status_value $_status_var_comparsion $status_var_value);
}
}