diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-12-18 18:07:39 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-12-18 18:07:39 -0400 |
| commit | 115c65f4d72f8a08d9a2bb72e64ce897df812983 (patch) | |
| tree | 49a6fb185720692a3dc6f09af2bf354938b4d549 /mysql-test | |
| parent | 6f8fbe54adefbf95924f28496e00f897ebbe4e80 (diff) | |
| parent | d6be93aa27becf6864b15a699cf62c394620355e (diff) | |
| download | mariadb-git-115c65f4d72f8a08d9a2bb72e64ce897df812983.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
sql/share/czech/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 8afdced206b..b4a607cb174 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -231,7 +231,7 @@ Wrong argument type to variable 'convert_character_set' set global autocommit=1; Variable 'autocommit' is a LOCAL variable and can't be used with SET GLOBAL select @@global.timestamp; -Variable 'timestamp' is a LOCAL variable and can't be used with SET GLOBAL +Variable 'timestamp' is a LOCAL variable set @@version=''; Unknown system variable 'version' set @@concurrent_insert=1; @@ -239,7 +239,7 @@ Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLO set @@global.sql_auto_is_null=1; Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL select @@global.sql_auto_is_null; -Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL +Variable 'sql_auto_is_null' is a LOCAL variable set myisam_max_sort_file_size=100; 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; @@ -375,3 +375,5 @@ Unknown system variable 'xxxxxxxxxx' select 1; 1 1 +select @@session.key_buffer_size; +Variable 'key_buffer_size' is a GLOBAL variable diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 8e38160c60b..ec86a763023 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -139,7 +139,7 @@ set character set unknown; set character set 0; --error 1228 set global autocommit=1; ---error 1228 +--error 1238 select @@global.timestamp; --error 1193 set @@version=''; @@ -147,7 +147,7 @@ set @@version=''; set @@concurrent_insert=1; --error 1228 set @@global.sql_auto_is_null=1; ---error 1228 +--error 1238 select @@global.sql_auto_is_null; --error 1229 set myisam_max_sort_file_size=100; @@ -266,3 +266,6 @@ drop table t1,t2; --error 1193 select @@xxxxxxxxxx; select 1; + +--error 1238 +select @@session.key_buffer_size;
\ No newline at end of file |