summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorbar@mysql.com <>2005-08-08 16:22:17 +0500
committerbar@mysql.com <>2005-08-08 16:22:17 +0500
commit8545cf92d0dfe4affaf4b6abbd500fb7f89ac81f (patch)
tree196eeb599e9f96a95c7f626feb111cfbb0277add /mysql-test
parent245b4beb494bc115a96394e84674c7bd1ad4bd4c (diff)
parent2c8fc886b91903d0cbb9064c64c7209ee816369e (diff)
downloadmariadb-git-8545cf92d0dfe4affaf4b6abbd500fb7f89ac81f.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b10892
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/grant.result3
-rw-r--r--mysql-test/t/grant.test7
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index e9e1d4cd620..a50293752ec 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -440,3 +440,6 @@ insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_gr
flush privileges;
delete from tables_priv where host = '' and user = 'mysqltest_1';
flush privileges;
+set @user123="non-existent";
+select * from mysql.db where user=@user123;
+Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index 50255d515e0..b0de62e679c 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -402,4 +402,11 @@ flush privileges;
delete from tables_priv where host = '' and user = 'mysqltest_1';
flush privileges;
+#
+# Bug #10892 user variables not auto cast for comparisons
+# Check that we don't get illegal mix of collations
+#
+set @user123="non-existent";
+select * from mysql.db where user=@user123;
+
# End of 4.1 tests