bk commit into 5.1 tree (msvensson:1.2172)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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.2172 06/05/29 16:31:18 msvensson@shellback.(none) +2 -0
  Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

  mysql-test/t/ps.test
    1.65 06/05/29 16:31:12 msvensson@shellback.(none) +0 -0
    Auto merged

  mysql-test/r/ps.result
    1.67 06/05/29 16:31:12 msvensson@shellback.(none) +0 -0
    Auto merged

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.66/mysql-test/r/ps.result	2006-05-03 16:03:57 +02:00
+++ 1.67/mysql-test/r/ps.result	2006-05-29 16:31:12 +02:00
@@ -1157,3 +1157,4 @@
 Warnings:
 Error	1146	Table 'test.t4' doesn't exist
 deallocate prepare stmt;
+drop table t1, t2, t3;

--- 1.64/mysql-test/t/ps.test	2006-05-03 16:03:58 +02:00
+++ 1.65/mysql-test/t/ps.test	2006-05-29 16:31:12 +02:00
@@ -1145,5 +1145,5 @@
 execute stmt;
 execute stmt;
 deallocate prepare stmt;
-
+drop table t1, t2, t3;
 # End of 5.0 tests