summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorserg@janus.mylan <>2007-12-19 22:35:46 +0100
committerserg@janus.mylan <>2007-12-19 22:35:46 +0100
commitb07aaec21cec438899d16495672880d137f6aa01 (patch)
treeccfa40f14c56d2ba4ecb1542769c0a4ac80d7d5a /mysql-test/r/variables.result
parent1a5b69ec581ecdd7efc797a13602e6e14085d356 (diff)
parent4a5eb6bd17c56fe76c5cbfd216ea4624d979614f (diff)
downloadmariadb-git-b07aaec21cec438899d16495672880d137f6aa01.tar.gz
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index e57f82aca26..658a3ffa7a1 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -220,7 +220,7 @@ select * from information_schema.global_variables where variable_name like 'myis
VARIABLE_NAME VARIABLE_VALUE
MYISAM_MAX_SORT_FILE_SIZE 1048576
set GLOBAL myisam_max_sort_file_size=default;
-show variables like 'myisam_max_sort_file_size';
+show global variables like 'myisam_max_sort_file_size';
Variable_name Value
myisam_max_sort_file_size FILE_SIZE
select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size';