diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 17:28:49 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 17:28:49 +0200 |
| commit | fdc8bc70375d974f6788618da00dd9cea9767e21 (patch) | |
| tree | e7c3ff175d2ecad48c72ce1b883e1b4ba2fdf561 /mysql-test/t/mysqltest.test | |
| parent | a998c2c8641be21cefe4e09e9413e17aad0ab896 (diff) | |
| parent | 75485dc3498596b53d3e0eb04e6f4fe101996908 (diff) | |
| download | mariadb-git-fdc8bc70375d974f6788618da00dd9cea9767e21.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
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 2b2f1348417..d7c9945fe18 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -46,11 +46,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' . @@ -331,9 +326,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 @@ -1869,7 +1864,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 |