Clean up after merge of bug fixes

mysql-test/r/strict.result

@@ -1244,6 +1244,8 @@ t1	CREATE TABLE `t1` (
   `a` bigint(20) unsigned NOT NULL,
   `b` date NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
+set @@sql_mode='traditional';
 create table t1 (d date);
 insert into t1 values ('2000-10-00');
 ERROR 22007: Incorrect date value: '2000-10-00' for column 'd' at row 1