summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-20 00:54:52 +0300
committermonty@mysql.com <>2004-05-20 00:54:52 +0300
commita4b0ec1eded00350f41b26c475f45fe4919924c9 (patch)
tree969ae655143f6308b50b399e6abcb73c20e39a81 /mysql-test/r/variables.result
parent332f124bc62d2a63cfb566b50e2784c357ef6b8e (diff)
parent8e2ff7d13546e90eed7e3d05ad7f6a8d047ecdad (diff)
downloadmariadb-git-a4b0ec1eded00350f41b26c475f45fe4919924c9.tar.gz
Merge with 4.0, mainly to get changes to windows project files
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 290b1fa41cf..fae2a74aa6d 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -386,6 +386,10 @@ select 1;
1
select @@session.key_buffer_size;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable
+set global myisam_max_sort_file_size=4294967296;
+show global variables like 'myisam_max_sort_file_size';
+Variable_name Value
+myisam_max_sort_file_size 4294967296
set ft_boolean_syntax = @@init_connect;
ERROR HY000: Variable 'ft_boolean_syntax' is a GLOBAL variable and should be set with SET GLOBAL
set global ft_boolean_syntax = @@init_connect;