From d1351a6dd8de5b50d8c031658570f2654983411c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Feb 2007 18:05:32 +0100 Subject: [PATCH] Convert "system cp" to portable mysqltest commands --- mysql-test/t/type_varchar.test | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/t/type_varchar.test b/mysql-test/t/type_varchar.test index 7b87a388c56..0aa5fb92129 100644 --- a/mysql-test/t/type_varchar.test +++ b/mysql-test/t/type_varchar.test @@ -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'),