Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged

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

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;