Ok to push.
On Thursday 27 January 2011 04:56 PM, Vinay Fisrekar wrote:
> #At file:///home/vinayf/WORK/bug_calender/code/mysql-5.1/ based on
> revid:horst.hunger@stripped
>
> 3571 Vinay Fisrekar 2011-01-27
> BUG#59570 in_multicolumn_calendar_unique_constraint_ignore fails with wrong
> TZ
>
> Added correct timezone setting to match result.
>
> modified:
>
> mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result
>
> mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result
> mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result
> mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result
>
> mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result
> mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result
> mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result
>
> mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result
>
> mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result
>
> mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result
>
> mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result
>
> mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result
>
> mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result
> mysql-test/suite/engines/funcs/r/up_calendar_range.result
>
> mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test
>
> mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test
> mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test
> mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test
>
> mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test
> mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test
> mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test
>
> mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test
>
> mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test
>
> mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test
>
> mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test
>
> mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test
>
> mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test
> mysql-test/suite/engines/funcs/t/up_calendar_range.test
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NULL, c3 DATE NULL, PRIMARY KEY(c1),
> UNIQUE(c2));
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'4 04:01:01'),NOW());
> @@ -128,3 +129,4 @@ c1 c2 c3
> 2003 2001 2000
> 2004 2000 2000
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL PRIMARY KEY);
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -82,3 +83,4 @@ c1
> 2000
> 2011
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL PRIMARY KEY);
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -87,3 +88,4 @@ c1
> 1999
> 2000
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL PRIMARY KEY);
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -87,3 +88,4 @@ c1
> 1999
> 2000
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL UNIQUE);
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -82,3 +83,4 @@ c1
> 2000
> 2011
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL UNIQUE);
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -87,3 +88,4 @@ c1
> 1999
> 2000
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL UNIQUE);
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -81,3 +82,4 @@ c1
> 1999
> 2000
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NOT NULL, c3 DATE NOT NULL, PRIMARY
> KEY(c1,c2,c3));
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -144,3 +145,4 @@ c1 c2 c3
> 2011 2011 2000
> 2011 2011 2011
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NOT NULL, c3 DATE NOT NULL, PRIMARY
> KEY(c1,c2,c3));
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -147,3 +148,4 @@ c1 c2 c3
> 1999 2000 1999
> 2000 1999 1999
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NOT NULL, c3 DATE NOT NULL, PRIMARY
> KEY(c1,c2,c3));
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -147,3 +148,4 @@ c1 c2 c3
> 1999 2000 1999
> 2000 1999 1999
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL, c2 DATE NULL, c3 DATE NULL, UNIQUE(c1,c2,c3));
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -144,3 +145,4 @@ c1 c2 c3
> 2011 2011 2000
> 2011 2011 2011
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL, c2 DATE NULL, c3 DATE NULL, UNIQUE(c1,c2,c3));
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -147,3 +148,4 @@ c1 c2 c3
> 1999 2000 1999
> 2000 1999 1999
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result'
> ---
> a/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result 2011-01-27
> 11:26:48 +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL, c2 DATE NULL, c3 DATE NULL, UNIQUE(c1,c2,c3));
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -139,3 +140,4 @@ c1 c2 c3
> 1999 2000 1999
> 2000 1999 1999
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file 'mysql-test/suite/engines/funcs/r/up_calendar_range.result'
> --- a/mysql-test/suite/engines/funcs/r/up_calendar_range.result 2010-03-18 06:42:07
> +0000
> +++ b/mysql-test/suite/engines/funcs/r/up_calendar_range.result 2011-01-27 11:26:48
> +0000
> @@ -1,4 +1,5 @@
> DROP TABLE IF EXISTS t1,t2,t3;
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL);
> SET TIMESTAMP=1171346973;
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -104,3 +105,4 @@ c1
> 2007-02-13 09:09:33
> 2007-02-14 10:10:34
> DROP TABLE t1;
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NULL, c3 DATE NULL, PRIMARY KEY(c1),
> UNIQUE(c2));
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),ADDTIME(NOW(),'4 04:01:01'),NOW());
> @@ -70,4 +72,5 @@ INSERT INTO t1 (c1,c2,c3) VALUES(2000,20
> --sorted_result
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL PRIMARY KEY);
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -61,4 +63,5 @@ INSERT INTO t1 (c1) VALUES(1999) ON DUPL
> --sorted_result
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL PRIMARY KEY);
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -61,4 +63,5 @@ INSERT INTO t1 (c1) VALUES(2000);
> INSERT INTO t1 (c1) VALUES(1999);
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL PRIMARY KEY);
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -61,4 +63,5 @@ INSERT INTO t1 (c1) VALUES(2000);
> INSERT INTO t1 (c1) VALUES(1999);
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL UNIQUE);
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -61,4 +63,5 @@ INSERT INTO t1 (c1) VALUES(1999) ON DUPL
> --sorted_result
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL UNIQUE);
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -61,4 +63,5 @@ INSERT INTO t1 (c1) VALUES(2000);
> INSERT INTO t1 (c1) VALUES(1999);
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL UNIQUE);
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -53,4 +55,5 @@ INSERT INTO t1 (c1) VALUES(2000);
> INSERT IGNORE INTO t1 (c1) VALUES(1999);
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NOT NULL, c3 DATE NOT NULL, PRIMARY
> KEY(c1,c2,c3));
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -85,4 +87,5 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,19
> --sorted_result
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NOT NULL, c3 DATE NOT NULL, PRIMARY
> KEY(c1,c2,c3));
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -93,4 +95,5 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,19
> INSERT INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL, c2 DATE NOT NULL, c3 DATE NOT NULL, PRIMARY
> KEY(c1,c2,c3));
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -93,4 +95,5 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,19
> INSERT INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL, c2 DATE NULL, c3 DATE NULL, UNIQUE(c1,c2,c3));
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -85,4 +87,5 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,19
> --sorted_result
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL, c2 DATE NULL, c3 DATE NULL, UNIQUE(c1,c2,c3));
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -93,4 +95,5 @@ INSERT INTO t1 (c1,c2,c3) VALUES(1999,19
> INSERT INTO t1 (c1,c2,c3) VALUES(1999,1999,2000);
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file
> 'mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test'
> ---
> a/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test 2010-03-18
> 06:42:07 +0000
> +++
> b/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test 2011-01-27
> 11:26:48 +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NULL, c2 DATE NULL, c3 DATE NULL, UNIQUE(c1,c2,c3));
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1,c2,c3) VALUES(NOW(),NOW(),NOW());
> @@ -85,4 +87,5 @@ INSERT IGNORE INTO t1 (c1,c2,c3) VALUES(
> --sorted_result
> SELECT * FROM t1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
> === modified file 'mysql-test/suite/engines/funcs/t/up_calendar_range.test'
> --- a/mysql-test/suite/engines/funcs/t/up_calendar_range.test 2010-03-18 06:42:07
> +0000
> +++ b/mysql-test/suite/engines/funcs/t/up_calendar_range.test 2011-01-27 11:26:48
> +0000
> @@ -1,6 +1,8 @@
> --disable_warnings
> DROP TABLE IF EXISTS t1,t2,t3;
> --enable_warnings
> +# Set Correct timezone to match result
> +set time_zone="+03:00";
> CREATE TABLE t1(c1 DATE NOT NULL);
> SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33
> INSERT INTO t1 (c1) VALUES(NOW());
> @@ -53,4 +55,5 @@ UPDATE t1 SET c1 = NOW() WHERE c1>= ADD
> --sorted_result
> SELECT * FROM t1 ORDER BY c1;
> DROP TABLE t1;
> -
> +# Restore timezone to default
> +set time_zone= @@global.time_zone;
>
>
>
>
