summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.(none)>2007-06-01 20:05:34 +0400
committerunknown <kostja@bodhi.(none)>2007-06-01 20:05:34 +0400
commite21076463c4c1721bfd7150ff2350d634009755a (patch)
treec7db9e064871db06b2b6a0b147d425bffccf568c
parenta00e5c6896e4a2d128aa7da5fabcb508ebd67f0f (diff)
downloadmariadb-git-e21076463c4c1721bfd7150ff2350d634009755a.tar.gz
Fix more mysqltest warnings.
-rw-r--r--mysql-test/t/mysqltest.test11
-rw-r--r--mysql-test/t/strict.test2
2 files changed, 3 insertions, 10 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 24e59eeb89b..54d17df1fd9 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
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test
index fc663853174..a66ab464a11 100644
--- a/mysql-test/t/strict.test
+++ b/mysql-test/t/strict.test
@@ -975,9 +975,7 @@ select * from t1;
# Check that select don't abort even in strict mode (for now)
set sql_mode='traditional';
---disable_ps_warnings
select count(*) from t1 where STR_TO_DATE('2004.12.12 10:22:61','%Y.%m.%d %T') IS NULL;
---enable_ps_warnings
drop table t1;