diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 13:59:44 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 13:59:44 +0100 |
commit | e772cbd7b774add42821c33b13ea052f8c9e2e6e (patch) | |
tree | 0411c732161ad4fc4f49a02ee78abaa6632c6d4d /mysql-test/t/func_str.test | |
parent | 8428c116c7cc1fb6a04345637a10084810874dd8 (diff) | |
parent | d7304375e5e0ce30979c2b92e70eb0effaa30a25 (diff) | |
download | mariadb-git-e772cbd7b774add42821c33b13ea052f8c9e2e6e.tar.gz |
5.1 merge
Diffstat (limited to 'mysql-test/t/func_str.test')
-rw-r--r-- | mysql-test/t/func_str.test | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index f49fa633925..df8f6df27b3 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1374,9 +1374,11 @@ SELECT CONVERT(('' IN (REVERSE(CAST(('') AS DECIMAL)), '')), CHAR(3)); --echo # and other crashes --echo # CREATE TABLE t1 ( a TEXT ); -SELECT 'aaaaaaaaaaaaaa' INTO OUTFILE 'bug58165.txt'; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--eval SELECT 'aaaaaaaaaaaaaa' INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/bug58165.txt'; SELECT insert( substring_index( 'a', 'a', 'b' ), 1, 0, 'x' ); -LOAD DATA INFILE 'bug58165.txt' INTO TABLE t1; +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/bug58165.txt' INTO TABLE t1; SELECT * FROM t1; DROP TABLE t1; |