From 8adce14f700e4f4aa0495bc15ee163c528d78ffe Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jan 2006 00:45:23 +0100 Subject: Updated test cases for testing Cluster Replication using the rpl* test cases mysql-test/t/rpl_row_USER.test: Changed test to allow ndbcluster engine to be use mysql-test/r/rpl_row_USER.result: Changed test to allow ndbcluster engine to be use mysql-test/t/rpl_bit.test: Changed test to allow ndbcluster engine to be use mysql-test/r/rpl_bit.result: Changed test to allow ndbcluster engine to be use mysql-test/r/rpl_log_pos.result: Changed test to allow ndbcluster engine to be use mysql-test/t/rpl_log_pos.test: Changed test to allow ndbcluster engine to be use mysql-test/r/not_ndb_table.require: Needed a way to tell some test case to skip running it default-storage-engine was set to ndb mysql-test/t/rpl_000015.test: Updated test case mysql-test/r/rpl_000015.result: Updated test case mysql-test/t/rpl_loaddata2.test: Updated test case mysql-test/r/rpl_loaddata2.result: Updated test case mysql-test/t/rpl_loadfile.test: Updated test case mysql-test/r/rpl_loadfile.result: Updated test case mysql-test/include/not_ndb_table.inc: added comment header. mysql-test/t/rpl_foreign_key_innodb.test: Skip test when NDB is forced mysql-test/t/rpl_optimize.test: Skip test when NDB is forced mysql-test/t/rpl000005.test: updated test case mysql-test/r/rpl000005.result: updated test case mysql-test/t/rpl_user_variables.test: Test clean up for CRBR testing mysql-test/r/rpl_user_variables.result: Test clean up for CRBR testing mysql-test/r/rpl_timezone.result: Test clean up for CRBR testing mysql-test/t/rpl_timezone.test: Test clean up for CRBR testing --- mysql-test/r/rpl_timezone.result | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'mysql-test/r/rpl_timezone.result') diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/r/rpl_timezone.result index 9c45997cbf6..78e76d168f0 100644 --- a/mysql-test/r/rpl_timezone.result +++ b/mysql-test/r/rpl_timezone.result @@ -15,13 +15,13 @@ select @@time_zone; Europe/Moscow insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL); insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); -select * from t1; +SELECT * FROM t1 ORDER BY n; t n 2005-01-01 00:00:00 1 2005-06-11 09:39:02 2 2004-01-01 00:00:00 3 2004-06-11 09:39:02 4 -select * from t1; +SELECT * FROM t1 ORDER BY n; t n 2005-01-01 06:00:00 1 2005-06-11 14:39:02 2 @@ -30,12 +30,12 @@ t n delete from t1; set time_zone='Europe/Moscow'; insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); -select * from t1; +SELECT * FROM t1 ORDER BY n; t n 2004-01-01 00:00:00 5 2004-06-11 09:39:02 6 set time_zone='Europe/Moscow'; -select * from t1; +SELECT * FROM t1 ORDER BY n; t n 2004-01-01 00:00:00 5 2004-06-11 09:39:02 6 @@ -47,12 +47,12 @@ Warning 1265 Data truncated for column 't' at row 1 Warning 1261 Row 1 doesn't contain data for all columns Warning 1265 Data truncated for column 't' at row 2 Warning 1261 Row 2 doesn't contain data for all columns -select * from t1; +SELECT * FROM t1 ORDER BY n; t n 0000-00-00 00:00:00 7 0000-00-00 00:00:00 8 set time_zone='UTC'; -select * from t1; +SELECT * FROM t1 ORDER BY n; t n 0000-00-00 00:00:00 7 0000-00-00 00:00:00 8 @@ -62,18 +62,18 @@ delete from t1; insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL); set time_zone='MET'; insert into t2 (select * from t1); -select * from t1; +SELECT * FROM t1 ORDER BY n; t n 2003-12-31 22:00:00 9 2004-06-11 07:39:02 10 -select * from t2; +SELECT * FROM t2 ORDER BY n; t n 2003-12-31 22:00:00 9 2004-06-11 07:39:02 10 delete from t2; set timestamp=1000072000; insert into t2 values (current_timestamp,NULL), (current_date,NULL), (current_time,NULL); -select * from t2; +SELECT * FROM t2 ORDER BY n; t n 2001-09-09 23:46:40 11 2001-09-09 12 @@ -81,11 +81,11 @@ t n delete from t2; insert into t2 values (from_unixtime(1000000000),NULL), (unix_timestamp('2001-09-09 03:46:40'),NULL); -select * from t2; +SELECT * FROM t2 ORDER BY n; t n 2001-09-09 03:46:40 14 1000000000 15 -select * from t2; +SELECT * FROM t2 ORDER BY n; t n 2001-09-09 03:46:40 14 1000000000 15 @@ -94,11 +94,11 @@ delete from t2; set time_zone='UTC'; insert into t2 values(convert_tz('2004-01-01 00:00:00','MET',@@time_zone),NULL); insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'),NULL); -select * from t2; +SELECT * FROM t2 ORDER BY n; t n 2003-12-31 23:00:00 16 2005-01-01 08:00:00 17 -select * from t2; +SELECT * FROM t2 ORDER BY n; t n 2003-12-31 23:00:00 16 2005-01-01 08:00:00 17 -- cgit v1.2.1