diff options
author | unknown <cmiller@maint1.mysql.com> | 2006-08-15 19:30:24 +0200 |
---|---|---|
committer | unknown <cmiller@maint1.mysql.com> | 2006-08-15 19:30:24 +0200 |
commit | b03c1871071c287c98bbe0f080ef7c43be8890ee (patch) | |
tree | 0594e8a5dde16f4d80425516690896ecbe9f468a /mysql-test/t/variables.test | |
parent | 6fb4287a4e5c9c76f6dce5f2513163abf3fa1452 (diff) | |
parent | e0bffad3e8c121d81e1e64682d7fc8bc5aad8fcf (diff) | |
download | mariadb-git-b03c1871071c287c98bbe0f080ef7c43be8890ee.tar.gz |
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
into maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/variables.test')
-rw-r--r-- | mysql-test/t/variables.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 771a4ad3ed3..9985ed4f7f5 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -585,6 +585,16 @@ show variables like 'ssl%'; select @@log_queries_not_using_indexes; show variables like 'log_queries_not_using_indexes'; +# +# Bug#20908: Crash if select @@"" +# +--error ER_PARSE_ERROR +select @@""; +--error ER_PARSE_ERROR +select @@&; +--error ER_PARSE_ERROR +select @@@; + --echo End of 5.0 tests # This is at the very after the versioned tests, since it involves doing @@ -620,3 +630,4 @@ set global server_id =@my_server_id; set global slow_launch_time =@my_slow_launch_time; set global storage_engine =@my_storage_engine; set global thread_cache_size =@my_thread_cache_size; + |