List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:December 23 2005 1:45pm
Subject:bk commit into 5.1 tree (jmiller:1.1984)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1984 05/12/23 14:45:02 jmiller@stripped +36 -0
  Updated tests from Lars Review

  BitKeeper/deleted/.del-rpl_row_ddl.result~ce73af252273e6bc
    1.2 05/12/23 14:27:23 jmiller@stripped +0 -0
    Delete: mysql-test/r/rpl_row_ddl.result

  BitKeeper/deleted/.del-rpl_row_ddl.test~d1339fea669fc00a
    1.2 05/12/23 14:27:11 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_ddl.test

  mysql-test/r/rpl_ddl.result
    1.13 05/12/23 14:26:56 jmiller@stripped +2 -2
    Updated results

  mysql-test/t/rpl_ddl.test
    1.3 05/12/23 14:26:33 jmiller@stripped +0 -1
    Updated to work with SBR and RBR

  mysql-test/t/disabled.def
    1.29 05/12/23 14:25:43 jmiller@stripped +1 -0
    Updated with Bug# 15963

  mysql-test/r/rpl_ddl.result
    1.12 05/12/23 14:16:22 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_ddl_result -> mysql-test/r/rpl_ddl.result

  mysql-test/r/rpl_ddl_result
    1.11 05/12/23 14:14:18 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_ddl.result -> mysql-test/r/rpl_ddl_result

  mysql-test/t/rpl_ddl.test
    1.2 05/12/23 14:13:56 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_ddl.test -> mysql-test/t/rpl_ddl.test

  mysql-test/t/rpl_row_log.test
    1.2 05/12/23 13:52:45 jmiller@stripped +1 -1
    Updated comment to correct statement

  BitKeeper/deleted/.del-rpl_row_user_variables.test~cca11b4f4d044a26
    1.2 05/12/23 13:25:19 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_user_variables.test

  BitKeeper/deleted/.del-rpl_stm_user_variables.test~84f68bdef965db77
    1.2 05/12/23 13:25:09 jmiller@stripped +1 -1
    Delete: mysql-test/t/rpl_stm_user_variables.test

  BitKeeper/deleted/.del-rpl_row_user_variables.result~f7e7536de1d8b8b0
    1.2 05/12/23 13:24:53 jmiller@stripped +0 -0
    Delete: mysql-test/r/rpl_row_user_variables.result

  mysql-test/r/rpl_user_variables.result
    1.16 05/12/23 13:24:37 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_user_variables.result -> mysql-test/r/rpl_user_variables.result

  mysql-test/t/rpl_user_variables.test
    1.15 05/12/23 13:23:55 jmiller@stripped +0 -1
    Works with both SBR and RBR

  mysql-test/t/rpl_user_variables.test
    1.14 05/12/23 13:23:12 jmiller@stripped +0 -0
    Rename: mysql-test/extra/rpl_tests/rpl_user_variables.test -> mysql-test/t/rpl_user_variables.test

  mysql-test/r/rpl_err_ignoredtable.result
    1.23 05/12/22 23:00:34 jmiller@stripped +17 -14
    Updated results file

  mysql-test/t/rpl_err_ignoredtable.test
    1.24 05/12/22 22:59:58 jmiller@stripped +11 -9
    Updated test to work with both SBR and RBR

  mysql-test/r/rpl_err_ignoredtable.result
    1.22 05/12/22 22:58:21 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_err_ignoredtable.result -> mysql-test/r/rpl_err_ignoredtable.result

  mysql-test/t/rpl_err_ignoredtable.test
    1.23 05/12/22 22:58:12 jmiller@stripped +0 -0
    Rename: mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test -> mysql-test/t/rpl_err_ignoredtable.test

  mysql-test/t/rpl_err_ignoredtable-slave.opt
    1.7 05/12/22 22:57:18 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_err_ignoredtable-slave.opt -> mysql-test/t/rpl_err_ignoredtable-slave.opt

  BitKeeper/deleted/.del-rpl_stm_err_ignoredtable.test~bfe9b63deec27fb2
    1.2 05/12/22 22:56:45 jmiller@stripped +1 -1
    Delete: mysql-test/t/rpl_stm_err_ignoredtable.test

  mysql-test/t/disabled.def
    1.28 05/12/22 21:57:12 jmiller@stripped +1 -0
    Bug#15942 RBR ignores --binlog_ignore_db

  mysql-test/r/rpl_loaddata_m.result
    1.16 05/12/22 21:55:12 jmiller@stripped +31 -13
    new results file for test case

  mysql-test/t/rpl_loaddata_m.test
    1.15 05/12/22 21:54:08 jmiller@stripped +36 -15
    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
    1.15 05/12/22 20:59:06 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_loaddata_m.result -> mysql-test/r/rpl_loaddata_m.result

  mysql-test/t/rpl_loaddata_m-master.opt
    1.5 05/12/22 20:58:37 jmiller@stripped +0 -0
    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
    1.14 05/12/22 20:57:56 jmiller@stripped +0 -0
    Rename: mysql-test/extra/rpl_tests/rpl_loaddata_m.test -> mysql-test/t/rpl_loaddata_m.test

  BitKeeper/deleted/.del-rpl_row_rewrt_db.result~a1f2f21a8d2ed591
    1.2 05/12/22 20:21:02 jmiller@stripped +0 -0
    Delete: mysql-test/r/rpl_row_rewrt_db.result

  BitKeeper/deleted/.del-rpl_row_rewrt_db.test~2aa70363e3b25660
    1.2 05/12/22 20:20:57 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_rewrt_db.test

  BitKeeper/deleted/.del-rpl_row_rewrt_db-slave.opt~d63094f08f0f222c
    1.2 05/12/22 20:20:57 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_rewrt_db-slave.opt

  mysql-test/r/rpl_rewrt_db.result
    1.7 05/12/22 20:19:25 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_rewrt_db.result -> mysql-test/r/rpl_rewrt_db.result

  mysql-test/t/rpl_rewrt_db.test
    1.6 05/12/22 20:18:56 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_rewrt_db.test -> mysql-test/t/rpl_rewrt_db.test

  mysql-test/t/rpl_rewrt_db-slave.opt
    1.4 05/12/22 20:18:35 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_rewrt_db-slave.opt -> mysql-test/t/rpl_rewrt_db-slave.opt

  mysql-test/t/rpl_timezone.test
    1.12 05/12/22 19:59:25 jmiller@stripped +0 -2
    Remove comment

  mysql-test/t/rpl_timezone.test
    1.11 05/12/22 19:57:41 jmiller@stripped +24 -21
    Updated to work for both SBR and RBR per lars review comments

  mysql-test/r/rpl_timezone.result
    1.15 05/12/22 19:57:01 jmiller@stripped +67 -89
    Updated results file

  BitKeeper/deleted/.del-rpl_row_timezone.result~ea5c5977bb4da1cf
    1.2 05/12/22 19:56:37 jmiller@stripped +0 -0
    Delete: mysql-test/r/rpl_row_timezone.result

  BitKeeper/deleted/.del-rpl_row_timezone.test~eb6bbf4edaa18f2d
    1.2 05/12/22 19:56:31 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_timezone.test

  BitKeeper/deleted/.del-rpl_row_timezone-slave.opt~6e899f3565026efd
    1.2 05/12/22 19:56:30 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_timezone-slave.opt

  BitKeeper/deleted/.del-rpl_row_timezone-master.opt~59152d4b828ae88d
    1.2 05/12/22 19:56:30 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_timezone-master.opt

  mysql-test/t/rpl_timezone-slave.opt
    1.4 05/12/22 19:55:04 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_timezone-slave.opt -> mysql-test/t/rpl_timezone-slave.opt

  mysql-test/t/rpl_timezone-master.opt
    1.3 05/12/22 19:54:45 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_timezone-master.opt -> mysql-test/t/rpl_timezone-master.opt

  mysql-test/r/rpl_timezone.result
    1.14 05/12/22 19:51:02 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_timezone.result -> mysql-test/r/rpl_timezone.result

  mysql-test/t/rpl_timezone.test
    1.10 05/12/22 19:50:28 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_timezone.test -> mysql-test/t/rpl_timezone.test

  mysql-test/r/rpl_view.result
    1.6 05/12/22 19:29:13 jmiller@stripped +0 -11
    Updated results file

  mysql-test/t/rpl_view.test
    1.6 05/12/22 19:28:43 jmiller@stripped +6 -4
    Updated to work for both SBR and RBR per lars review comments

  BitKeeper/deleted/.del-rpl_row_view.result~7ec7f00e6d6beca9
    1.2 05/12/22 19:25:39 jmiller@stripped +0 -0
    Delete: mysql-test/r/rpl_row_view.result

  BitKeeper/deleted/.del-rpl_row_view.test~91ced6f754fb06a7
    1.2 05/12/22 19:25:24 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_view.test

  mysql-test/r/rpl_view.result
    1.5 05/12/22 19:23:33 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_view.result -> mysql-test/r/rpl_view.result

  mysql-test/t/rpl_view.test
    1.5 05/12/22 19:23:06 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_view.test -> mysql-test/t/rpl_view.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.4/mysql-test/r/rpl_stm_view.result	2005-12-22 05:10:57 +01:00
+++ 1.6/mysql-test/r/rpl_view.result	2005-12-22 19:29:13 +01:00
@@ -43,14 +43,3 @@
 select * from v1 order by a;
 ERROR 42S02: Table 'test.v1' doesn't exist
 drop table t1;
-show binlog events limit 1,100;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)
-slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1)
-slave-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a from t1
-slave-bin.000001	#	Query	1	#	use `test`; insert into v1 values (2)
-slave-bin.000001	#	Query	1	#	use `test`; update v1 set a=3 where a=1
-slave-bin.000001	#	Query	1	#	use `test`; delete from v1 where a=2
-slave-bin.000001	#	Query	1	#	use `test`; ALTER ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a as b from t1
-slave-bin.000001	#	Query	1	#	use `test`; drop view v1
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1

--- 1.4/mysql-test/t/rpl_stm_view.test	2005-12-22 05:10:56 +01:00
+++ 1.6/mysql-test/t/rpl_view.test	2005-12-22 19:28:43 +01:00
@@ -1,5 +1,4 @@
 # NYI - row-based cannot use CREATE ... SELECT
---source include/have_binlog_format_statement.inc
 
 source include/master-slave.inc;
 --disable_warnings
@@ -10,7 +9,7 @@
 --enable_warnings
 
 #
-# Check that createion drop of view is replicated, also check replication of
+# Check that creation drop of view is replicated, also check replication of
 # updating of view
 #
 connection master;
@@ -46,5 +45,8 @@
 connection master;
 drop table t1;
 sync_slave_with_master;
---replace_column 2 # 5 #
-show binlog events limit 1,100;
+# Change Author: JBM
+# Change Date: 2005-12-22
+# Change: Commented out binlog events to work with SBR and RBR 
+#--replace_column 2 # 5 #
+# show binlog events limit 1,100;

--- 1.13/mysql-test/r/rpl_stm_timezone.result	2005-12-22 05:10:51 +01:00
+++ 1.15/mysql-test/r/rpl_timezone.result	2005-12-22 19:57:01 +01:00
@@ -5,123 +5,101 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 set timestamp=100000000;
-create table t1 (t timestamp);
-create table t2 (t char(32));
+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'), ('20050611093902');
-set time_zone='UTC';
-insert into t1 values ('20040101000000'), ('20040611093902');
-select * from t1;
-t
-2004-12-31 21:00:00
-2005-06-11 05:39:02
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-set time_zone='UTC';
+insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL);
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
 select * from t1;
-t
-2004-12-31 21:00:00
-2005-06-11 05:39:02
-2004-01-01 00:00:00
-2004-06-11 09:39:02
+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'), ('20040611093902');
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
 select * from t1;
-t
-2004-01-01 00:00:00
-2004-06-11 09:39:02
+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
-2004-01-01 00:00:00
-2004-06-11 09:39:02
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-ROLLBACK;
-use test;
-SET TIMESTAMP=100000000;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
-SET @@session.sql_mode=0;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
-create table t1 (t timestamp);
-SET TIMESTAMP=100000000;
-create table t2 (t char(32));
-SET TIMESTAMP=100000000;
-SET @@session.time_zone='Europe/Moscow';
-insert into t1 values ('20050101000000'), ('20050611093902');
-SET TIMESTAMP=100000000;
-SET @@session.time_zone='UTC';
-insert into t1 values ('20040101000000'), ('20040611093902');
-SET TIMESTAMP=100000000;
-delete from t1;
-SET TIMESTAMP=100000000;
-SET @@session.time_zone='Europe/Moscow';
-insert into t1 values ('20040101000000'), ('20040611093902');
-# End of log file
-ROLLBACK /* added by mysqlbinlog */;
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+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_timezone.dat' into table t1;
-select * from t1;
-t
-2004-01-01 00:00:00
-2004-06-11 09:39:02
+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
-2004-01-01 00:00:00
-2004-06-11 09:39:02
+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'), ('20040611093902');
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
 set time_zone='MET';
-insert into t2 (select t from t1);
+insert into t2 (select * from t1);
 select * from t1;
-t
-2003-12-31 22:00:00
-2004-06-11 07:39:02
-select * from t2;
-t
-2003-12-31 22:00:00
-2004-06-11 07:39:02
+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), (current_date), (current_time);
+insert into t2 values (current_timestamp,NULL), (current_date,NULL), (current_time,NULL);
 select * from t2;
-t
-2001-09-09 23:46:40
-2001-09-09
-23:46:40
+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)),
-(unix_timestamp('2001-09-09 03:46:40'));
+insert into t2 values (from_unixtime(1000000000),NULL),
+(unix_timestamp('2001-09-09 03:46:40'),NULL);
 select * from t2;
-t
-2001-09-09 03:46:40
-1000000000
-select * from t2;
-t
-2001-09-09 03:46:40
-1000000000
+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));
-insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'));
+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
-2003-12-31 23:00:00
-2005-01-01 08:00:00
-select * from t2;
-t
-2003-12-31 23:00:00
-2005-01-01 08:00:00
+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;

--- 1.9/mysql-test/t/rpl_stm_timezone.test	2005-12-22 05:10:53 +01:00
+++ 1.12/mysql-test/t/rpl_timezone.test	2005-12-22 19:59:25 +01:00
@@ -1,6 +1,3 @@
-# TBF - difference in row level logging
--- source include/have_binlog_format_statement.inc
-
 # Test of replication of time zones.
 
 # There is currently some bug possibly in prepared statements (this
@@ -18,24 +15,26 @@
 # Some preparations
 let $VERSION=`select version()`;
 set timestamp=100000000; # for fixed output of mysqlbinlog
-create table t1 (t timestamp);
-create table t2 (t char(32));
+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));
 
 connection slave;
 select @@time_zone;
-
+#set time_zone='UTC';
+#select @@time_zone;
 #
 # Let us check how well replication works when we are saving datetime
 # value in TIMESTAMP field.
 #
 connection master;
 select @@time_zone;
-insert into t1 values ('20050101000000'), ('20050611093902');
-set time_zone='UTC';
-insert into t1 values ('20040101000000'), ('20040611093902');
+#set time_zone='UTC';
+#select @@time_zone;
+insert into t1 values ('20050101000000', NULL), ('20050611093902',NULL);
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
 select * from t1;
 sync_slave_with_master;
-set time_zone='UTC';
+#set time_zone='UTC';
 select * from t1;
 
 # Let us check also that setting of time_zone back to default also works
@@ -43,21 +42,24 @@
 connection master;
 delete from t1;
 set time_zone='Europe/Moscow';
-insert into t1 values ('20040101000000'), ('20040611093902');
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
 select * from t1;
 sync_slave_with_master;
 set time_zone='Europe/Moscow';
 select * from t1;
 connection master;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 
+# Change Author: JBM
+# Change Date: 2005-12-22
+# Change: Comment out the exec of the binlog so test works for both SBR and RBR
+#--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+#--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001
 
 # Let us check with LOAD DATA INFILE
 # (we do it after mysqlbinlog because the temp files names are not constant)
 connection master;
 delete from t1;
 set time_zone='UTC';
-load data infile '../../std_data/rpl_timezone.dat' into table t1;
+load data infile '../../std_data/rpl_timezone2.dat' into table t1;
 select * from t1;
 sync_slave_with_master;
 set time_zone='UTC';
@@ -68,15 +70,15 @@
 connection master;
 set time_zone='Europe/Moscow';
 delete from t1;
-insert into t1 values ('20040101000000'), ('20040611093902');
+insert into t1 values ('20040101000000',NULL), ('20040611093902',NULL);
 
 #
 # Now let us check how well we replicate statments reading TIMESTAMP fields
-# (We should see the same data on master and on slave but it should differ 
+# (We should see the same data on master and on slave but it should differ
 # from originally inserted)
 #
 set time_zone='MET';
-insert into t2 (select t from t1);
+insert into t2 (select * from t1);
 select * from t1;
 sync_slave_with_master;
 select * from t2;
@@ -87,7 +89,7 @@
 connection master;
 delete from t2;
 set timestamp=1000072000;
-insert into t2 values (current_timestamp), (current_date), (current_time);
+insert into t2 values (current_timestamp,NULL), (current_date,NULL), (current_time,NULL);
 sync_slave_with_master;
 select * from t2;
 
@@ -96,8 +98,8 @@
 #
 connection master;
 delete from t2;
-insert into t2 values (from_unixtime(1000000000)),
-                      (unix_timestamp('2001-09-09 03:46:40'));
+insert into t2 values (from_unixtime(1000000000),NULL),
+                      (unix_timestamp('2001-09-09 03:46:40'),NULL);
 select * from t2;
 sync_slave_with_master;
 # We should get same result on slave as on master
@@ -115,8 +117,8 @@
 #
 delete from t2;
 set time_zone='UTC';
-insert into t2 values(convert_tz('2004-01-01 00:00:00','MET',@@time_zone));
-insert into t2 values(convert_tz('2005-01-01 00:00:00','MET','Japan'));
+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;
 sync_slave_with_master;
 select * from t2;
@@ -126,4 +128,3 @@
 drop table t1, t2;
 sync_slave_with_master;
 
-# End of 4.1 tests

--- 1.13/mysql-test/extra/rpl_tests/rpl_user_variables.test	2005-12-22 05:10:59 +01:00
+++ 1.15/mysql-test/t/rpl_user_variables.test	2005-12-23 13:23:55 +01:00
@@ -1,4 +1,3 @@
-# row-based and statement binlog difference in result files
 #
 # Test of replicating user variables
 #

--- 1.21/mysql-test/r/rpl_stm_err_ignoredtable.result	2005-12-22 05:10:55 +01:00
+++ 1.23/mysql-test/r/rpl_err_ignoredtable.result	2005-12-22 23:00:34 +01:00
@@ -5,13 +5,19 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 create table t1 (a int primary key);
+create table t4 (a int primary key);
 insert into t1 values (1),(1);
 ERROR 23000: Duplicate entry '1' for key 1
-show slave status;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	292	#	#	master-bin.000001	Yes	Yes				test.t3,test.t1,test.t2			0		0	292	#	None		0	No						#
+insert into t4 values (1),(2);
 show tables like 't1';
 Tables_in_test (t1)
+show tables like 't4';
+Tables_in_test (t4)
+t4
+SELECT * FROM test.t4;
+a
+1
+2
 drop table t1;
 select get_lock('crash_lock%20C', 10);
 get_lock('crash_lock%20C', 10)
@@ -26,14 +32,11 @@
 0
 kill @id;
 drop table t2,t3;
-show binlog events from 102;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int primary key)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1),(1)
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	use `test`; create table t2 (a int primary key)
-master-bin.000001	#	Query	1	#	use `test`; insert into t2 values(1)
-master-bin.000001	#	Query	1	#	use `test`; create table t3 (id int)
-master-bin.000001	#	Query	1	#	use `test`; insert into t3 values(connection_id())
-master-bin.000001	#	Query	1	#	use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
-master-bin.000001	#	Query	1	#	use `test`; drop table t2,t3
+insert into t4 values (3),(4);
+SELECT * FROM test.t4;
+a
+1
+2
+3
+4
+DROP TABLE test.t4;

--- 1.14/mysql-test/r/rpl_stm_loaddata_m.result	2005-12-22 05:10:54 +01:00
+++ 1.16/mysql-test/r/rpl_loaddata_m.result	2005-12-22 21:55:12 +01:00
@@ -5,16 +5,34 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 drop database if exists mysqltest;
-stop slave;
-create database mysqltest;
-use mysqltest;
-create table t1(a int, b int, unique(b));
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
-show binlog events from 102;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest
-master-bin.000001	#	Query	1	#	create database mysqltest
-master-bin.000001	#	Query	1	#	use `mysqltest`; create table t1(a int, b int, unique(b))
-master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=12
-master-bin.000001	#	Execute_load_query	1	#	use `mysqltest`; load data infile '../../std_data/rpl_loaddata.dat' into table t1 ;file_id=1
-drop database mysqltest;
+USE test;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
+SELECT COUNT(*) FROM test.t1;
+COUNT(*)
+2
+CREATE DATABASE mysqltest;
+USE mysqltest;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+SELECT COUNT(*) FROM mysqltest.t1;
+COUNT(*)
+2
+SHOW DATABASES;
+Database
+information_schema
+mysql
+mysqltest
+test
+USE test;
+SHOW TABLES;
+Tables_in_test
+USE mysqltest;
+SHOW TABLES;
+Tables_in_mysqltest
+t1
+SELECT COUNT(*) FROM mysqltest.t1;
+COUNT(*)
+2
+DROP DATABASE mysqltest;
+DROP TABLE test.t1;

--- 1.22/mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test	2005-12-22 05:10:54 +01:00
+++ 1.24/mysql-test/t/rpl_err_ignoredtable.test	2005-12-22 22:59:58 +01:00
@@ -7,20 +7,19 @@
 
 connection master;
 create table t1 (a int primary key);
+create table t4 (a int primary key);
 # generate an error that goes to the binlog
 --error 1062
 insert into t1 values (1),(1);
+insert into t4 values (1),(2);
 save_master_pos;
 connection slave;
 # as the t1 table is ignored on the slave, the slave should be able to sync
 sync_with_master;
-# The port number is different when doing the release build with
-# Do-compile, hence we have to replace the port number here accordingly
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 8 # 9 # 23 # 33 #
-show slave status;
 # check that the table has been ignored, because otherwise the test is nonsense
 show tables like 't1';
+show tables like 't4';
+SELECT * FROM test.t4;
 connection master;
 drop table t1;
 save_master_pos;
@@ -46,17 +45,20 @@
 select (@id := id) - id from t3;
 kill @id;
 drop table t2,t3;
+insert into t4 values (3),(4);
 connection master;
 --error 0,1053,2013
 reap;
 connection master1;
---replace_column 2 # 5 #
-show binlog events from 102;
 save_master_pos;
 connection slave;
-# SQL slave thread should not have stopped (because table of the killed
-# query is in the ignore list).
 sync_with_master;
+SELECT * FROM test.t4;
 
+connection master1;
+DROP TABLE test.t4;
+save_master_pos;
+connection slave;
+sync_with_master;
 # End of 4.1 tests
 # Adding comment for force manual merge 5.0 -> wl1012. delete me if needed

--- 1.13/mysql-test/extra/rpl_tests/rpl_loaddata_m.test	2005-12-22 05:10:59 +01:00
+++ 1.15/mysql-test/t/rpl_loaddata_m.test	2005-12-22 21:54:08 +01:00
@@ -1,28 +1,49 @@
 # See if the master logs LOAD DATA INFILE correctly when binlog_*_db rules
 # exist.
 # This is for BUG#1100 (LOAD DATA INFILE was half-logged).
-
-
+######################################################
+# Change Author: JBM
+# Change Date: 2005-12-22
+# Change: Test rewritten to remove show binlog events
+#         and to test the option better + Cleanup
+######################################################
 -- source include/master-slave.inc
 
 --disable_warnings
 drop database if exists mysqltest;
 --enable_warnings
 
+connection master;
+# 'test' database should be ignored by the slave
+USE test;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
+SELECT COUNT(*) FROM test.t1;
+
+# 'mysqltest' database should NOT be ignored by the slave
+CREATE DATABASE mysqltest;
+USE mysqltest;
+CREATE TABLE t1(a INT, b INT, UNIQUE(b));
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+SELECT COUNT(*) FROM mysqltest.t1;
+
+# Now lets check the slave to see what we have :-)
+save_master_pos;
 connection slave;
-stop slave; # don't need slave for this test
+sync_with_master;
 
-# Test logging on master
+SHOW DATABASES;
 
+USE test;
+SHOW TABLES;
+
+USE mysqltest;
+SHOW TABLES;
+SELECT COUNT(*) FROM mysqltest.t1;
+
+#show binlog events;
 connection master;
-# 'test' is the current database
-create database mysqltest;
-use mysqltest;
-create table t1(a int, b int, unique(b));
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
-# Starting from 5.0.3 LOAD DATA is replicated much in the same way as ordinary
-# query so "show binlog ..." should show two events (before 5.0.3 no events
-# were returned).
---replace_column 2 # 5 #
-show binlog events from 102;
-drop database mysqltest;
+DROP DATABASE mysqltest;
+DROP TABLE test.t1;
+
+# End of test

--- 1.27/mysql-test/t/disabled.def	2005-12-22 05:10:52 +01:00
+++ 1.29/mysql-test/t/disabled.def	2005-12-23 14:25:43 +01:00
@@ -25,3 +25,5 @@
 rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR
 ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
 sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite
+rpl_loaddata_m  : Bug#15942 RBR ignores --binlog_ignore_db 
+rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly

--- 1.1/mysql-test/t/rpl_row_log.test	2005-12-22 06:35:02 +01:00
+++ 1.2/mysql-test/t/rpl_row_log.test	2005-12-23 13:52:45 +01:00
@@ -1,4 +1,4 @@
-# Requires statement logging
+# Requires row base logging
 -- source include/have_binlog_format_row.inc
 -- source extra/rpl_tests/rpl_log.test
 

--- 1.1/mysql-test/t/rpl_stm_ddl.test	2005-12-22 06:35:06 +01:00
+++ 1.3/mysql-test/t/rpl_ddl.test	2005-12-23 14:26:33 +01:00
@@ -29,7 +29,6 @@
 #
 
 --source include/have_innodb.inc
---source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 let $engine_type= "InnoDB";
 -- source extra/rpl_tests/rpl_ddl.test

--- 1.1/mysql-test/t/rpl_stm_err_ignoredtable.test	2005-12-22 06:35:06 +01:00
+++ 1.2/BitKeeper/deleted/.del-rpl_stm_err_ignoredtable.test~bfe9b63deec27fb2	2005-12-22 22:56:45 +01:00
@@ -3,6 +3,6 @@
 # still checks that it has the same error as on the master.
 
 # Requires statement logging
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
 -- source extra/rpl_tests/rpl_err_ignoredtable.test
 

--- 1.1/mysql-test/t/rpl_stm_user_variables.test	2005-12-22 06:35:07 +01:00
+++ 1.2/BitKeeper/deleted/.del-rpl_stm_user_variables.test~84f68bdef965db77	2005-12-23 13:25:09 +01:00
@@ -1,5 +1,5 @@
 # row-based and statement binlog difference in result files
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
 -- source extra/rpl_tests/rpl_user_variables.test
 
 # End of 4.1 tests

--- 1.10/mysql-test/r/rpl_stm_ddl.result	2005-12-22 05:10:55 +01:00
+++ 1.13/mysql-test/r/rpl_ddl.result	2005-12-23 14:26:56 +01:00
@@ -1133,7 +1133,7 @@
 Db	mysqltest1
 Name	p1
 Type	PROCEDURE
-Definer	@
+Definer	root@localhost
 Modified	#
 Created	#
 Security_type	DEFINER
@@ -1199,7 +1199,7 @@
 Db	mysqltest1
 Name	p1
 Type	PROCEDURE
-Definer	@
+Definer	root@localhost
 Modified	#
 Created	#
 Security_type	DEFINER
Thread
bk commit into 5.1 tree (jmiller:1.1984)Jonathan Miller23 Dec