bk commit into 4.0 tree

[sasha]

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-06-30 14:38:47-06:00, sasha@stripped
  forgot to fix one instance of VERSION in rpl_log result

  mysql-test/r/rpl_log.result
    1.7 01/06/30 14:38:46 sasha@stripped +1 -1
    missed version again - next time will use searh and replace

# 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.6/mysql-test/r/rpl_log.result	Sat Jun 30 14:32:50 2001
+++ 1.7/mysql-test/r/rpl_log.result	Sat Jun 30 14:38:46 2001
@@ -15,7 +15,7 @@
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: 4.0.0-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)