fix tests on windows

5 files changed, 38 insertions, 15 deletions

diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff
index b93adcc89d4..33374105fb5 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/r/mysqld--help,win.rdiff
@@ -1,6 +1,6 @@
 --- a/mysql-test/r/mysqld--help.result
 +++ b/mysql-test/r/mysqld--help.result
-@@ -381,7 +381,6 @@
+@@ -381,7 +381,6 @@ The following options may be given as the first argument:
   The number of segments in a key cache
   -L, --language=name Client error messages in given language. May be given as
   a full path. Deprecated. Use --lc-messages-dir instead.
@@ -8,7 +8,7 @@
   --lc-messages=name  Set the language used for the error messages.
   -L, --lc-messages-dir=name 
   Directory where error messages are
-@@ -602,6 +601,7 @@
+@@ -603,6 +602,7 @@ The following options may be given as the first argument:
   Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
   DATETIME, TIMESTAMP columns.
   (Defaults to on; use --skip-mysql56-temporal-format to disable.)
@@ -16,7 +16,7 @@
   --net-buffer-length=# 
   Buffer length for TCP/IP and socket communication
   --net-read-timeout=# 
-@@ -1020,6 +1020,9 @@
+@@ -1048,6 +1048,9 @@ The following options may be given as the first argument:
   characteristics (isolation level, read only/read
   write,snapshot - but not any work done / data modified
   within the transaction).
@@ -26,7 +26,7 @@
   --show-slave-auth-info 
   Show user and password in SHOW SLAVE HOSTS on this
   master.
-@@ -1132,6 +1135,10 @@
+@@ -1171,6 +1174,10 @@ The following options may be given as the first argument:
   Log slow queries to given log file. Defaults logging to
   'hostname'-slow.log. Must be enabled to activate other
   slow log options
@@ -37,7 +37,7 @@
   --socket=name       Socket file to use for connection
   --sort-buffer-size=# 
   Each thread that needs to do a sort allocates a buffer of
-@@ -1151,6 +1158,7 @@
+@@ -1190,6 +1197,7 @@ The following options may be given as the first argument:
   EMPTY_STRING_IS_NULL
   --stack-trace       Print a symbolic stack trace on failure
   (Defaults to on; use --skip-stack-trace to disable.)
@@ -45,7 +45,7 @@
   --standard-compliant-cte 
   Allow only CTEs compliant to SQL standard
   (Defaults to on; use --skip-standard-compliant-cte to disable.)
-@@ -1214,6 +1222,11 @@
+@@ -1261,6 +1269,11 @@ The following options may be given as the first argument:
   --thread-pool-max-threads=# 
   Maximum allowed number of worker threads in the thread
   pool
@@ -57,7 +57,7 @@
   --thread-pool-oversubscribe=# 
   How many additional active worker threads in a group are
   allowed.
-@@ -1252,8 +1265,8 @@
+@@ -1299,8 +1312,8 @@ The following options may be given as the first argument:
   automatically convert it to an on-disk MyISAM or Aria
   table.
   -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
@@ -68,7 +68,7 @@
   --transaction-alloc-block-size=# 
   Allocation block size for transactions to be stored in
   binary log
-@@ -1387,7 +1400,6 @@
+@@ -1434,7 +1447,6 @@ key-cache-block-size 1024
  key-cache-division-limit 100
  key-cache-file-hash-size 512
  key-cache-segments 0
@@ -76,7 +76,7 @@
  lc-messages en_US
  lc-messages-dir MYSQL_SHAREDIR/
  lc-time-names en_US
-@@ -1459,6 +1471,7 @@
+@@ -1506,6 +1518,7 @@ myisam-sort-buffer-size 134216704
  myisam-stats-method NULLS_UNEQUAL
  myisam-use-mmap FALSE
  mysql56-temporal-format TRUE
@@ -84,7 +84,7 @@
  net-buffer-length 16384
  net-read-timeout 30
  net-retry-count 10
-@@ -1561,6 +1574,8 @@
+@@ -1616,6 +1629,8 @@ session-track-schema TRUE
  session-track-state-change FALSE
  session-track-system-variables autocommit,character_set_client,character_set_connection,character_set_results,time_zone
  session-track-transaction-info OFF
@@ -93,7 +93,7 @@
  show-slave-auth-info FALSE
  silent-startup FALSE
  skip-grant-tables TRUE
-@@ -1585,6 +1600,7 @@
+@@ -1642,6 +1657,7 @@ slave-transaction-retry-interval 0
  slave-type-conversions 
  slow-launch-time 2
  slow-query-log FALSE
@@ -101,10 +101,10 @@
  sort-buffer-size 2097152
  sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
  stack-trace TRUE
-@@ -1598,9 +1614,9 @@
- sync-relay-log 10000
- sync-relay-log-info 10000
+@@ -1657,9 +1673,9 @@ sync-relay-log-info 10000
  sysdate-is-now FALSE
+ system-versioning-alter-history ERROR
+ system-versioning-innodb-algorithm-simple TRUE
 -table-cache 431
 +table-cache 2000
  table-definition-cache 400
@@ -113,7 +113,7 @@
  table-open-cache-instances 8
  tc-heuristic-recover OFF
  tcp-keepalive-interval 0
-@@ -1609,6 +1625,8 @@
+@@ -1668,6 +1684,8 @@ tcp-keepalive-time 0
  thread-cache-size 151
  thread-pool-idle-timeout 60
  thread-pool-max-threads 65536
diff --git a/mysql-test/suite/versioning/r/insert.result b/mysql-test/suite/versioning/r/insert.result
index 493f34a97f3..e99d45011d5 100644
--- a/mysql-test/suite/versioning/r/insert.result
+++ b/mysql-test/suite/versioning/r/insert.result
@@ -347,6 +347,7 @@ now() < sysdate()
 1
 create table t1 (a int) with system versioning;
 insert t1 values (1);
+set @a=sysdate(6);
 select * from t1 for system_time as of now(6);
 a
 select * from t1 for system_time as of sysdate(6);
diff --git a/mysql-test/suite/versioning/t/insert.test b/mysql-test/suite/versioning/t/insert.test
index f2fbe31e1d0..f70ba344b13 100644
--- a/mysql-test/suite/versioning/t/insert.test
+++ b/mysql-test/suite/versioning/t/insert.test
@@ -245,6 +245,10 @@ set timestamp=1000000019;
 select now() < sysdate();
 create table t1 (a int) with system versioning;
 insert t1 values (1);
+
+--source suite/versioning/wait_system_clock.inc
+set @a=sysdate(6);
+
 select * from t1 for system_time as of now(6);
 select * from t1 for system_time as of sysdate(6);
 
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
index 167a5b2f7a4..1dea9f7c69c 100644
--- a/mysql-test/suite/versioning/t/partition.test
+++ b/mysql-test/suite/versioning/t/partition.test
@@ -146,6 +146,8 @@ explain partitions select * from t1;
 set @str= concat('select row_start from t1 partition (pn) into @ts0');
 prepare stmt from @str; execute stmt; drop prepare stmt;
 
+--source suite/versioning/wait_system_clock.inc
+
 set @now= now(6);
 delete from t1;
 execute select_p0;
@@ -158,6 +160,9 @@ select @ts0 = @ts1;
 
 set @now= now(6);
 insert into t1 values (2);
+
+--source suite/versioning/wait_system_clock.inc
+
 execute select_p0;
 execute select_pn;
 
@@ -166,6 +171,9 @@ prepare stmt from @str; execute stmt; drop prepare stmt;
 
 set @now= now(6);
 update t1 set x = x + 1;
+
+--source suite/versioning/wait_system_clock.inc
+
 execute select_p0;
 execute select_pn;
 
diff --git a/mysql-test/suite/versioning/wait_system_clock.inc b/mysql-test/suite/versioning/wait_system_clock.inc
new file mode 100644
index 00000000000..21bbe7aea21
--- /dev/null
+++ b/mysql-test/suite/versioning/wait_system_clock.inc
@@ -0,0 +1,10 @@
+#
+# windows has a rather low-resolution system clock
+# wait until the event from the past will actually be in the past
+#
+if (`select @@version_compile_os in ("win32","win64","windows")`)
+{
+  let $_past=`select max(row_start) from t1`;
+  --let $wait_condition=select TIMESTAMP'$_past' < sysdate(6)
+  --source include/wait_condition.inc
+}