bk commit into 5.1 tree (msvensson:1.2156)

[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.2156 06/02/22 08:55:19 msvensson@neptunus.(none) +1 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

  mysql-test/t/partition_mgm_err.test
    1.11 06/02/22 08:55:10 msvensson@neptunus.(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:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1/RESYNC

--- 1.10/mysql-test/t/partition_mgm_err.test	2006-02-22 00:39:56 +01:00
+++ 1.11/mysql-test/t/partition_mgm_err.test	2006-02-22 08:55:10 +01:00
@@ -171,19 +171,20 @@
 #
 # BUG: 14354 Partitions: data directory clause fails
 #
---exec rm -rf $MYSQL_TEST_DIR/bug14354
---exec mkdir $MYSQL_TEST_DIR/bug14354
+--system rm -rf $MYSQLTEST_VARDIR/tmp/bug14354
+--system mkdir $MYSQLTEST_VARDIR/tmp/bug14354
 disable_query_log;
 eval CREATE TABLE t1 (id int) PARTITION BY RANGE(id) (
-PARTITION p1 VALUES LESS THAN (20) ENGINE=myiasm 
-DATA DIRECTORY="$MYSQL_TEST_DIR/bug14354" 
-INDEX DIRECTORY="$MYSQL_TEST_DIR/bug14354");
+PARTITION p1 VALUES LESS THAN (20) ENGINE=myiasm
+DATA DIRECTORY="$MYSQLTEST_VARDIR/tmp/bug14354"
+INDEX DIRECTORY="$MYSQLTEST_VARDIR/tmp/bug14354");
 enable_query_log;
 INSERT INTO t1 VALUES (15);
---exec test -f $MYSQL_TEST_DIR/bug14354/t1#P#p1.MYD
---exec test -f $MYSQL_TEST_DIR/bug14354/t1#P#p1.MYI
+--system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYD
+--system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYI
 DROP TABLE t1;
---exec rm -rf $MYSQL_TEST_DIR/bug14354
+--system rm -rf $MYSQLTEST_VARDIR/tmp/bug14354
+
 
 #
 # Bug# 16534 - Trying to add multiple partitions crashes server