diff options
| author | unknown <epotemkin@bk-internal.mysql.com> | 2007-05-09 12:55:05 +0200 |
|---|---|---|
| committer | unknown <epotemkin@bk-internal.mysql.com> | 2007-05-09 12:55:05 +0200 |
| commit | 80a36692046d14e09524409b2f7864537fa0cac5 (patch) | |
| tree | 95e7aabe5ec7c9b5a90f8e5d0a1048efd59d15ac /mysql-test | |
| parent | 0ba14149aade1857b97ac61e34823aa589a152b2 (diff) | |
| parent | ba9657bcc60270cbda65f3b44933bb92f31c599f (diff) | |
| download | mariadb-git-80a36692046d14e09524409b2f7864537fa0cac5.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
mysql-test/r/loaddata.result:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/loaddata.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/loaddata.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index aaf6dcb6711..82c070d7cc9 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -180,7 +180,7 @@ insert into t2 values(1),(2); Warnings: Warning 1261 Row 1 doesn't contain data for all columns Warning 1261 Row 2 doesn't contain data for all columns -select f1 from t1 where f2 <> '0000-00-00 00:00:00'; +select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1; f1 1 2 @@ -188,7 +188,7 @@ delete from t1; Warnings: Warning 1261 Row 1 doesn't contain data for all columns Warning 1261 Row 2 doesn't contain data for all columns -select f1 from t1 where f2 <> '0000-00-00 00:00:00'; +select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1; f1 1 2 diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index ba0edc341b0..51f5e5135e6 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -168,7 +168,7 @@ disable_query_log; 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'; +select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1; --exec rm $MYSQLTEST_VARDIR/tmp/t2 delete from t1; disable_query_log; @@ -178,7 +178,7 @@ FROM t2; 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'; +select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1; --exec rm $MYSQLTEST_VARDIR/tmp/t2 drop table t1,t2; |