summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/grant.result3
-rw-r--r--mysql-test/r/query_cache.result1
-rw-r--r--mysql-test/t/grant.test3
3 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 3a793ef55e4..e9e1d4cd620 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -436,6 +436,7 @@ revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
delete from mysql.user where user=_binary'mysqltest_1';
drop database mysqltest;
use mysql;
-insert into tables_priv values ('','mysqltest_1','test_table','test_grantor','',CURRENT_TIMESTAMP,'Select','Select');
+insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
flush privileges;
delete from tables_priv where host = '' and user = 'mysqltest_1';
+flush privileges;
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 3af0d4c3704..2884b9b3fe4 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1057,6 +1057,5 @@ Qcache_inserts 2
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 1
-
drop table t1;
set GLOBAL query_cache_size=0;
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index d80ef638e79..6c38aac1ebd 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -397,6 +397,7 @@ drop database mysqltest;
#
connection default;
use mysql;
-insert into tables_priv values ('','mysqltest_1','test_table','test_grantor','',CURRENT_TIMESTAMP,'Select','Select');
+insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
flush privileges;
delete from tables_priv where host = '' and user = 'mysqltest_1';
+flush privileges;