summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorpaul@ice.local <>2004-03-07 08:32:00 -0600
committerpaul@ice.local <>2004-03-07 08:32:00 -0600
commit09113817d27535a7fdc723e6261933e82d9dffcb (patch)
tree9d4c45c85ad45c10644195916924c0f4b273be4c /mysql-test
parentf47fa6a7804540fe3d9594696b089da015af1930 (diff)
downloadmariadb-git-09113817d27535a7fdc723e6261933e82d9dffcb.tar.gz
SESSION instead of LOCAL in error messages.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/variables.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 5355e7ffadc..71e26c42b70 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -234,17 +234,17 @@ ERROR 42000: Unknown character set: 'UNKNOWN_CHARACTER_SET'
set collation_connection=UNKNOWN_COLLATION;
ERROR HY000: Unknown collation: 'UNKNOWN_COLLATION'
set global autocommit=1;
-ERROR HY000: Variable 'autocommit' is a LOCAL variable and can't be used with SET GLOBAL
+ERROR HY000: Variable 'autocommit' is a SESSION variable and can't be used with SET GLOBAL
select @@global.timestamp;
-ERROR HY000: Variable 'timestamp' is a LOCAL variable
+ERROR HY000: Variable 'timestamp' is a SESSION variable
set @@version='';
ERROR HY000: Unknown system variable 'version'
set @@concurrent_insert=1;
ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL
set @@global.sql_auto_is_null=1;
-ERROR HY000: Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
+ERROR HY000: Variable 'sql_auto_is_null' is a SESSION variable and can't be used with SET GLOBAL
select @@global.sql_auto_is_null;
-ERROR HY000: Variable 'sql_auto_is_null' is a LOCAL variable
+ERROR HY000: Variable 'sql_auto_is_null' is a SESSION variable
set myisam_max_sort_file_size=100;
ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
set myisam_max_extra_sort_file_size=100;