bk commit into 5.0 tree (kostja:1.2385)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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, 2007-01-16 21:31:59+03:00, kostja@stripped +2 -0
  Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
  into  bodhi.local:/opt/local/work/mysql-5.0-runtime
  MERGE: 1.1616.2873.43

  mysql-test/t/backup.test@stripped, 2007-01-16 21:30:16+03:00, kostja@stripped +0 -1
    Auto merged
    MERGE: 1.13.1.2

  mysql-test/t/ps.test@stripped, 2007-01-16 21:31:56+03:00, kostja@stripped +5 -5
    Manual merge.
    MERGE: 1.27.1.30

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-runtime/RESYNC

--- 1.83/mysql-test/t/ps.test	2007-01-15 13:10:02 +03:00
+++ 1.84/mysql-test/t/ps.test	2007-01-16 21:31:56 +03:00
@@ -1165,7 +1165,12 @@
 drop database mysqltest;
 deallocate prepare stmt1;
 deallocate prepare stmt2;
+#
 # CREATE TABLE with DATA DIRECTORY option
+#
+# Protect ourselves from data left in tmp/ by a previos possibly failed
+# test
+--system rm -f $MYSQLTEST_VARDIR/tmp/t1.*
 --disable_query_log
 eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
 --enable_query_log