bk commit into 5.0 tree (msvensson:1.2442)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2007-02-23 18:05:32+01:00, msvensson@stripped +1 -0
  Convert "system cp" to portable mysqltest commands

  mysql-test/t/type_varchar.test@stripped, 2007-02-23 18:05:31+01:00, msvensson@stripped
+3 -2
    Convert "system cp" to portable mysqltest commands

# 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:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.11/mysql-test/t/type_varchar.test	2006-12-04 13:25:29 +01:00
+++ 1.12/mysql-test/t/type_varchar.test	2007-02-23 18:05:31 +01:00
@@ -3,7 +3,7 @@ drop table if exists t1, t2;
 --enable_warnings
 
 create table t1 (v varchar(30), c char(3), e enum('abc','def','ghi'), t text);
-system cp $MYSQL_TEST_DIR/std_data/vchar.frm $MYSQLTEST_VARDIR/master-data/test/;
+copy_file $MYSQL_TEST_DIR/std_data/vchar.frm
$MYSQLTEST_VARDIR/master-data/test/vchar.frm;
 truncate table vchar;
 show create table t1;
 show create table vchar;
@@ -162,7 +162,8 @@ create table t3 (
   en varchar(255) character set utf8,
   cz varchar(255) character set utf8
 );
-system cp $MYSQL_TEST_DIR/std_data/14897.frm $MYSQLTEST_VARDIR/master-data/test/t3.frm;
+remove_file $MYSQLTEST_VARDIR/master-data/test/t3.frm;
+copy_file $MYSQL_TEST_DIR/std_data/14897.frm $MYSQLTEST_VARDIR/master-data/test/t3.frm;
 truncate table t3;
 insert into t3 (id, en, cz) values 
 (1,'en string 1','cz string 1'),