diff options
| author | unknown <bar@mysql.com> | 2005-06-02 17:13:37 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-06-02 17:13:37 +0500 |
| commit | a6cf849e0def7f612a2ccb2e2ce281287db3f6e5 (patch) | |
| tree | a6e3b4f6b2d3a6d452f1c8514517691d02bfcfbd /mysql-test/t/variables.test | |
| parent | 198550e39b8741cccca0e936f608ca6b1c8dd70a (diff) | |
| parent | 17678a7b885beb59fa808b7ace5cee4a0e21667d (diff) | |
| download | mariadb-git-a6cf849e0def7f612a2ccb2e2ce281287db3f6e5.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 9e8a7a1b56f..f8d833b6b73 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -130,6 +130,13 @@ set @@query_alloc_block_size=default, @@query_prealloc_size=default; set transaction_alloc_block_size=default, @@transaction_prealloc_size=default; show variables like '%alloc%'; +# +# Bug #10904 Illegal mix of collations between +# a system variable and a constant +# +SELECT @@version LIKE 'non-existent'; +SELECT @@version_compile_os LIKE 'non-existent'; + # The following should give errors --error 1231 |