diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-16 15:14:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-16 15:14:12 +0200 |
| commit | e424046a25c8cae75fc0db7440202bc2e53b350a (patch) | |
| tree | ba82099154321385ebb2ddf41439b9fa94822de4 /mysql-test | |
| parent | 825f5418a1bf632eb5f89af8b5a4a08bf2813e49 (diff) | |
| parent | 6c8a28288abef532d4dbd6c74edc11feca50ebd4 (diff) | |
| download | mariadb-git-e424046a25c8cae75fc0db7440202bc2e53b350a.tar.gz | |
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 14 |
2 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 71e26c42b70..c56ccc3641a 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -406,3 +406,13 @@ set @a=@b, @b=@a; select @a, @b; @a @b 2 1 +set @@global.global.key_buffer_size= 1; +ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use +set GLOBAL global.key_buffer_size= 1; +ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use +SELECT @@global.global.key_buffer_size; +ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use +SELECT @@global.session.key_buffer_size; +ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use +SELECT @@global.local.key_buffer_size; +ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 05ac0427a92..78fab3afe42 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -285,3 +285,17 @@ select @@global.max_user_connections,@@local.max_join_size; set @a=1, @b=2; set @a=@b, @b=@a; select @a, @b; + +# +# Bug#2586:Disallow global/session/local as structured var. instance names +# +--error 1149 +set @@global.global.key_buffer_size= 1; +--error 1149 +set GLOBAL global.key_buffer_size= 1; +--error 1149 +SELECT @@global.global.key_buffer_size; +--error 1149 +SELECT @@global.session.key_buffer_size; +--error 1149 +SELECT @@global.local.key_buffer_size; |