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

Updates tests to handle thread pool correctly

Browse source
This commit is contained in:
Mikael Ronstrom 2011-01-14 09:28:23 +01:00
parent fc12800c05
commit 4bc4a696bb
9 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BUILD/build_mccge.sh
View file

@ -293,7 +293,8 @@ extended_usage()
version string suffix: [none]
All packages except Classic include support for user-defined
partitioning.
partitioning. All packages include support for Performance
Schema.
If --with-debug is used, an additional "-debug" is appended to the
version string.

5
mysql-test/include/have_archive_plugin.inc
View file

@ -1,5 +1,10 @@
disable_query_log;
if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%archive%'`)
{
--skip archive plugin not available
}
if (`SELECT @@plugin_dir != '$ARCHIVE_PLUGIN_DIR'`) {
--skip Archive plugin requires that --plugin-dir is set to the archive plugin dir (either the .opt file does not contain \$ARCHIVE_PLUGIN_OPT or another plugin is in use)
}
enable_query_log;

6
mysql-test/include/have_blackhole_plugin.inc
View file

@ -1,5 +1,11 @@
disable_query_log;
if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%blackhole%'`)
{
--skip blackhole plugin not available;
}
if (`SELECT @@plugin_dir != '$BLACKHOLE_PLUGIN_DIR'`) {
--skip Blackhole plugin requires that --plugin-dir is set to the blackhole plugin dir (either the .opt file does not contain \$BLACKHOLE_PLUGIN_OPT or another plugin is in use)
}
enable_query_log;

5
mysql-test/include/not_threadpool.inc Normal file
View file

@ -0,0 +1,5 @@
if (`SELECT count(*) FROM information_schema.GLOBAL_VARIABLES WHERE
VARIABLE_NAME = 'THREAD_HANDLING' AND
VARIABLE_VALUE = 'loaded-dynamically'`){
skip Test requires: 'not_threadpool';
}

6
mysql-test/r/status.result
View file

@ -238,11 +238,5 @@ SELECT 9;
9
DROP PROCEDURE p1;
DROP FUNCTION f1;
DROP VIEW IF EXISTS v1;
CREATE VIEW v1 AS SELECT VARIABLE_NAME AS NAME, CONVERT(VARIABLE_VALUE, UNSIGNED) AS VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
NAME
DROP VIEW v1;
set @@global.concurrent_insert= @old_concurrent_insert;
SET GLOBAL log_output = @old_log_output;

13
mysql-test/r/status_bug17954.result Normal file
View file

@ -0,0 +1,13 @@
set @old_concurrent_insert= @@global.concurrent_insert;
set @@global.concurrent_insert= 0;
SET @old_log_output = @@global.log_output;
SET GLOBAL LOG_OUTPUT = 'FILE';
flush status;
DROP VIEW IF EXISTS v1;
CREATE VIEW v1 AS SELECT VARIABLE_NAME AS NAME, CONVERT(VARIABLE_VALUE, UNSIGNED) AS VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
NAME
DROP VIEW v1;
set @@global.concurrent_insert= @old_concurrent_insert;
SET GLOBAL log_output = @old_log_output;

1
mysql-test/suite/sys_vars/t/slow_launch_time_func.test
View file

@ -31,6 +31,7 @@
#
--source include/not_embedded.inc
--source include/not_threadpool.inc
SET @global_slow_launch_time = @@GLOBAL.slow_launch_time;

1
mysql-test/suite/sys_vars/t/thread_cache_size_func.test
View file

@ -28,6 +28,7 @@
#
--source include/not_embedded.inc
--source include/not_threadpool.inc
SET @global_thread_cache_size = @@GLOBAL.thread_cache_size;

1
mysql-test/suite/sys_vars/t/wait_timeout_func.test
View file

@ -22,6 +22,7 @@
###############################################################################
--source include/not_embedded.inc
--source include/not_threadpool.inc
SET @start_value= @@global.wait_timeout;