From d1e4a1f1719a662166fb835ac018cd097cabd4bc Mon Sep 17 00:00:00 2001
From: unknown <guilhem@mysql.com>
Date: Wed, 17 Nov 2004 17:06:24 +0100
Subject: [PATCH] time independent test

mysql-test/r/ctype_ucs.result:
  result update
mysql-test/t/ctype_ucs.test:
  time independent
---
 mysql-test/r/ctype_ucs.result | 3 ++-
 mysql-test/t/ctype_ucs.test   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index 56830153fd0..6394bc28c6e 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -487,6 +487,7 @@ prepare stmt1 from @str2;
 execute stmt1 using @ivar;
 ?
 1234
+SET TIMESTAMP=10000;
 create table t2 (c char(30)) charset=ucs2;
 set @v=convert('abc' using ucs2);
 reset master;
@@ -498,6 +499,6 @@ master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;
 use test;
-SET TIMESTAMP=1100684975;
+SET TIMESTAMP=10000;
 insert into t2 values (@v);
 drop table t2;
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index 909638042c2..0b8678ef59b 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -327,6 +327,7 @@ execute stmt1 using @ivar;
 #
 # Check correct binlogging of UCS2 user variables (BUG#3875)
 #
+SET TIMESTAMP=10000;
 create table t2 (c char(30)) charset=ucs2;
 set @v=convert('abc' using ucs2);
 reset master;