diff options
| author | Rik Prohaska <prohaska7@gmail.com> | 2016-07-13 16:17:08 -0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:45:54 +0100 |
| commit | a52a68cb7da765a807856a8c6f238446f57b8f2a (patch) | |
| tree | 088ce8f2e346533a06fc39cadb3d1757655d61ce /storage/tokudb | |
| parent | 110a9f069386302c9caa0b1a451407d6512fdda5 (diff) | |
| download | mariadb-git-a52a68cb7da765a807856a8c6f238446f57b8f2a.tar.gz | |
fix the tokudb_analyze_in_background_basic test to run on mariadb. mariadb does additional value checking for boolean system variables
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_in_background_basic.result | 24 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_in_background_basic.test | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_in_background_basic.result b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_in_background_basic.result index 53e96810eda..02b808fe6cb 100644 --- a/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_in_background_basic.result +++ b/storage/tokudb/mysql-test/tokudb_sys_vars/r/tokudb_analyze_in_background_basic.result @@ -19,29 +19,30 @@ SELECT @@global.tokudb_analyze_in_background; @@global.tokudb_analyze_in_background 0 SET GLOBAL tokudb_analyze_in_background = -6; +ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of '-6' SELECT @@global.tokudb_analyze_in_background; @@global.tokudb_analyze_in_background -1 +0 SET GLOBAL tokudb_analyze_in_background = 1.6; ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_in_background' SELECT @@global.tokudb_analyze_in_background; @@global.tokudb_analyze_in_background -1 +0 SET GLOBAL tokudb_analyze_in_background = "T"; ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'T' SELECT @@global.tokudb_analyze_in_background; @@global.tokudb_analyze_in_background -1 +0 SET GLOBAL tokudb_analyze_in_background = "Y"; ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'Y' SELECT @@global.tokudb_analyze_in_background; @@global.tokudb_analyze_in_background -1 +0 SET GLOBAL tokudb_analyze_in_background = 'foobar'; ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'foobar' SELECT @@global.tokudb_analyze_in_background; @@global.tokudb_analyze_in_background -1 +0 SET SESSION tokudb_analyze_in_background = 0; SELECT @@session.tokudb_analyze_in_background; @@session.tokudb_analyze_in_background @@ -53,31 +54,32 @@ SELECT @@session.tokudb_analyze_in_background; SET SESSION tokudb_analyze_in_background = DEFAULT; SELECT @@session.tokudb_analyze_in_background; @@session.tokudb_analyze_in_background -1 +0 SET SESSION tokudb_analyze_in_background = -6; +ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of '-6' SELECT @@session.tokudb_analyze_in_background; @@session.tokudb_analyze_in_background -1 +0 SET SESSION tokudb_analyze_in_background = 1.6; ERROR 42000: Incorrect argument type to variable 'tokudb_analyze_in_background' SELECT @@session.tokudb_analyze_in_background; @@session.tokudb_analyze_in_background -1 +0 SET SESSION tokudb_analyze_in_background = "T"; ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'T' SELECT @@session.tokudb_analyze_in_background; @@session.tokudb_analyze_in_background -1 +0 SET SESSION tokudb_analyze_in_background = "Y"; ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'Y' SELECT @@session.tokudb_analyze_in_background; @@session.tokudb_analyze_in_background -1 +0 SET SESSION tokudb_analyze_in_background = 'foobar'; ERROR 42000: Variable 'tokudb_analyze_in_background' can't be set to the value of 'foobar' SELECT @@session.tokudb_analyze_in_background; @@session.tokudb_analyze_in_background -1 +0 SET GLOBAL tokudb_analyze_in_background = 0; SET SESSION tokudb_analyze_in_background = 1; SELECT @@global.tokudb_analyze_in_background; diff --git a/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_in_background_basic.test b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_in_background_basic.test index dfb2a0e416d..84b001b1962 100644 --- a/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_in_background_basic.test +++ b/storage/tokudb/mysql-test/tokudb_sys_vars/t/tokudb_analyze_in_background_basic.test @@ -17,6 +17,7 @@ SELECT @@global.tokudb_analyze_in_background; SET GLOBAL tokudb_analyze_in_background = DEFAULT; SELECT @@global.tokudb_analyze_in_background; +-- error ER_WRONG_VALUE_FOR_VAR SET GLOBAL tokudb_analyze_in_background = -6; SELECT @@global.tokudb_analyze_in_background; @@ -46,6 +47,7 @@ SELECT @@session.tokudb_analyze_in_background; SET SESSION tokudb_analyze_in_background = DEFAULT; SELECT @@session.tokudb_analyze_in_background; +-- error ER_WRONG_VALUE_FOR_VAR SET SESSION tokudb_analyze_in_background = -6; SELECT @@session.tokudb_analyze_in_background; |