bk commit into 5.1 tree (thek:1.2560)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of thek.  When thek does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-26 14:03:01+01:00, thek@adventure.(none) +1 -0
  Corrected result-file merge error.

  mysql-test/r/grant.result@stripped, 2008-03-26 14:02:59+01:00, thek@adventure.(none) +6 -0
    Corrected result-file merge error.

diff -Nrup a/mysql-test/r/grant.result b/mysql-test/r/grant.result
--- a/mysql-test/r/grant.result	2008-03-26 11:07:07 +01:00
+++ b/mysql-test/r/grant.result	2008-03-26 14:02:59 +01:00
@@ -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'