database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fix test failure.

Browse Source
This commit is contained in:
Jan Lindström
2015-05-21 11:02:03 +03:00
parent 137ba7d6f9
commit 8635c4b4e6
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/sys_vars/r/innodb_encrypt_tables_basic.result
View File

@@ -19,23 +19,17 @@ where variable_name='innodb_encrypt_tables';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
INNODB_ENCRYPT_TABLES OFF INNODB_ENCRYPT_TABLES OFF
set global innodb_encrypt_tables=ON; set global innodb_encrypt_tables=ON;
ERROR 42000: Variable 'innodb_encrypt_tables' can't be set to the value of 'ON'
show warnings;
Level Code Message
Warning 138 InnoDB: cannot enable encryption, encryption plugin is not available
Error 1231 Variable 'innodb_encrypt_tables' can't be set to the value of 'ON'
select @@global.innodb_encrypt_tables; select @@global.innodb_encrypt_tables;
@@global.innodb_encrypt_tables @@global.innodb_encrypt_tables
OFF ON
set global innodb_encrypt_tables=OFF; set global innodb_encrypt_tables=OFF;
select @@global.innodb_encrypt_tables; select @@global.innodb_encrypt_tables;
@@global.innodb_encrypt_tables @@global.innodb_encrypt_tables
OFF OFF
set global innodb_encrypt_tables=1; set global innodb_encrypt_tables=1;
ERROR 42000: Variable 'innodb_encrypt_tables' can't be set to the value of '1'
select @@global.innodb_encrypt_tables; select @@global.innodb_encrypt_tables;
@@global.innodb_encrypt_tables @@global.innodb_encrypt_tables
OFF ON
set session innodb_encrypt_tables=1; set session innodb_encrypt_tables=1;
ERROR HY000: Variable 'innodb_encrypt_tables' is a GLOBAL variable and should be set with SET GLOBAL ERROR HY000: Variable 'innodb_encrypt_tables' is a GLOBAL variable and should be set with SET GLOBAL
set global innodb_encrypt_tables=1.1; set global innodb_encrypt_tables=1.1;

3
mysql-test/suite/sys_vars/t/innodb_encrypt_tables_basic.test
View File

@@ -19,13 +19,10 @@ where variable_name='innodb_encrypt_tables';
# #
# show that it's writable # show that it's writable
# #
--error ER_WRONG_VALUE_FOR_VAR
set global innodb_encrypt_tables=ON; set global innodb_encrypt_tables=ON;
show warnings;
select @@global.innodb_encrypt_tables; select @@global.innodb_encrypt_tables;
set global innodb_encrypt_tables=OFF; set global innodb_encrypt_tables=OFF;
select @@global.innodb_encrypt_tables; select @@global.innodb_encrypt_tables;
--error ER_WRONG_VALUE_FOR_VAR
set global innodb_encrypt_tables=1; set global innodb_encrypt_tables=1;
select @@global.innodb_encrypt_tables; select @@global.innodb_encrypt_tables;
--error ER_GLOBAL_VARIABLE --error ER_GLOBAL_VARIABLE