Merge work:/home/bk/mysql-4.0

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

5 files changed, 25 insertions, 23 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index af595e80244..ed7414effd7 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -168,6 +168,9 @@ while test $# -gt 0; do
      USE_MANAGER=1
      USE_RUNNING_SERVER=
      ;;
+    --start-and-exit)
+     START_AND_EXIT=1
+     ;; 
     --skip-innobase)
      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-innobase"
      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-innobase" ;;
@@ -1091,6 +1094,10 @@ then
   mysql_loadstd
 fi
 
+if [ "x$START_AND_EXIT" = "x1" ] ; then
+ echo "Servers started, exiting"
+ exit
+fi
 
 $ECHO  "Starting Tests"
 
diff --git a/mysql-test/r/rpl000002.result b/mysql-test/r/rpl000002.result
index e321d82750c..88228321897 100644
--- a/mysql-test/r/rpl000002.result
+++ b/mysql-test/r/rpl000002.result
@@ -16,7 +16,7 @@ n
 2002
 show slave hosts;
 Server_id	Host	Port	Rpl_recovery_rank	Master_id
-2	127.0.0.1	9307	2	1
+2	127.0.0.1	$SLAVE_MYPORT	2	1
 drop table t1;
 slave stop;
 drop table if exists t2;
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result
index 3fb94c5b189..e15d22ea3ee 100644
--- a/mysql-test/r/rpl000016.result
+++ b/mysql-test/r/rpl000016.result
@@ -15,7 +15,7 @@ create table t1 (s text);
 insert into t1 values('Could not break slave'),('Tried hard');
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	60	master-bin.001	234	Yes			0		0	3
+127.0.0.1	root	$MASTER_MYPORT	60	master-bin.001	234	Yes			0		0	3
 select * from t1;
 s
 Could not break slave
@@ -42,7 +42,7 @@ master-bin.003
 insert into t2 values (65);
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	60	master-bin.003	202	Yes			0		0	3
+127.0.0.1	root	$MASTER_MYPORT	60	master-bin.003	127	Yes			0		0	2
 select * from t2;
 m
 34
@@ -60,12 +60,12 @@ master-bin.005
 master-bin.006
 show master status;
 File	Position	Binlog_do_db	Binlog_ignore_db
-master-bin.006	710		
+master-bin.006	382		
 slave stop;
 slave start;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	60	master-bin.006	710	Yes			0		0	11
+127.0.0.1	root	$MASTER_MYPORT	60	master-bin.006	382	Yes			0		0	6
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
 count(*)
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 37b2474f9e6..43108b880b4 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -16,7 +16,7 @@ load data infile '../../std_data/words.dat' into table t1;
 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: $VERSION, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: 4.0.1-alpha-debug-log, 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 @@ insert into t1 values (1);
 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: $VERSION, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: 4.0.1-alpha-debug-log, 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)
@@ -54,10 +54,9 @@ master-bin.001	627	Rotate	1	10	master-bin.002;pos=4
 master-bin.001	668	Stop	1	11	
 show binlog events in 'master-bin.002';
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.002	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
-master-bin.002	79	Query	1	2	use test; create table t1 (n int)
-master-bin.002	137	Query	1	3	use test; insert into t1 values (1)
-master-bin.002	197	Query	1	4	use test; drop table t1
+master-bin.002	4	Query	1	1	use test; create table t1 (n int)
+master-bin.002	62	Query	1	2	use test; insert into t1 values (1)
+master-bin.002	122	Query	1	3	use test; drop table t1
 show master logs;
 Log_name
 master-bin.001
@@ -69,7 +68,7 @@ slave-bin.001
 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: $VERSION, Binlog ver: 2
+slave-bin.001	4	Start	2	1	Server ver: 4.0.1-alpha-debug-log, 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
@@ -83,14 +82,13 @@ slave-bin.001	689	Rotate	1	4	slave-bin.002;pos=4; forced by master
 slave-bin.001	729	Stop	2	5	
 show binlog events in 'slave-bin.002' from 4;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.002	4	Start	2	1	Server ver: $VERSION, Binlog ver: 2
-slave-bin.002	79	Slave	2	10	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4
-slave-bin.002	132	Query	1	2	use test; create table t1 (n int)
-slave-bin.002	190	Query	1	3	use test; insert into t1 values (1)
-slave-bin.002	250	Query	1	4	use test; drop table t1
+slave-bin.002	4	Slave	2	10	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4
+slave-bin.002	57	Query	1	1	use test; create table t1 (n int)
+slave-bin.002	115	Query	1	2	use test; insert into t1 values (1)
+slave-bin.002	175	Query	1	3	use test; drop table t1
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.002	245	Yes			0		0	4
+127.0.0.1	root	$MASTER_MYPORT	1	master-bin.002	170	Yes			0		0	3
 show new master for slave with master_log_file='master-bin.001' and
 master_log_pos=4 and master_log_seq=1 and master_server_id=1;
 Log_name	Log_pos
@@ -106,8 +104,8 @@ slave-bin.001	439
 show new master for slave with master_log_file='master-bin.002' and
 master_log_pos=4 and master_log_seq=1 and master_server_id=1;
 Log_name	Log_pos
-slave-bin.002	132
+slave-bin.002	57
 show new master for slave with master_log_file='master-bin.002' and
 master_log_pos=137 and master_log_seq=3 and master_server_id=1;
 Log_name	Log_pos
-slave-bin.002	250
+slave-bin.002	223
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index 714c51f99a6..76ce580da1f 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -23,7 +23,6 @@ insert into t1 values('Could not break slave'),('Tried hard');
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 select * from t1;
 connection master;
@@ -70,7 +69,6 @@ insert into t2 values (65);
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 select * from t2;
 connection master;
@@ -92,7 +90,6 @@ connection slave;
 slave stop;
 slave start;
 sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 # because of concurrent insert, the table may not be up to date
 # if we do not lock