Commit 397fbd02 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files

Remove unportable constructs in loaddata.test

parent 4a013e29

mysql-test/t/loaddata.test

+10 −12
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ delete from t1; 
eval load data infile '$MYSQLTEST_VARDIR/tmp/t1' into table t1;

enable_query_log;

select * from t1;

--exec rm $MYSQLTEST_VARDIR/tmp/t1

remove_file $MYSQLTEST_VARDIR/tmp/t1;



disable_query_log;

eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1'
@@ -54,7 +54,7 @@ eval load data infile '$MYSQLTEST_VARDIR/tmp/t1' into table t1 
FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';

enable_query_log;

select * from t1;

--exec rm $MYSQLTEST_VARDIR/tmp/t1

remove_file $MYSQLTEST_VARDIR/tmp/t1;

SET @@SQL_MODE=@OLD_SQL_MODE;

drop table t1;
@@ -89,17 +89,16 @@ INSERT INTO t1 (c1) VALUES 
  ('.r.'), ('.rr.'), ('.rrr.'), ('.rrrr.');

SELECT * FROM t1;



--exec rm -f $MYSQLTEST_VARDIR/tmp/t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY 'r' FROM t1;

--exec cat $MYSQLTEST_VARDIR/tmp/t1

cat_file $MYSQLTEST_VARDIR/tmp/t1;



--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t2 FIELDS ENCLOSED BY 'r';

SELECT t1.id, c1, c2 FROM t1 LEFT  JOIN t2 ON t1.id=t2.id WHERE c1 != c2;

SELECT t1.id, c1, c2 FROM t1 RIGHT JOIN t2 ON t1.id=t2.id WHERE c1 != c2;



--exec rm $MYSQLTEST_VARDIR/tmp/t1

remove_file $MYSQLTEST_VARDIR/tmp/t1;

DROP TABLE t1,t2;



# End of 4.1 tests
@@ -184,7 +183,7 @@ SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE=NO_AUTO_VALUE_ON_ZERO; 
eval load data infile '$MYSQLTEST_VARDIR/tmp/t1' into table t2;

enable_query_log;

select * from t2;

--exec rm $MYSQLTEST_VARDIR/tmp/t1

remove_file $MYSQLTEST_VARDIR/tmp/t1;

SET @@SQL_MODE=@OLD_SQL_MODE;

drop table t1,t2;
@@ -200,7 +199,7 @@ eval select * into outfile '$MYSQLTEST_VARDIR/tmp/t2' from t2; 
eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1;

enable_query_log;

select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;

--exec rm $MYSQLTEST_VARDIR/tmp/t2

remove_file $MYSQLTEST_VARDIR/tmp/t2;

delete from t1;

disable_query_log;

eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t2'
@@ -210,7 +209,7 @@ eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1 
FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';

enable_query_log;

select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;

--exec rm $MYSQLTEST_VARDIR/tmp/t2

remove_file $MYSQLTEST_VARDIR/tmp/t2;

drop table t1,t2;



#
@@ -223,11 +222,10 @@ CREATE TABLE t1 (c1 INT, c2 TIMESTAMP, c3 REAL, c4 DOUBLE); 
INSERT INTO t1 (c1, c2, c3, c4) VALUES (10, '1970-02-01 01:02:03', 1.1E-100, 1.1E+100);

SELECT * FROM t1;



--exec rm -f $MYSQLTEST_VARDIR/tmp/t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY '-' FROM t1;

--exec cat $MYSQLTEST_VARDIR/tmp/t1

--exec echo EOF

cat_file $MYSQLTEST_VARDIR/tmp/t1;

echo EOF;



TRUNCATE t1;
@@ -235,7 +233,7 @@ TRUNCATE t1; 
eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t1 FIELDS ENCLOSED BY '-';

SELECT * FROM t1;



--exec rm $MYSQLTEST_VARDIR/tmp/t1

remove_file $MYSQLTEST_VARDIR/tmp/t1;

DROP TABLE t1;



# End of 5.0 tests