diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 21:35:51 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 21:35:51 +0400 |
| commit | 3df8e88dd84e3bb6512e8c33498df5db4823d18a (patch) | |
| tree | 4c53541bd85faea4f3fca21d63e1f8880d3c9189 /mysql-test/t/skip_name_resolve.test | |
| parent | 018b0d3ee7883da0a9ae294bb2d25b747f9e3a41 (diff) | |
| parent | 0cb83d46e4fd678794ef4d487a10bec6e43688f0 (diff) | |
| download | mariadb-git-3df8e88dd84e3bb6512e8c33498df5db4823d18a.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
Text conflict in sql/log.cc
Text conflict in sql/set_var.cc
Text conflict in sql/sql_class.cc
Diffstat (limited to 'mysql-test/t/skip_name_resolve.test')
| -rw-r--r-- | mysql-test/t/skip_name_resolve.test | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/t/skip_name_resolve.test b/mysql-test/t/skip_name_resolve.test index cd7ffe1690d..a14f3af5cd6 100644 --- a/mysql-test/t/skip_name_resolve.test +++ b/mysql-test/t/skip_name_resolve.test @@ -29,3 +29,24 @@ disconnect con1; # Wait till all disconnects are completed --source include/wait_until_count_sessions.inc +--echo # +--echo # Bug #37168: Missing variable - skip_name_resolve +--echo # + +SHOW VARIABLES LIKE 'skip_name_resolve'; +SHOW GLOBAL VARIABLES LIKE 'skip_name_resolve'; +SHOW SESSION VARIABLES LIKE 'skip_name_resolve'; + +SELECT @@skip_name_resolve; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SELECT @@LOCAL.skip_name_resolve; +SELECT @@GLOBAL.skip_name_resolve; + +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET @@skip_name_resolve=0; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET @@LOCAL.skip_name_resolve=0; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET @@GLOBAL.skip_name_resolve=0; + +--echo End of 5.1 tests |