diff options
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/innodb_autoextend_increment_basic.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/innodb_file_io_threads_basic.result | 96 | ||||
| -rw-r--r-- | mysql-test/r/innodb_max_dirty_pages_pct_basic.result | 28 | ||||
| -rw-r--r-- | mysql-test/t/innodb_file_io_threads_basic.test | 70 | ||||
| -rw-r--r-- | mysql-test/t/innodb_max_dirty_pages_pct_basic.test | 2 |
6 files changed, 147 insertions, 57 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index bb976c806d6..508bc00a6be 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1738,7 +1738,7 @@ count(*) drop table t1; show status like "Innodb_buffer_pool_pages_total"; Variable_name Value -Innodb_buffer_pool_pages_total 512 +Innodb_buffer_pool_pages_total 65536 show status like "Innodb_page_size"; Variable_name Value Innodb_page_size 16384 diff --git a/mysql-test/r/innodb_autoextend_increment_basic.result b/mysql-test/r/innodb_autoextend_increment_basic.result index dafc71fd25d..3d94fc6fd6d 100644 --- a/mysql-test/r/innodb_autoextend_increment_basic.result +++ b/mysql-test/r/innodb_autoextend_increment_basic.result @@ -1,7 +1,7 @@ SET @global_start_value = @@global.innodb_autoextend_increment ; SELECT @global_start_value; @global_start_value -8 +64 '#--------------------FN_DYNVARS_046_01------------------------#' SET @@global.innodb_autoextend_increment = 0; Warnings: @@ -9,13 +9,13 @@ Warning 1292 Truncated incorrect autoextend_increment value: '0' SET @@global.innodb_autoextend_increment = DEFAULT; SELECT @@global.innodb_autoextend_increment ; @@global.innodb_autoextend_increment -8 +64 '#---------------------FN_DYNVARS_046_02-------------------------#' SET innodb_autoextend_increment = 1; ERROR HY000: Variable 'innodb_autoextend_increment' is a GLOBAL variable and should be set with SET GLOBAL SELECT @@innodb_autoextend_increment ; @@innodb_autoextend_increment -8 +64 SELECT local.innodb_autoextend_increment ; ERROR 42S02: Unknown table 'local' in field list SET global innodb_autoextend_increment = 0; diff --git a/mysql-test/r/innodb_file_io_threads_basic.result b/mysql-test/r/innodb_file_io_threads_basic.result index 4c1c3ae8d54..5ef7e1099e0 100644 --- a/mysql-test/r/innodb_file_io_threads_basic.result +++ b/mysql-test/r/innodb_file_io_threads_basic.result @@ -1,53 +1,101 @@ '#---------------------BS_STVARS_027_01----------------------#' -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); -COUNT(@@GLOBAL.innodb_file_io_threads) +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); +COUNT(@@GLOBAL.innodb_read_io_threads) +1 +1 Expected +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); +COUNT(@@GLOBAL.innodb_write_io_threads) 1 1 Expected '#---------------------BS_STVARS_027_02----------------------#' -SET @@GLOBAL.innodb_file_io_threads=1; -ERROR HY000: Variable 'innodb_file_io_threads' is a read only variable +SET @@GLOBAL.innodb_read_io_threads=1; +ERROR HY000: Variable 'innodb_read_io_threads' is a read only variable +Expected error 'Read only variable' +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); +COUNT(@@GLOBAL.innodb_read_io_threads) +1 +1 Expected +SET @@GLOBAL.innodb_write_io_threads=1; +ERROR HY000: Variable 'innodb_write_io_threads' is a read only variable Expected error 'Read only variable' -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); -COUNT(@@GLOBAL.innodb_file_io_threads) +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); +COUNT(@@GLOBAL.innodb_write_io_threads) 1 1 Expected '#---------------------BS_STVARS_027_03----------------------#' -SELECT @@GLOBAL.innodb_file_io_threads = VARIABLE_VALUE +SELECT @@GLOBAL.innodb_read_io_threads = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='innodb_read_io_threads'; +@@GLOBAL.innodb_read_io_threads = VARIABLE_VALUE +1 +1 Expected +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); +COUNT(@@GLOBAL.innodb_read_io_threads) +1 +1 Expected +SELECT COUNT(VARIABLE_VALUE) +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='innodb_read_io_threads'; +COUNT(VARIABLE_VALUE) +1 +1 Expected +SELECT @@GLOBAL.innodb_write_io_threads = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_io_threads'; -@@GLOBAL.innodb_file_io_threads = VARIABLE_VALUE +WHERE VARIABLE_NAME='innodb_write_io_threads'; +@@GLOBAL.innodb_write_io_threads = VARIABLE_VALUE 1 1 Expected -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); -COUNT(@@GLOBAL.innodb_file_io_threads) +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); +COUNT(@@GLOBAL.innodb_write_io_threads) 1 1 Expected SELECT COUNT(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_io_threads'; +WHERE VARIABLE_NAME='innodb_write_io_threads'; COUNT(VARIABLE_VALUE) 1 1 Expected '#---------------------BS_STVARS_027_04----------------------#' -SELECT @@innodb_file_io_threads = @@GLOBAL.innodb_file_io_threads; -@@innodb_file_io_threads = @@GLOBAL.innodb_file_io_threads +SELECT @@innodb_read_io_threads = @@GLOBAL.innodb_read_io_threads; +@@innodb_read_io_threads = @@GLOBAL.innodb_read_io_threads +1 +1 Expected +SELECT @@innodb_write_io_threads = @@GLOBAL.innodb_write_io_threads; +@@innodb_write_io_threads = @@GLOBAL.innodb_write_io_threads 1 1 Expected '#---------------------BS_STVARS_027_05----------------------#' -SELECT COUNT(@@innodb_file_io_threads); -COUNT(@@innodb_file_io_threads) +SELECT COUNT(@@innodb_read_io_threads); +COUNT(@@innodb_read_io_threads) +1 +1 Expected +SELECT COUNT(@@local.innodb_read_io_threads); +ERROR HY000: Variable 'innodb_read_io_threads' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT COUNT(@@SESSION.innodb_read_io_threads); +ERROR HY000: Variable 'innodb_read_io_threads' is a GLOBAL variable +Expected error 'Variable is a GLOBAL variable' +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); +COUNT(@@GLOBAL.innodb_read_io_threads) +1 +1 Expected +SELECT innodb_read_io_threads = @@SESSION.innodb_read_io_threads; +ERROR 42S22: Unknown column 'innodb_read_io_threads' in 'field list' +Expected error 'Readonly variable' +SELECT COUNT(@@innodb_write_io_threads); +COUNT(@@innodb_write_io_threads) 1 1 Expected -SELECT COUNT(@@local.innodb_file_io_threads); -ERROR HY000: Variable 'innodb_file_io_threads' is a GLOBAL variable +SELECT COUNT(@@local.innodb_write_io_threads); +ERROR HY000: Variable 'innodb_write_io_threads' is a GLOBAL variable Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_file_io_threads); -ERROR HY000: Variable 'innodb_file_io_threads' is a GLOBAL variable +SELECT COUNT(@@SESSION.innodb_write_io_threads); +ERROR HY000: Variable 'innodb_write_io_threads' is a GLOBAL variable Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); -COUNT(@@GLOBAL.innodb_file_io_threads) +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); +COUNT(@@GLOBAL.innodb_write_io_threads) 1 1 Expected -SELECT innodb_file_io_threads = @@SESSION.innodb_file_io_threads; -ERROR 42S22: Unknown column 'innodb_file_io_threads' in 'field list' +SELECT innodb_write_io_threads = @@SESSION.innodb_write_io_threads; +ERROR 42S22: Unknown column 'innodb_write_io_threads' in 'field list' Expected error 'Readonly variable' diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_basic.result b/mysql-test/r/innodb_max_dirty_pages_pct_basic.result index 6c52f79f9ad..8e48957258f 100644 --- a/mysql-test/r/innodb_max_dirty_pages_pct_basic.result +++ b/mysql-test/r/innodb_max_dirty_pages_pct_basic.result @@ -1,19 +1,19 @@ SET @global_start_value = @@global.innodb_max_dirty_pages_pct; SELECT @global_start_value; @global_start_value -90 +75 '#--------------------FN_DYNVARS_046_01------------------------#' SET @@global.innodb_max_dirty_pages_pct = 0; SET @@global.innodb_max_dirty_pages_pct = DEFAULT; SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -90 +75 '#---------------------FN_DYNVARS_046_02-------------------------#' SET innodb_max_dirty_pages_pct = 1; ERROR HY000: Variable 'innodb_max_dirty_pages_pct' is a GLOBAL variable and should be set with SET GLOBAL SELECT @@innodb_max_dirty_pages_pct; @@innodb_max_dirty_pages_pct -90 +75 SELECT local.innodb_max_dirty_pages_pct; ERROR 42S02: Unknown table 'local' in field list SET global innodb_max_dirty_pages_pct = 0; @@ -29,33 +29,33 @@ SET @@global.innodb_max_dirty_pages_pct = 1; SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct 1 -SET @@global.innodb_max_dirty_pages_pct = 100; +SET @@global.innodb_max_dirty_pages_pct = 99; SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 '#--------------------FN_DYNVARS_046_04-------------------------#' SET @@global.innodb_max_dirty_pages_pct = -1; Warnings: Warning 1292 Truncated incorrect max_dirty_pages_pct value: '18446744073709551615' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 SET @@global.innodb_max_dirty_pages_pct = "T"; ERROR 42000: Incorrect argument type to variable 'innodb_max_dirty_pages_pct' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 SET @@global.innodb_max_dirty_pages_pct = "Y"; ERROR 42000: Incorrect argument type to variable 'innodb_max_dirty_pages_pct' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 SET @@global.innodb_max_dirty_pages_pct = 1001; Warnings: Warning 1292 Truncated incorrect max_dirty_pages_pct value: '1001' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 '#----------------------FN_DYNVARS_046_05------------------------#' SELECT @@global.innodb_max_dirty_pages_pct = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -65,22 +65,22 @@ VARIABLE_VALUE 1 SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_max_dirty_pages_pct'; VARIABLE_VALUE -100 +99 '#---------------------FN_DYNVARS_046_06-------------------------#' SET @@global.innodb_max_dirty_pages_pct = OFF; ERROR 42000: Incorrect argument type to variable 'innodb_max_dirty_pages_pct' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 SET @@global.innodb_max_dirty_pages_pct = ON; ERROR 42000: Incorrect argument type to variable 'innodb_max_dirty_pages_pct' SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -100 +99 '#---------------------FN_DYNVARS_046_07----------------------#' SET @@global.innodb_max_dirty_pages_pct = TRUE; SELECT @@global.innodb_max_dirty_pages_pct; @@ -93,4 +93,4 @@ SELECT @@global.innodb_max_dirty_pages_pct; SET @@global.innodb_max_dirty_pages_pct = @global_start_value; SELECT @@global.innodb_max_dirty_pages_pct; @@global.innodb_max_dirty_pages_pct -90 +75 diff --git a/mysql-test/t/innodb_file_io_threads_basic.test b/mysql-test/t/innodb_file_io_threads_basic.test index 8e09c75ded6..32cdd0beac4 100644 --- a/mysql-test/t/innodb_file_io_threads_basic.test +++ b/mysql-test/t/innodb_file_io_threads_basic.test @@ -28,7 +28,9 @@ #################################################################### # Displaying default value # #################################################################### -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); +--echo 1 Expected +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); --echo 1 Expected @@ -38,10 +40,17 @@ SELECT COUNT(@@GLOBAL.innodb_file_io_threads); #################################################################### --error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_file_io_threads=1; +SET @@GLOBAL.innodb_read_io_threads=1; --echo Expected error 'Read only variable' -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); +--echo 1 Expected + +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET @@GLOBAL.innodb_write_io_threads=1; +--echo Expected error 'Read only variable' + +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); --echo 1 Expected @@ -52,51 +61,84 @@ SELECT COUNT(@@GLOBAL.innodb_file_io_threads); # Check if the value in GLOBAL Table matches value in variable # ################################################################# -SELECT @@GLOBAL.innodb_file_io_threads = VARIABLE_VALUE +SELECT @@GLOBAL.innodb_read_io_threads = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_io_threads'; +WHERE VARIABLE_NAME='innodb_read_io_threads'; --echo 1 Expected -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); --echo 1 Expected SELECT COUNT(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_io_threads'; +WHERE VARIABLE_NAME='innodb_read_io_threads'; +--echo 1 Expected + +SELECT @@GLOBAL.innodb_write_io_threads = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='innodb_write_io_threads'; +--echo 1 Expected + +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); --echo 1 Expected +SELECT COUNT(VARIABLE_VALUE) +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='innodb_write_io_threads'; +--echo 1 Expected --echo '#---------------------BS_STVARS_027_04----------------------#' ################################################################################ # Check if accessing variable with and without GLOBAL point to same variable # ################################################################################ -SELECT @@innodb_file_io_threads = @@GLOBAL.innodb_file_io_threads; +SELECT @@innodb_read_io_threads = @@GLOBAL.innodb_read_io_threads; --echo 1 Expected +SELECT @@innodb_write_io_threads = @@GLOBAL.innodb_write_io_threads; +--echo 1 Expected --echo '#---------------------BS_STVARS_027_05----------------------#' ################################################################################ -# Check if innodb_file_io_threads can be accessed with and without @@ sign # +# Check if innodb_read_io_threads can be accessed with and without @@ sign # +# Check if innodb_write_io_threads can be accessed with and without @@ sign # ################################################################################ -SELECT COUNT(@@innodb_file_io_threads); +SELECT COUNT(@@innodb_read_io_threads); +--echo 1 Expected + +--Error ER_INCORRECT_GLOBAL_LOCAL_VAR +SELECT COUNT(@@local.innodb_read_io_threads); +--echo Expected error 'Variable is a GLOBAL variable' + +--Error ER_INCORRECT_GLOBAL_LOCAL_VAR +SELECT COUNT(@@SESSION.innodb_read_io_threads); +--echo Expected error 'Variable is a GLOBAL variable' + +SELECT COUNT(@@GLOBAL.innodb_read_io_threads); +--echo 1 Expected + +--Error ER_BAD_FIELD_ERROR +SELECT innodb_read_io_threads = @@SESSION.innodb_read_io_threads; +--echo Expected error 'Readonly variable' + +SELECT COUNT(@@innodb_write_io_threads); --echo 1 Expected --Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_file_io_threads); +SELECT COUNT(@@local.innodb_write_io_threads); --echo Expected error 'Variable is a GLOBAL variable' --Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_file_io_threads); +SELECT COUNT(@@SESSION.innodb_write_io_threads); --echo Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_file_io_threads); +SELECT COUNT(@@GLOBAL.innodb_write_io_threads); --echo 1 Expected --Error ER_BAD_FIELD_ERROR -SELECT innodb_file_io_threads = @@SESSION.innodb_file_io_threads; +SELECT innodb_write_io_threads = @@SESSION.innodb_write_io_threads; --echo Expected error 'Readonly variable' diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test b/mysql-test/t/innodb_max_dirty_pages_pct_basic.test index 830617866ca..38c3acd92a2 100644 --- a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test +++ b/mysql-test/t/innodb_max_dirty_pages_pct_basic.test @@ -72,7 +72,7 @@ SELECT @@global.innodb_max_dirty_pages_pct; SET @@global.innodb_max_dirty_pages_pct = 1; SELECT @@global.innodb_max_dirty_pages_pct; -SET @@global.innodb_max_dirty_pages_pct = 100; +SET @@global.innodb_max_dirty_pages_pct = 99; SELECT @@global.innodb_max_dirty_pages_pct; --echo '#--------------------FN_DYNVARS_046_04-------------------------#' |