summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-03-10 10:12:23 +0100
committerunknown <knielsen@knielsen-hq.org>2010-03-10 10:12:23 +0100
commit4d7b6a6ea157bfa193376fb6367b64dd23e0d058 (patch)
treed0413974498733fac08c2e0dee7719eda7a4a48a /mysql-test/r/variables.result
parentb1a6297986d59c7d4a13ee7df89b4b7c384aa22b (diff)
parent0230d51be8e336edbfa2a04c0f5bfdb9feaa6122 (diff)
downloadmariadb-git-4d7b6a6ea157bfa193376fb6367b64dd23e0d058.tar.gz
Automerge MySQL 5.1.44 merge into latest MariaDB trunk.
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result8
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index bf0cbb6db96..d3d9cb21b83 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -559,7 +559,7 @@ set sql_log_bin=1;
set sql_log_off=1;
set sql_log_update=1;
Warnings:
-Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored
+Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
set sql_low_priority_updates=1;
set sql_max_join_size=200;
select @@sql_max_join_size,@@max_join_size;
@@ -1009,6 +1009,12 @@ ERROR HY000: Variable 'hostname' is a read only variable
show variables like 'hostname';
Variable_name Value
hostname #
+#
+# BUG#37408 - Compressed MyISAM files should not require/use mmap()
+#
+# Test 'myisam_mmap_size' option is not dynamic
+SET @@myisam_mmap_size= 500M;
+ERROR HY000: Variable 'myisam_mmap_size' is a read only variable
End of 5.0 tests
set join_buffer_size=1;
Warnings: