diff options
| author | unknown <jimw@mysql.com> | 2005-08-01 17:54:57 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-01 17:54:57 -0700 |
| commit | d083e4ac1b1450e99984dcf488cfd95cefaf78cb (patch) | |
| tree | c2a4f1c838bccde279f578e1d54a016a0d377f51 /mysql-test/t/user_var.test | |
| parent | 8fc1e27fb7604b93358a15f26a0c849faa21a1ca (diff) | |
| parent | c679cb67bc8958a15dab68febf236ea1edeff5c5 (diff) | |
| download | mariadb-git-d083e4ac1b1450e99984dcf488cfd95cefaf78cb.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/func_math.result:
Resolve conflicts
mysql-test/r/user_var.result:
Resolve conflicts
mysql-test/t/func_math.test:
Resolve conflicts
mysql-test/t/user_var.test:
Resolve conflicts
sql/item_func.cc:
Resolve conflicts
sql/sql_parse.cc:
Resolve conflicts
Diffstat (limited to 'mysql-test/t/user_var.test')
| -rw-r--r-- | mysql-test/t/user_var.test | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index 91372b67f5e..e3b5b4ef33e 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -121,6 +121,27 @@ set session @honk=99; --error 1382 set one_shot @honk=99; +# +# Bug #10724 @@local not preserved in column name of select +# +# The value doesn't actually matter, we just care about the column name +--replace_column 1 # +select @@local.max_allowed_packet; +--replace_column 1 # +select @@session.max_allowed_packet; +--replace_column 1 # +select @@global.max_allowed_packet; +--replace_column 1 # +select @@max_allowed_packet; +--replace_column 1 # +select @@Max_Allowed_Packet; +--replace_column 1 # +select @@version; +--replace_column 1 # +select @@global.version; +--replace_column 1 # +select @@session.VERSION; + # End of 4.1 tests # |