bk commit into 5.0 tree (jimw:1.1949)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1949 05/05/13 11:56:45 jimw@stripped +1 -0
  Restore order of test after merge re-ordered it

  mysql-test/t/ps_grant.test
    1.5 05/05/13 11:56:17 jimw@stripped +5 -5
    Re-order test

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.4/mysql-test/t/ps_grant.test	2005-05-13 10:07:16 -07:00
+++ 1.5/mysql-test/t/ps_grant.test	2005-05-13 11:56:17 -07:00
@@ -112,11 +112,6 @@
 
 drop database mysqltest;
 
-# Tested here simply so it is not tested with embedded server
-prepare stmt4 from ' show full processlist ';
---replace_column 1 number 6 time 3 localhost
-execute stmt4;
-
 ## grant/revoke + drop user
 --error 1295
 prepare stmt3 from ' grant all on test.t1 to drop_user@localhost
@@ -130,4 +125,9 @@
 --error 1295
 prepare stmt3 from ' drop user drop_user@localhost ';
 drop user drop_user@localhost;
+
+# Tested here simply so it is not tested with embedded server
+prepare stmt4 from ' show full processlist ';
+--replace_column 1 number 6 time 3 localhost
+execute stmt4;