diff options
| author | unknown <joerg@trift2.> | 2007-06-04 12:00:57 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-04 12:00:57 +0200 |
| commit | da49952b7eb6cb5e9d39630b202e4dbf42ba91dc (patch) | |
| tree | 49ab3f395cd65545be2d131007ab6bd50e17938a /mysql-test/t/mysqltest.test | |
| parent | e3cfdb301f01d24abed46122b951033b69e33645 (diff) | |
| parent | e21076463c4c1721bfd7150ff2350d634009755a (diff) | |
| download | mariadb-git-da49952b7eb6cb5e9d39630b202e4dbf42ba91dc.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 7d254372eab..27a2dcc97b1 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -48,11 +48,6 @@ select otto from (select 1 as otto) as t1; --error 0 select otto from (select 1 as otto) as t1; -# expectation <> response --- // --error 1054 --- // select otto from (select 1 as otto) as t1; - - # ---------------------------------------------------------------------------- # Negative case(statement): # The derived table t1 does not contain a column named 'friedrich' . @@ -333,9 +328,9 @@ select 3 from t1 ; # This is a comment # This is a ; comment # This is a -- comment --- This is also a comment --- # This is also a comment --- This is also a ; comment +# -- This is also a comment +# -- # This is also a comment +# -- This is also a ; comment # ---------------------------------------------------------------------------- # Test comments with embedded command @@ -1873,7 +1868,7 @@ DROP TABLE t1; --disable_query_log --exec $MYSQL_TEST --help 2>&1 > /dev/null --exec $MYSQL_TEST --version 2>&1 > /dev/null ---enable_quary_log +--enable_query_log --disable_abort_on_error --error 1 --exec $MYSQL_TEST a b c 2>&1 > /dev/null |