From: Vinay Fisrekar Date: October 12 2011 4:40am Subject: bzr commit into mysql-5.1 branch (vinay.fisrekar:3624) Bug#11766457 List-Archive: http://lists.mysql.com/commits/141439 X-Bug: 11766457 Message-Id: <201110120442.p9C4g11u002623@vinayf-laptop> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0776327612==" --===============0776327612== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/vinayf/repo/branches/mysql-5.1/ based on revid:bjorn.munch@stripped 3624 Vinay Fisrekar 2011-10-12 bug#11766457 - adjusting/modifying the the tests as tests were failing if system time zone is set differently. modified: mysql-test/suite/engines/funcs/r/de_calendar_range.result 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/in_multicolumn_number_pk_constraint_duplicate_update.result mysql-test/suite/engines/funcs/r/up_calendar_range.result mysql-test/suite/engines/funcs/t/de_calendar_range.test 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/in_multicolumn_number_pk_constraint_duplicate_update.test mysql-test/suite/engines/funcs/t/up_calendar_range.test === modified file 'mysql-test/suite/engines/funcs/r/de_calendar_range.result' --- a/mysql-test/suite/engines/funcs/r/de_calendar_range.result 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/r/de_calendar_range.result 2011-10-12 04:40:52 +0000 @@ -1,4 +1,5 @@ DROP TABLE IF EXISTS t1,t2,t3; +SET TIME_ZONE="+03:00"; CREATE TABLE t1(c1 DATE NOT NULL PRIMARY KEY); SET TIMESTAMP=1171346973; INSERT INTO t1 (c1) VALUES(NOW()); @@ -89,3 +90,4 @@ c1 2007-02-16 12:10:34 2007-02-17 13:10:34 DROP TABLE t1; +SET TIME_ZONE= @@global.time_zone; === 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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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/in_multicolumn_number_pk_constraint_duplicate_update.result' --- a/mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result 2011-10-12 04:40:52 +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/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-10-12 04:40:52 +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/de_calendar_range.test' --- a/mysql-test/suite/engines/funcs/t/de_calendar_range.test 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/t/de_calendar_range.test 2011-10-12 04:40:52 +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 PRIMARY KEY); SET TIMESTAMP=1171346973; # 2007-02-13 15:09:33 INSERT INTO t1 (c1) VALUES(NOW()); @@ -45,4 +47,5 @@ SELECT * FROM t1 ORDER BY c1; DELETE FROM t1 WHERE c1 <= ADDTIME(NOW(),'2 02:01:01'); SELECT * FROM t1 ORDER BY c1; DROP TABLE t1; - +# Restore timezone to default +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-10-12 04:40:52 +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,6 @@ 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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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,6 @@ 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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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,6 @@ 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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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-10-12 04:40:52 +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,6 @@ 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/in_multicolumn_number_pk_constraint_duplicate_update.test' --- a/mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_duplicate_update.test 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_duplicate_update.test 2011-10-12 04:40:52 +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,6 @@ 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/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-10-12 04:40:52 +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; --===============0776327612== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/vinay.fisrekar@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vinay.fisrekar@stripped\ # de7dg3pof0l02c1o # target_branch: file:///home/vinayf/repo/branches/mysql-5.1/ # testament_sha1: 6cca1681351d2591ca7574e00c3a5579eea52817 # timestamp: 2011-10-12 10:11:00 +0530 # base_revision_id: bjorn.munch@stripped\ # i9uypx6tp4xz0cs5 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZuWLScAFbXfgAAQWGv//1sj nRC////wYBE99QFUoAAAAAAAABIUAABQAEgoFAUOaYmABMAEwAAmAAJhzTEwAJgAmAAEwABMOaYm ABMAEwAAmAAJghSpNPRJtTR6aKPUyemoYEegQwTEMOaYmABMAEwAAmAAJgVRJkACAglPAqfpojUx Eyb0p6aTPU6FHlQ5V4HCDUUTfjrAICRPf0b+myzZ4rjl5tpNfKrC9fjfaaY35sc4C9e1ImYTMRR3 DEtCxv5PmahmoqIKqSAIFYERmgYqa37U31rSb6KSuyC1kpYqMKLrBNrat655326A/zBiETBEhMIf t/tC9fntUGAcTfIawUpfO044AsFtbJlfN8oEpuuCYilKUvLlMCsUULLi6f7/IGYf+esREfqB/D/H sF/+0B/bH/j/7W8PUG0g/YJgM/2vpcBTH+9A1CQWn1jzPdPyu8Un397Wun19r4raKPlfdW1LqVzX mmaZszNWZqzZm3Nubc02coAbNsQVVRFRKUpmMOwPjllr+0q/2rhxRdbKtdm9K66ZSzo+KokAG7FE DsVeF4+fpADOYeceQf0BuPcKhRKKooqRL1iII5BFAf3kDkgcxfjeD4fG3nDIGQgsiBk4vLLUSUtU UcQAbgA5xXfHHpxg8oe/mGmUIIrJ6yCk0knm568UycxAw/kD0jCIBL4GiXyXVrEQI+SkIGmbS58V eOGTwQKKXJxcAJXrmkav0B1BF2LRQgayyJFrpZN1CBpGquTRus2IC9mDhcvaMCjqo3MVm65VUlcY NkIvkTEY/BKgMyyzU0SzNn7xmzWfHv0uT0lTfVVmcHUgf4B1g5hKc/KERjNUoM9M3XCl6mNGelWf HGYDSKyQOLP672bL/Rf3NAfnzfEQN9oiBOePGKySvZP59OmO97A3yIFzJmtQ59GzDv5zicOfGGbK rqmudPWZzy8WaXKYZuuryCeN0C6WyNWNo4bqRq9O2O2WkQ8b2dk5eFzaXjGF+aX+ekAc1ZvnLo36 RHh7eWrwD1UbJKPVLR0bvV3d165r22dmTw5IHyBGTLDqDnfebE52gwmIpRXjp0YQgYd35xECLo8a ogUNCDjwx64bqUdWJvvuyX6NTNdovLdLlZKOGKp66m7Wt5KhoYqOrHBZi2x1arjZvUzZLYrHGXVY 9MqRA/5R6nVsy2YKqOqIGzqwcL0uGC9eq60eAR3O5ri7hqkJjtrZN6m+u1V/VowYL0eBpdla1y0g MIuZVNUt2bFq5bsEswb1S1eHRRdoy50jPO9Zy5MV9mCnDqsqaMm4xZVi2RRu3aMnHRgCKOjVUlkD W9s7PcFW7RZq1ZAiz6AuccUcvqQOWGcBNplaq7vcCPMzcQLkDqs6OEplcrhedQXL5R62W5mck6OK sHkmzVf6JuIHcnWMrq8Zzyzjkrhzip1lk5l5dG6PR6A9Fxu5HCW6S5kcqQuNEo4Xuh0smLGC9hxE 94DFZGC9w7s25Vmq6F5uk3SqoYrlijgHxj9wRXSbbXbRtc8hTovX84xddLrR8vPp0d/CWG89X3BK x0ONjizNuz6KEDGYvPBgYLnlc68LikVMfRp9QR2x0ePaJU2br+XBZZXdub5Ajdg9l5Zkulm4deFl 7FoobJvQxXt6tC5cnsy6ufPDRV0fpsTVm2XdL7Oq7jGZ5pctRV6Bx5hzRu6MHDs50nZj2dzlLFc4 dOnM0uVfTp01Kgi7xQF17Feko8NXZ1S9uqO+RidTu0ddL3OLZfkzZNtFlEqMmi62ajq9O6BmDoWZ qFzqas1mzdyowPChkXM1Wy8zcrljViuSudl/vHbWZ7I0xqVc0UegdM8ARsDHhRlDltjjmyVYs8Na UzXuSiitZnB3zZlbJr5oowLF1uJpFWTqWXK21mmzjldXHrM0ur0aNt72Bi3dGDlq5YGrod3iUDte 440VbPB1aJOpWJdm7hi6uqVmaXDqQLuqzBqxpr0mKpnXetW1YzZZMWK8BidOnC5tru2q75qNmLBZ Zc04ZJYr46u7HsvdEsHVR1lO5Rso1cGl8zm7KtUlUtXJhXhSlzI6FHLpF9+EUptuk7ds3LhjjM9U rlGjso63d73Ru7rjoT1VjQtizjnnVe4N1y9y2bNmqE0muXSiqrv5iLu3e9S69zzR0buy5nBhjm1U u14V6qLXk8ratHNFClXDhpgvdFzw41z7rAjFxs4VWZLFjs7L12DuXumJrqzXqM3j+M6osYtmpl5T w2brKqGLhg3S8r2a5cxOpsoszfaKgrjOEohSVIzo2mI00m2tIC0gtcgTfNoDCIBppcfBR6QAk86A dH9AAdzrjWpSSTRTRQUQO/KwcMIYYYYGESlMBMz9gUx/0B/LIH/wH3B+sTCBlsiImUwJkJ2vD9gK /3A/sBX/QD+wH/4D/AFYiMwJDMCQPx/QDZFQNSO6IR/NRMxFYA+UXUTEzURVUdvUhSGCxIJVoKRA oEYIgr2sB8SoiV5EPj8z5vw+p91s0C5IPm/RZesuZvqqqXPwyLNUtbLj7sGjBH5vxq/CiWDAvXsG a4/nZmZMjRs1enYQVwi98JOhyzbs1nCzzpEDaSIvB2QiH6eoPW0I1B7bzCBqgOsQHP4QXEaEU2DR ED+Xp6y7Ox1XVweiqr4Giyq5y9y4uSqvZlz0BgXqnq1M3s6NWDVmbMdH8fnVZo2vUYtnDRi3YvR/ UGCzRHRRe0aqLM3gs0dVHZivL3Tpis5bsFFofVEQV66/UiW6tbuGhA4sZnHJxtesqo8MWa5UsxaL 3DBeau6y5LZRjuaNWh0VZOUIh8SNi5qyZu63KVllXle3YKuGD/vBw0fIPc36TIglCH9RCPPUQ7Rt A8ur0v9HVz3S9PD1p9M2y90mzBmyNiqzF04eiy2K56u6BVwgbvKtmD0SwaQDBRk3YoD5EYOXa9Oi rqrGq5/Qgfz9EyyfQMcXxUcPK90aEDiAy+eOYI+YI71/gR9v6A8/kuCgMPXer6vs91yi5c8AAPIA h7A4njiLMksorIzNQAd4fJ7fb6FypqtbTGYrt7et275r0pe7Z8Hs+bMxJkiJfUxarmq5oyavkQOj ZszMlWrq1bPUH4B7A6ayHrIU9iOESiPUHmIF5GAL2Z5KPfw5ar3K8wWe4el71MVGP38MlT28zf3Y 4MG6oedkQPjzpOX/FHfyhEMED/yJQM/a3oDu/fT8/qPv/lhiE//0NZhcoD/UMaRAugFoC/Zy7ECj w93u4f5Psvfl+Vn0fV+T5vZsxYsnGb6slN8k3LKscbmB9W6WLVkvZvpLZeuUSufiwYs1WDB1cJM0 qrOICqzTavRulfc7oGD/AP5A6A/KED8qO7C5+k4kCSO5B/uCw2hD5ID4stYIKes/rHz/MidaoQr9 4BNOeIgVHYEc2iAGv+OumqqqpaqqqlqqqqqqqqRqn/vQiB6lA73N8tvII/WPy4adDA7IiONYgf99 IQP0vBv9Y8ez9UI90QPWIH7wHUH3IFT4A0iBpcfEGYgkDBCIZkUp2+f+oJCMZQh+qEPfOghH0egT ZHUEaaAkF4PaiB4uvQh9L74DsDwhD7Rd9gZ7iM9zeYAIANwDrEKIiIpGoiqZpRCFEcAoiBrvFIgY oC9AUKkelkRHYWEL70EgkSTEoG6KR7/xdwTAO4I8A35r6ED1QQdwTnED+qAoIXoeBBpEEfMbR+8f uGlo65gjyDiseEenMglAoRWAw7oRcR/MgZ0v/KMAfOA7oiNX6BoB1KBqVEppFMUR7oL+vdB18QB1 kj0DNEDGAtKB/11DAOPtdAX55o1p11FQtBJbjWnvExvfrpMPnJEagyiBIMED5d4CqIGMD4ETd5xi BcFSIlApn8gb1gbhcG6IeQlGP/QMKIRFALrg8EkXSRdxUM0BjK3W5CHatgbUBOOdwKRBFI/WKERS Ur5QOnX8kRHt89wxB8EIYo3ImP4Cvk4FGA9wHTs7Xa6GiAQAb/R1KO/3BHyiBdAPxHTy60hAp2+M d4Dr/CPgCMPaA31B6AnYEf+i7kinChITcsWk4A== --===============0776327612==--