Updated tests from Lars Review

BitKeeper/deleted/.del-rpl_row_view.test~91ced6f754fb06a7:
  Delete: mysql-test/t/rpl_row_view.test
BitKeeper/deleted/.del-rpl_row_view.result~7ec7f00e6d6beca9:
  Delete: mysql-test/r/rpl_row_view.result
mysql-test/t/rpl_view.test:
  Updated to work for both SBR and RBR per lars review comments
mysql-test/r/rpl_view.result:
  Updated results file
mysql-test/t/rpl_timezone-master.opt:
  Rename: mysql-test/t/rpl_stm_timezone-master.opt -> mysql-test/t/rpl_timezone-master.opt
mysql-test/t/rpl_timezone-slave.opt:
  Rename: mysql-test/t/rpl_stm_timezone-slave.opt -> mysql-test/t/rpl_timezone-slave.opt
BitKeeper/deleted/.del-rpl_row_timezone-master.opt~59152d4b828ae88d:
  Delete: mysql-test/t/rpl_row_timezone-master.opt
BitKeeper/deleted/.del-rpl_row_timezone-slave.opt~6e899f3565026efd:
  Delete: mysql-test/t/rpl_row_timezone-slave.opt
BitKeeper/deleted/.del-rpl_row_timezone.test~eb6bbf4edaa18f2d:
  Delete: mysql-test/t/rpl_row_timezone.test
BitKeeper/deleted/.del-rpl_row_timezone.result~ea5c5977bb4da1cf:
  Delete: mysql-test/r/rpl_row_timezone.result
mysql-test/r/rpl_timezone.result:
  Updated results file
mysql-test/t/rpl_timezone.test:
  Remove comment
mysql-test/t/rpl_rewrt_db-slave.opt:
  Rename: mysql-test/t/rpl_stm_rewrt_db-slave.opt -> mysql-test/t/rpl_rewrt_db-slave.opt
mysql-test/t/rpl_rewrt_db.test:
  Rename: mysql-test/t/rpl_stm_rewrt_db.test -> mysql-test/t/rpl_rewrt_db.test
mysql-test/r/rpl_rewrt_db.result:
  Rename: mysql-test/r/rpl_stm_rewrt_db.result -> mysql-test/r/rpl_rewrt_db.result
BitKeeper/deleted/.del-rpl_row_rewrt_db-slave.opt~d63094f08f0f222c:
  Delete: mysql-test/t/rpl_row_rewrt_db-slave.opt
BitKeeper/deleted/.del-rpl_row_rewrt_db.test~2aa70363e3b25660:
  Delete: mysql-test/t/rpl_row_rewrt_db.test
BitKeeper/deleted/.del-rpl_row_rewrt_db.result~a1f2f21a8d2ed591:
  Delete: mysql-test/r/rpl_row_rewrt_db.result
mysql-test/t/rpl_loaddata_m-master.opt:
  Rename: mysql-test/t/rpl_stm_loaddata_m-master.opt -> mysql-test/t/rpl_loaddata_m-master.opt
mysql-test/t/rpl_loaddata_m.test:
  Updated test to work with both SBR and RBR. RBR show bug. Bug# 15942. Test will be added to disable.def until bug corrected
mysql-test/r/rpl_loaddata_m.result:
  new results file for test case
BitKeeper/deleted/.del-rpl_stm_err_ignoredtable.test~bfe9b63deec27fb2:
  Delete: mysql-test/t/rpl_stm_err_ignoredtable.test
mysql-test/t/rpl_err_ignoredtable-slave.opt:
  Rename: mysql-test/t/rpl_stm_err_ignoredtable-slave.opt -> mysql-test/t/rpl_err_ignoredtable-slave.opt
mysql-test/t/rpl_err_ignoredtable.test:
  Updated test to work with both SBR and RBR
mysql-test/r/rpl_err_ignoredtable.result:
  Updated results file
mysql-test/t/rpl_user_variables.test:
  Works with both SBR and RBR
mysql-test/r/rpl_user_variables.result:
  Rename: mysql-test/r/rpl_stm_user_variables.result -> mysql-test/r/rpl_user_variables.result
BitKeeper/deleted/.del-rpl_row_user_variables.result~f7e7536de1d8b8b0:
  Delete: mysql-test/r/rpl_row_user_variables.result
BitKeeper/deleted/.del-rpl_stm_user_variables.test~84f68bdef965db77:
  Delete: mysql-test/t/rpl_stm_user_variables.test
BitKeeper/deleted/.del-rpl_row_user_variables.test~cca11b4f4d044a26:
  Delete: mysql-test/t/rpl_row_user_variables.test
mysql-test/t/rpl_row_log.test:
  Updated comment to correct statement
mysql-test/t/disabled.def:
  Updated with Bug# 15963
mysql-test/t/rpl_ddl.test:
  Updated to work with SBR and RBR
mysql-test/r/rpl_ddl.result:
  Updated results
BitKeeper/deleted/.del-rpl_row_ddl.test~d1339fea669fc00a:
  Delete: mysql-test/t/rpl_row_ddl.test
BitKeeper/deleted/.del-rpl_row_ddl.result~ce73af252273e6bc:
  Delete: mysql-test/r/rpl_row_ddl.result

1 files changed, 105 insertions, 0 deletions

diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/r/rpl_timezone.result
new file mode 100644
index 00000000000..9c45997cbf6
--- /dev/null
+++ b/mysql-test/r/rpl_timezone.result
@@ -0,0 +1,105 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+set timestamp=100000000;
+create table t1 (t timestamp, n int not null auto_increment, PRIMARY KEY(n));
+create table t2 (t char(32), n int not null auto_increment, PRIMARY KEY(n));
+select @@time_zone;
+@@time_zone
+Japan
+select @@time_zone;
+@@time_zone
+Europe/Moscow
+insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL);
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
+select * from t1;
+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;
+t	n
+2005-01-01 06:00:00	1
+2005-06-11 14:39:02	2
+2004-01-01 06:00:00	3
+2004-06-11 14:39:02	4
+delete from t1;
+set time_zone='Europe/Moscow';
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
+select * from t1;
+t	n
+2004-01-01 00:00:00	5
+2004-06-11 09:39:02	6
+set time_zone='Europe/Moscow';
+select * from t1;
+t	n
+2004-01-01 00:00:00	5
+2004-06-11 09:39:02	6
+delete from t1;
+set time_zone='UTC';
+load data infile '../../std_data/rpl_timezone2.dat' into table t1;
+Warnings:
+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;
+t	n
+0000-00-00 00:00:00	7
+0000-00-00 00:00:00	8
+set time_zone='UTC';
+select * from t1;
+t	n
+0000-00-00 00:00:00	7
+0000-00-00 00:00:00	8
+set time_zone='Europe/Moscow';
+set time_zone='Europe/Moscow';
+delete from t1;
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
+set time_zone='MET';
+insert into t2 (select * from t1);
+select * from t1;
+t	n
+2003-12-31 22:00:00	9
+2004-06-11 07:39:02	10
+select * from t2;
+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;
+t	n
+2001-09-09 23:46:40	11
+2001-09-09	12
+23:46:40	13
+delete from t2;
+insert into t2 values (from_unixtime(1000000000),NULL),
+(unix_timestamp('2001-09-09 03:46:40'),NULL);
+select * from t2;
+t	n
+2001-09-09 03:46:40	14
+1000000000	15
+select * from t2;
+t	n
+2001-09-09 03:46:40	14
+1000000000	15
+set global time_zone='MET';
+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;
+t	n
+2003-12-31 23:00:00	16
+2005-01-01 08:00:00	17
+select * from t2;
+t	n
+2003-12-31 23:00:00	16
+2005-01-01 08:00:00	17
+drop table t1, t2;