List:Internals« Previous MessageNext Message »
From:sasha Date:November 19 2001 7:03pm
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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@stripped, 2001-11-19 12:03:30-07:00, sasha@stripped
  fixed problem in rpl_log test

  mysql-test/fix-result
    1.3 01/11/19 12:03:29 sasha@stripped +1 -1
    updated version

  mysql-test/r/rpl_log.result
    1.17 01/11/19 12:03:29 sasha@stripped +3 -3
    fixed result to be portable

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.2/mysql-test/fix-result	Wed Oct  3 15:19:57 2001
+++ 1.3/mysql-test/fix-result	Mon Nov 19 12:03:29 2001
@@ -7,7 +7,7 @@
 
 #It is assumed we are running the script in mysql-test directory
 
-VERSION=4.0.0-alpha-debug-log
+VERSION=4.0.1-alpha-debug-log
 TEST_CASE=$1
 
 if [ -z "$TEST_CASE" ] ;

--- 1.16/mysql-test/r/rpl_log.result	Sat Nov 10 22:24:10 2001
+++ 1.17/mysql-test/r/rpl_log.result	Mon Nov 19 12:03:29 2001
@@ -16,7 +16,7 @@
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: 4.0.1-alpha-debug-log, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 master-bin.001	172	Intvar	1	3	INSERT_ID=1
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
@@ -41,7 +41,7 @@
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: 4.0.1-alpha-debug-log, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 master-bin.001	172	Intvar	1	3	INSERT_ID=1
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
@@ -68,7 +68,7 @@
 slave-bin.002
 show binlog events in 'slave-bin.001' from 4;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.001	4	Start	2	1	Server ver: 4.0.1-alpha-debug-log, Binlog ver: 2
+slave-bin.001	4	Start	2	1	Server ver: $VERSION, Binlog ver: 2
 slave-bin.001	79	Slave	2	3	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.001,pos=4
 slave-bin.001	132	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 slave-bin.001	225	Intvar	1	3	INSERT_ID=1
Thread
bk commit into 4.0 treesasha19 Nov