diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-12-05 17:12:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 17:12:29 +0200 |
| commit | 0009f4a441da6ec98fdc55c6a14ce007edf7cfdb (patch) | |
| tree | e29e29b24b02f72c85e76925835888d4c2bb30be | |
| parent | 660521a43ac9f9f9f5850270168317b586bcbf43 (diff) | |
| parent | 6924593ed8c66b21d8ab125ced1917a4dc189e6a (diff) | |
| download | mariadb-git-0009f4a441da6ec98fdc55c6a14ce007edf7cfdb.tar.gz | |
Merge pull request #268 from grooverdan/10.2-MDEV-10651-enable-test-sys_vars.innodb_buffer_pool_dump_pct_basic
MDEV-10651: enable test sys_vars.innodb_buffer_pool_dump_pct_basic
| -rw-r--r-- | mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test | 6 | ||||
| -rw-r--r-- | mysql-test/unstable-tests | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result index b2cc55ce71e..485136ccc4c 100644 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result @@ -1,3 +1,4 @@ +SET @orig = @@global.innodb_buffer_pool_dump_pct; SELECT @@global.innodb_buffer_pool_dump_pct; @@global.innodb_buffer_pool_dump_pct 25 @@ -33,3 +34,4 @@ SET GLOBAL innodb_buffer_pool_dump_pct='foo'; ERROR 42000: Incorrect argument type to variable 'innodb_buffer_pool_dump_pct' SET innodb_buffer_pool_dump_pct=50; ERROR HY000: Variable 'innodb_buffer_pool_dump_pct' is a GLOBAL variable and should be set with SET GLOBAL +SET GLOBAL innodb_buffer_pool_dump_pct=@orig; diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test index ae45be7f2a3..99d3f79fb27 100644 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test @@ -9,6 +9,9 @@ -- source include/have_innodb.inc +# Save the default value +SET @orig = @@global.innodb_buffer_pool_dump_pct; + # Check the default value SELECT @@global.innodb_buffer_pool_dump_pct; @@ -55,3 +58,6 @@ SET GLOBAL innodb_buffer_pool_dump_pct='foo'; # Set without using Global --error ER_GLOBAL_VARIABLE SET innodb_buffer_pool_dump_pct=50; + +# Restore original value +SET GLOBAL innodb_buffer_pool_dump_pct=@orig; diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index daba2ea8ae8..6fc71677174 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -307,7 +307,6 @@ sys_vars.keep_files_on_create_basic : MDEV-10676 - timeout sys_vars.slow_query_log_file_basic : Modified on 2016-08-09 (MDEV-10465) sys_vars.sysvars_innodb : MDEV-6958 - error-prone rdiffs sys_vars.sysvars_server_embedded : MDEV-6958 - error-prone rdiffs -sys_vars.innodb_buffer_pool_dump_pct_basic : MDEV-10651 - sporadic failure on file_exists sys_vars.innodb_fatal_semaphore_wait_threshold : MDEV-10513 - crashes sys_vars.sysvars_wsrep : Modified in 10.1.17 sys_vars.wsrep_max_ws_size_basic : Modified in 10.1.17 |