summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-09-06 10:36:10 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-09-06 10:36:10 -0400
commit780c40ef0e1d200fd6874a9e8e65705e685d76c0 (patch)
tree0a29ad51f0192f865d79de65b566da61add4b536 /mysql-test/r/variables.result
parentd8ad96eac0df9241ba200634717227a7153086e1 (diff)
downloadmariadb-git-10.2-mdev7635.tar.gz
MDEV-7635: Part 110.2-mdev7635
innodb_buffer_pool_dump_at_shutdown = ON innodb_buffer_pool_dump_pct = 25 innodb_buffer_pool_load_at_startup = ON innodb_checksum_algorithm = CRC32 innodb_file_format = Barracuda innodb_file_format_max = Barracuda innodb_large_prefix = ON innodb_log_compressed_pages = ON innodb_log_file_size = 128M innodb_purge_threads = 4 innodb_stats_traditional = OFF innodb_strict_mode = ON binlog_annotate_row_events = ON binlog_format = MIXED group_concat_max_len = 1M histogram_size = 255 long-query-time = 2 lower_case_table_names = 2 max_allowed_packet = 16M replicate_annotate_row_events = ON slave_net_timeout = 60 sync_binlog = 1 use_stat_tables = complementary aria_recover = FORCE,BACKUP myisam_recover_options = FORCE,BACKUP
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index b78b3caa58d..50379a5feaf 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -1278,12 +1278,12 @@ ERROR HY000: Variable 'lower_case_table_names' is a read only variable
#
SHOW VARIABLES like 'myisam_recover_options';
Variable_name Value
-myisam_recover_options DEFAULT
+myisam_recover_options BACKUP,FORCE
SELECT @@session.myisam_recover_options;
ERROR HY000: Variable 'myisam_recover_options' is a GLOBAL variable
SELECT @@global.myisam_recover_options;
@@global.myisam_recover_options
-DEFAULT
+BACKUP,FORCE
SET @@session.myisam_recover_options= 'x';
ERROR HY000: Variable 'myisam_recover_options' is a read only variable
SET @@global.myisam_recover_options= 'x';
@@ -1532,7 +1532,7 @@ SET @@global.key_buffer_size=@kbs;
SET @@global.key_cache_block_size=@kcbs;
select @@max_long_data_size;
@@max_long_data_size
-4194304
+16777216
#
# Bug#11766424 59527:
# Assert in DECIMAL_BIN_SIZE: