Corrected result-file merge error.

c3d51823 · thek@adventure.(none) · c87a6342 · c3d51823
Commit c3d51823 authored Mar 26, 2008 by thek@adventure.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

mysql-test/r/grant.result mysql-test/r/grant.result +6 -0

No files found.
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -1218,6 +1218,12 @@ DROP USER mysqltest_1@localhost;
 DROP DATABASE db27878;
 use test;
 DROP TABLE t1;
+#
+#  Bug#33275 Server crash when creating temporary table mysql.user
+#
+CREATE TEMPORARY TABLE mysql.user (id INT);
+FLUSH PRIVILEGES;
+DROP TABLE mysql.user;
 drop table if exists test;
 Warnings:
 Note	1051	Unknown table 'test'