From 266fc6121b15f868e16ec5aa42f277673efff684 Mon Sep 17 00:00:00 2001
From: unknown <thek@adventure.(none)>
Date: Wed, 26 Mar 2008 14:03:01 +0100
Subject: Corrected result-file merge error.

---
 mysql-test/r/grant.result | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index c157e1d4706..b91f2016a9e 100644
--- 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'
-- 
cgit v1.2.1