bk commit into 5.1 tree (holyfoot:1.2416)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-31 16:47:18+04:00, holyfoot@hfmain.(none) +1 -0
  Merge mysql.com:/home/hf/work/25973/my50-25973
  into  mysql.com:/home/hf/work/25973/my51-25973
  MERGE: 1.1810.2371.67

  mysql-test/t/ps_1general.test@stripped, 2007-01-31 16:47:07+04:00, holyfoot@hfmain.(none) +0
-1
    merging
    MERGE: 1.25.1.5

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/25973/my51-25973/RESYNC

--- 1.37/mysql-test/t/ps_1general.test	2007-01-31 16:47:23 +04:00
+++ 1.38/mysql-test/t/ps_1general.test	2007-01-31 16:47:23 +04:00
@@ -579,7 +579,7 @@ prepare stmt1 from ' rename table t5 to 
 create table t5 (a int) ;
 # rename must fail, t7 does not exist
 # Clean up the filename here because embedded server reports whole path
---replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ "" t7.frm t7
+--replace_result \\ / $MYSQLTEST_VARDIR . /master-data/ / t7.frm t7
 --error 1017
 execute stmt1 ;
 create table t7 (a int) ;