summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <gluh@eagle.intranet.mysql.r18.ru>2006-03-06 15:14:15 +0400
committerunknown <gluh@eagle.intranet.mysql.r18.ru>2006-03-06 15:14:15 +0400
commit76e5c1b4b6bb3e748e46a204157409f7ba73a7bf (patch)
tree6491768190dccc7c4a6b3d7cbf1f722b307cd976
parent7d24c7d445f1f25052f4a9270d617b4429a068f3 (diff)
downloadmariadb-git-76e5c1b4b6bb3e748e46a204157409f7ba73a7bf.tar.gz
post-merge fix
-rw-r--r--mysql-test/r/grant.result1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 603cf8bd675..3432de5179a 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -642,4 +642,3 @@ delete from mysql.db where user='mysqltest1';
delete from mysql.tables_priv where user='mysqltest1';
flush privileges;
drop database mysqltest;
-