diff options
| author | unknown <jimw@mysql.com> | 2005-08-01 17:10:35 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-01 17:10:35 -0700 |
| commit | a69ca6dc99826bbfdb8f10bde508504eceab15ae (patch) | |
| tree | 8eb51545a5ac4d0d91caef1c4b86925516ee27a3 /mysql-test/t/user_var.test | |
| parent | 275150580bdc867dbcc0c58d23d152f94b2bb4f7 (diff) | |
| parent | f8a6e9d369c2dcf738393ec0d7c54c9a7605156d (diff) | |
| download | mariadb-git-a69ca6dc99826bbfdb8f10bde508504eceab15ae.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-10724
into mysql.com:/home/jimw/my/mysql-4.1-clean
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/t/user_var.test:
Resolve conflict
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 6409d4ffea5..7691a574a2a 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -120,4 +120,25 @@ set session @honk=99; --error 1105 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 |