summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-08-15 09:54:19 +0300
committermonty@mashka.mysql.fi <>2003-08-15 09:54:19 +0300
commita9146ace70a6bc56be969dc55830a875864bbd78 (patch)
tree8af6b315e91238a5e5102bbf069129cfc58554b0 /mysql-test
parentfb47e642568139a58d8ac5598d9897fdb3ff1fa0 (diff)
downloadmariadb-git-a9146ace70a6bc56be969dc55830a875864bbd78.tar.gz
Cleanups to recent patches
Fix packet error when using wrong GRANT command
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/grant.result3
-rw-r--r--mysql-test/t/grant.test5
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index fccd3715af7..4ce22e84dd5 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -108,3 +108,6 @@ flush privileges;
drop table t1;
GRANT FILE on mysqltest.* to mysqltest_1@localhost;
Wrong usage of DB GRANT and GLOBAL PRIVILEGES
+select 1;
+1
+1
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index 5b20354336c..4433c9cbffc 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -72,5 +72,10 @@ delete from mysql.tables_priv where user='mysqltest_1';
delete from mysql.columns_priv where user='mysqltest_1';
flush privileges;
drop table t1;
+
+#
+# Test some error conditions
+#
--error 1221
GRANT FILE on mysqltest.* to mysqltest_1@localhost;
+select 1; -- To test that the previous command didn't cause problems