List:Internals« Previous MessageNext Message »
From:sinisa Date:February 2 2004 7:34pm
Subject:bk commit into 4.1 tree (Sinisa:1.1672)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1672 04/02/02 21:34:04 Sinisa@stripped +2 -0
  rpl_log.result:
    a result file for a fix for bug #2557
  rpl_log.test:
    A test case for a fix for bug #2557

  mysql-test/r/rpl_log.result
    1.51 04/02/02 21:33:32 Sinisa@stripped +15 -7
    a result file for a fix for bug #2557

  mysql-test/t/rpl_log.test
    1.21 04/02/02 21:33:20 Sinisa@stripped +2 -0
    A test case for a fix for bug #2557

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.50/mysql-test/r/rpl_log.result	Thu Nov 20 21:07:16 2003
+++ 1.51/mysql-test/r/rpl_log.result	Mon Feb  2 21:33:32 2004
@@ -16,6 +16,7 @@
 select count(*) from t1;
 count(*)
 69
+create table t2 like t1;
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
@@ -27,7 +28,8 @@
 master-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
 master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
 master-bin.000001	1056	Exec_load	1	1056	;file_id=1
-master-bin.000001	1079	Query	1	1079	use `test`; drop table t1
+master-bin.000001	1079	Query	1	1079	use `test`; create table t2 like t1
+master-bin.000001	1137	Query	1	1137	use `test`; drop table t1
 show binlog events from 79 limit 1;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000001	79	Query	1	79	use `test`; create table t1(n int not null auto_increment primary key)
@@ -38,6 +40,10 @@
 show binlog events from 79 limit 2,1;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
+show binlog events from 79 limit 2,2;
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
+master-bin.000001	263	Query	1	263	use `test`; drop table t1
 flush logs;
 create table t5 (a int);
 drop table t5;
@@ -57,8 +63,9 @@
 master-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
 master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
 master-bin.000001	1056	Exec_load	1	1056	;file_id=1
-master-bin.000001	1079	Query	1	1079	use `test`; drop table t1
-master-bin.000001	1127	Rotate	1	1127	master-bin.000002;pos=4
+master-bin.000001	1079	Query	1	1079	use `test`; create table t2 like t1
+master-bin.000001	1137	Query	1	1137	use `test`; drop table t1
+master-bin.000001	1185	Rotate	1	1185	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000002	4	Query	1	4	use `test`; create table t5 (a int)
@@ -85,10 +92,11 @@
 slave-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
 slave-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
 slave-bin.000001	1065	Exec_load	1	1065	;file_id=1
-slave-bin.000001	1088	Query	1	1088	use `test`; drop table t1
-slave-bin.000001	1136	Query	1	1136	use `test`; create table t5 (a int)
-slave-bin.000001	1194	Query	1	1194	use `test`; drop table t5
-slave-bin.000001	1242	Rotate	2	1242	slave-bin.000002;pos=4
+slave-bin.000001	1088	Query	1	1088	use `test`; create table t2 like t1
+slave-bin.000001	1146	Query	1	1146	use `test`; drop table t1
+slave-bin.000001	1194	Query	1	1194	use `test`; create table t5 (a int)
+slave-bin.000001	1252	Query	1	1252	use `test`; drop table t5
+slave-bin.000001	1300	Rotate	2	1300	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 slave-bin.000002	4	Query	1	4	use `test`; create table t1 (n int)

--- 1.20/mysql-test/t/rpl_log.test	Thu Oct  9 19:16:00 2003
+++ 1.21/mysql-test/t/rpl_log.test	Mon Feb  2 21:33:20 2004
@@ -35,12 +35,14 @@
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
 select count(*) from t1;
+create table t2 like t1;
 drop table t1;
 --replace_result $VERSION VERSION
 show binlog events;
 show binlog events from 79 limit 1;
 show binlog events from 79 limit 2;
 show binlog events from 79 limit 2,1;
+show binlog events from 79 limit 2,2;
 flush logs;
 
 # We need an extra update before doing save_master_pos.
Thread
bk commit into 4.1 tree (Sinisa:1.1672)sinisa2 Feb