Fixes for storage_engine tests on Windows

mysql-test/suite/storage_engine/alter_tablespace.test

@@ -81,8 +81,19 @@ EOF
   # Adding a warning suppression based on what InnoDB currently does
   # when it attempts to access a table without an *.ibd file
   --disable_query_log
-  eval CALL mtr.add_suppression('$storage_engine: Error:.*');
+  eval CALL mtr.add_suppression('$storage_engine: Error:');
   --enable_query_log
+
+  # The sleep below is a very bad style, but so far there seems to be 
+  # no reliable way to prevent a failure on Windows, which is caused 
+  # by the fact that the error message that we added the above suppression for,
+  # on Windows appears in the error log with a delay, so MTR 
+  # thinks the error was raised on server shutdown, and the suppression
+  # does not work. Adding it globally is not an option because 
+  # it must be caught in other tests which do not produce the failure
+  # intentionally
+
+  --sleep 1
 }
 
 DROP TABLE t1;

mysql-test/suite/storage_engine/col_opt_not_null.result

@@ -759,9 +759,9 @@ INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
-9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
 INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' );
 Warnings:
@@ -776,9 +776,9 @@ SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	00
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
-9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c DATE <CUSTOM_COL_OPTIONS> NOT NULL) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;

mysql-test/suite/storage_engine/col_opt_null.result

@@ -743,9 +743,9 @@ INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
-9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
 INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' );
 Warnings:
@@ -760,9 +760,9 @@ SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	00
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
-9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c DATE <CUSTOM_COL_OPTIONS> NULL) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;

mysql-test/suite/storage_engine/my.cnf

@@ -4,4 +4,5 @@
 sql-mode=NO_ENGINE_SUBSTITUTION
 binlog-format=row
 log-bin=master-bin
+default-time-zone=UTC
 

mysql-test/suite/storage_engine/repair_table.inc

@@ -110,7 +110,7 @@ if ($have_default_index)
 
   while (!$my_errno)
   {
-    --error 0,1
+    --error 0,2
     --perl 
     use File::Copy;
     @files = glob "$ENV{my_datadir}/test/t1*";
@@ -122,7 +122,7 @@ if ($have_default_index)
       exit 0;
     }
     # No more files
-    exit 1;
+    exit 2;
   EOF
     let $my_errno = $errno;
     if (!$my_errno)

mysql-test/suite/storage_engine/tbl_opt_data_index_dir.test

@@ -7,6 +7,7 @@
 #       that they are accepted
 # 
 
+--source include/have_symlink.inc
 --source have_engine.inc
 
 --let $data_dir = $MYSQLTEST_VARDIR/storage_engine_data_dir/

mysql-test/suite/storage_engine/trx/xa_recovery.test

@@ -64,6 +64,7 @@ EOF
 XA RECOVER;
 XA ROLLBACK 'xa1';
 XA COMMIT 'xa2';
+--replace_result \\ /
 SELECT a FROM t1;
 DROP TABLE t1;
 

mysql-test/suite/storage_engine/type_date_time.result

@@ -27,9 +27,9 @@ INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
-9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
 INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' );
 Warnings:
@@ -44,7 +44,7 @@ SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	00
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
-1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
+1000-01-01	1000-01-01 00:00:00	1970-01-01 00:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
-9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
+9999-12-31	9999-12-31 23:59:59	2038-01-19 03:14:07	838:59:59	2155	2155	99
 DROP TABLE t1;