8 changed files with 419 additions and 2 deletions
-
14mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
-
10mysql-test/suite/perfschema/r/threads_innodb,xtradb.rdiff
-
23mysql-test/suite/sys_vars/r/innodb_buf_flush_list_now_basic.result
-
102mysql-test/suite/sys_vars/r/innodb_status_output_basic.result
-
102mysql-test/suite/sys_vars/r/innodb_status_output_locks_basic.result
-
32mysql-test/suite/sys_vars/t/innodb_buf_flush_list_now_basic.test
-
69mysql-test/suite/sys_vars/t/innodb_status_output_basic.test
-
69mysql-test/suite/sys_vars/t/innodb_status_output_locks_basic.test
@ -0,0 +1,10 @@ |
|||
--- suite/perfschema/r/threads_innodb.result 2013-12-20 20:19:06.000000000 +0100 |
|||
+++ suite/perfschema/r/threads_innodb.reject 2014-05-06 13:08:05.000000000 +0200 |
|||
@@ -6,6 +6,7 @@ |
|||
GROUP BY name; |
|||
name type processlist_user processlist_host processlist_db processlist_command processlist_time processlist_state processlist_info parent_thread_id role instrumented |
|||
thread/innodb/io_handler_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES |
|||
+thread/innodb/lru_manager_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES |
|||
thread/innodb/page_cleaner_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES |
|||
thread/innodb/srv_error_monitor_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES |
|||
thread/innodb/srv_lock_timeout_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES |
|||
@ -0,0 +1,23 @@ |
|||
# |
|||
# Basic test for innodb_buf_flush_list_now. |
|||
# |
|||
SELECT @@global.innodb_buf_flush_list_now; |
|||
@@global.innodb_buf_flush_list_now |
|||
0 |
|||
set global innodb_buf_flush_list_now = 1; |
|||
SELECT @@global.innodb_buf_flush_list_now; |
|||
@@global.innodb_buf_flush_list_now |
|||
0 |
|||
set global innodb_buf_flush_list_now = 0; |
|||
set global innodb_buf_flush_list_now = dummy; |
|||
ERROR 42000: Variable 'innodb_buf_flush_list_now' can't be set to the value of 'dummy' |
|||
set innodb_buf_flush_list_now = ON; |
|||
ERROR HY000: Variable 'innodb_buf_flush_list_now' is a GLOBAL variable and should be set with SET GLOBAL |
|||
# Setting to ON is ok. |
|||
set global innodb_buf_flush_list_now = ON; |
|||
# Setting to OFF is ok. |
|||
set global innodb_buf_flush_list_now = OFF; |
|||
# Must always be 0. |
|||
SELECT @@global.innodb_buf_flush_list_now; |
|||
@@global.innodb_buf_flush_list_now |
|||
0 |
|||
@ -0,0 +1,102 @@ |
|||
SET @start_global_value = @@global.innodb_status_output; |
|||
SELECT @start_global_value; |
|||
@start_global_value |
|||
0 |
|||
Valid values are 'ON' and 'OFF' |
|||
select @@global.innodb_status_output in (0, 1); |
|||
@@global.innodb_status_output in (0, 1) |
|||
1 |
|||
select @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
0 |
|||
select @@session.innodb_status_output; |
|||
ERROR HY000: Variable 'innodb_status_output' is a GLOBAL variable |
|||
show global variables like 'innodb_status_output'; |
|||
Variable_name Value |
|||
innodb_status_output OFF |
|||
show session variables like 'innodb_status_output'; |
|||
Variable_name Value |
|||
innodb_status_output OFF |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
set global innodb_status_output='OFF'; |
|||
select @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
0 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
set @@global.innodb_status_output=1; |
|||
select @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
1 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT ON |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT ON |
|||
set global innodb_status_output=0; |
|||
select @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
0 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
set @@global.innodb_status_output='ON'; |
|||
select @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
1 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT ON |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT ON |
|||
set session innodb_status_output='OFF'; |
|||
ERROR HY000: Variable 'innodb_status_output' is a GLOBAL variable and should be set with SET GLOBAL |
|||
set @@session.innodb_status_output='ON'; |
|||
ERROR HY000: Variable 'innodb_status_output' is a GLOBAL variable and should be set with SET GLOBAL |
|||
set global innodb_status_output=1.1; |
|||
ERROR 42000: Incorrect argument type to variable 'innodb_status_output' |
|||
set global innodb_status_output=1e1; |
|||
ERROR 42000: Incorrect argument type to variable 'innodb_status_output' |
|||
set global innodb_status_output=2; |
|||
ERROR 42000: Variable 'innodb_status_output' can't be set to the value of '2' |
|||
set global innodb_status_output=-3; |
|||
ERROR 42000: Variable 'innodb_status_output' can't be set to the value of '-3' |
|||
select @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
1 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT ON |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT ON |
|||
set global innodb_status_output=DEFAULT; |
|||
select @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
0 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT OFF |
|||
set global innodb_status_output='AUTO'; |
|||
ERROR 42000: Variable 'innodb_status_output' can't be set to the value of 'AUTO' |
|||
SET @@global.innodb_status_output = @start_global_value; |
|||
SELECT @@global.innodb_status_output; |
|||
@@global.innodb_status_output |
|||
0 |
|||
@ -0,0 +1,102 @@ |
|||
SET @start_global_value = @@global.innodb_status_output_locks; |
|||
SELECT @start_global_value; |
|||
@start_global_value |
|||
0 |
|||
Valid values are 'ON' and 'OFF' |
|||
select @@global.innodb_status_output_locks in (0, 1); |
|||
@@global.innodb_status_output_locks in (0, 1) |
|||
1 |
|||
select @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
0 |
|||
select @@session.innodb_status_output_locks; |
|||
ERROR HY000: Variable 'innodb_status_output_locks' is a GLOBAL variable |
|||
show global variables like 'innodb_status_output_locks'; |
|||
Variable_name Value |
|||
innodb_status_output_locks OFF |
|||
show session variables like 'innodb_status_output_locks'; |
|||
Variable_name Value |
|||
innodb_status_output_locks OFF |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
set global innodb_status_output_locks='OFF'; |
|||
select @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
0 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
set @@global.innodb_status_output_locks=1; |
|||
select @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
1 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS ON |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS ON |
|||
set global innodb_status_output_locks=0; |
|||
select @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
0 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
set @@global.innodb_status_output_locks='ON'; |
|||
select @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
1 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS ON |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS ON |
|||
set session innodb_status_output_locks='OFF'; |
|||
ERROR HY000: Variable 'innodb_status_output_locks' is a GLOBAL variable and should be set with SET GLOBAL |
|||
set @@session.innodb_status_output_locks='ON'; |
|||
ERROR HY000: Variable 'innodb_status_output_locks' is a GLOBAL variable and should be set with SET GLOBAL |
|||
set global innodb_status_output_locks=1.1; |
|||
ERROR 42000: Incorrect argument type to variable 'innodb_status_output_locks' |
|||
set global innodb_status_output_locks=1e1; |
|||
ERROR 42000: Incorrect argument type to variable 'innodb_status_output_locks' |
|||
set global innodb_status_output_locks=2; |
|||
ERROR 42000: Variable 'innodb_status_output_locks' can't be set to the value of '2' |
|||
set global innodb_status_output_locks=-3; |
|||
ERROR 42000: Variable 'innodb_status_output_locks' can't be set to the value of '-3' |
|||
select @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
1 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS ON |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS ON |
|||
set global innodb_status_output_locks=DEFAULT; |
|||
select @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
0 |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
VARIABLE_NAME VARIABLE_VALUE |
|||
INNODB_STATUS_OUTPUT_LOCKS OFF |
|||
set global innodb_status_output_locks='AUTO'; |
|||
ERROR 42000: Variable 'innodb_status_output_locks' can't be set to the value of 'AUTO' |
|||
SET @@global.innodb_status_output_locks = @start_global_value; |
|||
SELECT @@global.innodb_status_output_locks; |
|||
@@global.innodb_status_output_locks |
|||
0 |
|||
@ -0,0 +1,32 @@ |
|||
--echo # |
|||
--echo # Basic test for innodb_buf_flush_list_now. |
|||
--echo # |
|||
|
|||
--source include/have_innodb.inc |
|||
|
|||
# The config variable is a debug variable for now |
|||
-- source include/have_debug.inc |
|||
|
|||
SELECT @@global.innodb_buf_flush_list_now; |
|||
|
|||
set global innodb_buf_flush_list_now = 1; |
|||
|
|||
SELECT @@global.innodb_buf_flush_list_now; |
|||
|
|||
set global innodb_buf_flush_list_now = 0; |
|||
|
|||
--error ER_WRONG_VALUE_FOR_VAR |
|||
set global innodb_buf_flush_list_now = dummy; |
|||
|
|||
--error ER_GLOBAL_VARIABLE |
|||
set innodb_buf_flush_list_now = ON; |
|||
|
|||
--echo # Setting to ON is ok. |
|||
set global innodb_buf_flush_list_now = ON; |
|||
|
|||
--echo # Setting to OFF is ok. |
|||
set global innodb_buf_flush_list_now = OFF; |
|||
|
|||
--echo # Must always be 0. |
|||
SELECT @@global.innodb_buf_flush_list_now; |
|||
|
|||
@ -0,0 +1,69 @@ |
|||
--source include/have_innodb.inc |
|||
|
|||
SET @start_global_value = @@global.innodb_status_output; |
|||
SELECT @start_global_value; |
|||
|
|||
# |
|||
# exists as global only |
|||
# |
|||
--echo Valid values are 'ON' and 'OFF' |
|||
select @@global.innodb_status_output in (0, 1); |
|||
select @@global.innodb_status_output; |
|||
--error ER_INCORRECT_GLOBAL_LOCAL_VAR |
|||
select @@session.innodb_status_output; |
|||
show global variables like 'innodb_status_output'; |
|||
show session variables like 'innodb_status_output'; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
|
|||
# |
|||
# show that it's writable |
|||
# |
|||
set global innodb_status_output='OFF'; |
|||
select @@global.innodb_status_output; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
set @@global.innodb_status_output=1; |
|||
select @@global.innodb_status_output; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
set global innodb_status_output=0; |
|||
select @@global.innodb_status_output; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
set @@global.innodb_status_output='ON'; |
|||
select @@global.innodb_status_output; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
--error ER_GLOBAL_VARIABLE |
|||
set session innodb_status_output='OFF'; |
|||
--error ER_GLOBAL_VARIABLE |
|||
set @@session.innodb_status_output='ON'; |
|||
|
|||
# |
|||
# incorrect types |
|||
# |
|||
--error ER_WRONG_TYPE_FOR_VAR |
|||
set global innodb_status_output=1.1; |
|||
--error ER_WRONG_TYPE_FOR_VAR |
|||
set global innodb_status_output=1e1; |
|||
--error ER_WRONG_VALUE_FOR_VAR |
|||
set global innodb_status_output=2; |
|||
--error ER_WRONG_VALUE_FOR_VAR |
|||
set global innodb_status_output=-3; |
|||
select @@global.innodb_status_output; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
set global innodb_status_output=DEFAULT; |
|||
select @@global.innodb_status_output; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output'; |
|||
--error ER_WRONG_VALUE_FOR_VAR |
|||
set global innodb_status_output='AUTO'; |
|||
|
|||
# |
|||
# Cleanup |
|||
# |
|||
|
|||
SET @@global.innodb_status_output = @start_global_value; |
|||
SELECT @@global.innodb_status_output; |
|||
@ -0,0 +1,69 @@ |
|||
--source include/have_innodb.inc |
|||
|
|||
SET @start_global_value = @@global.innodb_status_output_locks; |
|||
SELECT @start_global_value; |
|||
|
|||
# |
|||
# exists as global only |
|||
# |
|||
--echo Valid values are 'ON' and 'OFF' |
|||
select @@global.innodb_status_output_locks in (0, 1); |
|||
select @@global.innodb_status_output_locks; |
|||
--error ER_INCORRECT_GLOBAL_LOCAL_VAR |
|||
select @@session.innodb_status_output_locks; |
|||
show global variables like 'innodb_status_output_locks'; |
|||
show session variables like 'innodb_status_output_locks'; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
|
|||
# |
|||
# show that it's writable |
|||
# |
|||
set global innodb_status_output_locks='OFF'; |
|||
select @@global.innodb_status_output_locks; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
set @@global.innodb_status_output_locks=1; |
|||
select @@global.innodb_status_output_locks; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
set global innodb_status_output_locks=0; |
|||
select @@global.innodb_status_output_locks; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
set @@global.innodb_status_output_locks='ON'; |
|||
select @@global.innodb_status_output_locks; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
--error ER_GLOBAL_VARIABLE |
|||
set session innodb_status_output_locks='OFF'; |
|||
--error ER_GLOBAL_VARIABLE |
|||
set @@session.innodb_status_output_locks='ON'; |
|||
|
|||
# |
|||
# incorrect types |
|||
# |
|||
--error ER_WRONG_TYPE_FOR_VAR |
|||
set global innodb_status_output_locks=1.1; |
|||
--error ER_WRONG_TYPE_FOR_VAR |
|||
set global innodb_status_output_locks=1e1; |
|||
--error ER_WRONG_VALUE_FOR_VAR |
|||
set global innodb_status_output_locks=2; |
|||
--error ER_WRONG_VALUE_FOR_VAR |
|||
set global innodb_status_output_locks=-3; |
|||
select @@global.innodb_status_output_locks; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
set global innodb_status_output_locks=DEFAULT; |
|||
select @@global.innodb_status_output_locks; |
|||
select * from information_schema.global_variables where variable_name='innodb_status_output_locks'; |
|||
select * from information_schema.session_variables where variable_name='innodb_status_output_locks'; |
|||
--error ER_WRONG_VALUE_FOR_VAR |
|||
set global innodb_status_output_locks='AUTO'; |
|||
|
|||
# |
|||
# Cleanup |
|||
# |
|||
|
|||
SET @@global.innodb_status_output_locks = @start_global_value; |
|||
SELECT @@global.innodb_status_output_locks; |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue