diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-07-01 15:38:16 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-07-01 15:38:16 +0200 |
| commit | 8723f47391d00fcdac268f276b76047058543706 (patch) | |
| tree | 818fae95700c42bf39d4a040d3e90259d075f68b | |
| parent | a358380f73200b8e183c39ac637955465d5bde8c (diff) | |
| parent | 977d58f6143a7227804367a41cd88da2da8cce7f (diff) | |
| download | mariadb-git-8723f47391d00fcdac268f276b76047058543706.tar.gz | |
merge 5.1 => 5.5
| -rw-r--r-- | mysql-test/r/func_str.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/func_str.test | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index adaa2df3a61..9b5b960037a 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -2620,13 +2620,13 @@ Warning 1292 Truncated incorrect DECIMAL value: '' # and other crashes # CREATE TABLE t1 ( a TEXT ); -SELECT 'aaaaaaaaaaaaaa' INTO OUTFILE 'bug58165.txt'; +SELECT 'aaaaaaaaaaaaaa' INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug58165.txt';; SELECT insert( substring_index( 'a', 'a', 'b' ), 1, 0, 'x' ); insert( substring_index( 'a', 'a', 'b' ), 1, 0, 'x' ) x Warnings: Warning 1292 Truncated incorrect INTEGER value: 'b' -LOAD DATA INFILE 'bug58165.txt' INTO TABLE t1; +LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug58165.txt' INTO TABLE t1;; SELECT * FROM t1; a aaaaaaaaaaaaaa diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 27e196e5b0c..d57e4cbdf85 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1375,9 +1375,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; |