bk commit into 5.0 tree (msvensson:1.2070)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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
  1.2070 06/02/27 11:32:43 msvensson@stripped +2 -0
  Backup all of mysql.user to temptable in order not change the order the records. 
  Since other tests depend of order

  mysql-test/t/grant2.test
    1.32 06/02/27 11:32:39 msvensson@stripped +2 -2
    Backup all of mysql.user to temptable in order not change the order the records. 
    Since other tests depend of order

  mysql-test/r/grant2.result
    1.26 06/02/27 11:32:39 msvensson@stripped +2 -2
    Update test result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	devsrv-b.mysql.com
# Root:	/space/magnus/bug17279/my50-bug17279

--- 1.25/mysql-test/r/grant2.result	2006-02-27 11:03:42 +01:00
+++ 1.26/mysql-test/r/grant2.result	2006-02-27 11:32:39 +01:00
@@ -336,7 +336,7 @@
 drop user 'mysqltest_1'@'localhost';
 create database TESTDB;
 create table t2(a int);
-create temporary table t1 as select * from mysql.user where host='localhost';
+create temporary table t1 as select * from mysql.user;
 delete from mysql.user where host='localhost';
 INSERT INTO mysql.user VALUES
 ('%','mysqltest_1',password('password'),'N','N','N','N','N','N',
@@ -350,7 +350,7 @@
 FLUSH PRIVILEGES;
 create database TEStdb;
 ERROR 42000: Access denied for user 'mysqltest_1'@'%' to database 'TEStdb'
-delete from mysql.user where host='%' and user='mysqltest_1';
+delete from mysql.user;
 delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';
 insert into mysql.user select * from t1;
 drop table t1, t2;

--- 1.31/mysql-test/t/grant2.test	2006-02-27 11:03:42 +01:00
+++ 1.32/mysql-test/t/grant2.test	2006-02-27 11:32:39 +01:00
@@ -437,7 +437,7 @@
 
 create database TESTDB;
 create table t2(a int);
-create temporary table t1 as select * from mysql.user where host='localhost';
+create temporary table t1 as select * from mysql.user;
 delete from mysql.user where host='localhost';
 INSERT INTO mysql.user VALUES
 ('%','mysqltest_1',password('password'),'N','N','N','N','N','N',
@@ -457,7 +457,7 @@
 
 # Clean-up
 connection default;
-delete from mysql.user where host='%' and user='mysqltest_1';
+delete from mysql.user;
 delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';
 insert into mysql.user select * from t1;
 drop table t1, t2;