bk commit into 5.0 tree (acurtis:1.1905)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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.1905 05/05/24 22:31:57 acurtis@stripped +2 -0
  Fix after merge

  mysql-test/r/rpl_rotate_logs.result
    1.69 05/05/24 22:31:44 acurtis@stripped +16 -6
    Fix after merge

  mysql-test/r/rpl_log.result
    1.59 05/05/24 22:31:44 acurtis@stripped +6 -2
    Fix after merge

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/usr/home/antony/work2/p3-bug7241.6

--- 1.68/mysql-test/r/rpl_rotate_logs.result	2005-05-24 15:49:26 +01:00
+++ 1.69/mysql-test/r/rpl_rotate_logs.result	2005-05-24 22:31:44 +01:00
@@ -29,7 +29,10 @@
 Log_name	File_size
 master-bin.000001	0
 master-bin.000002	0
-master-bin.000003	4
+master-bin.000003	98
+Warnings:
+Error	29	File 'master-bin.000001' not found (Errcode: 2)
+Error	29	File 'master-bin.000002' not found (Errcode: 2)
 create table t3 select * from temp_table;
 select * from t3;
 a
@@ -44,16 +47,20 @@
 show master logs;
 Log_name	File_size
 master-bin.000002	0
-master-bin.000003	229
+master-bin.000003	407
+Warnings:
+Error	29	File 'master-bin.000002' not found (Errcode: 2)
 purge binary logs to 'master-bin.000002';
 show binary logs;
 Log_name	File_size
 master-bin.000002	0
-master-bin.000003	229
+master-bin.000003	407
+Warnings:
+Error	29	File 'master-bin.000002' not found (Errcode: 2)
 purge master logs before now();
 show binary logs;
 Log_name	File_size
-master-bin.000003	229
+master-bin.000003	407
 insert into t2 values (65);
 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
@@ -75,8 +82,11 @@
 show binary logs;
 Log_name	File_size
 master-bin.000003	0
-master-bin.000004	2886
-master-bin.000005
+master-bin.000004	0
+master-bin.000005	2032
+Warnings:
+Error	29	File 'master-bin.000003' not found (Errcode: 2)
+Error	29	File 'master-bin.000004' not found (Errcode: 2)
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000005	2032		

--- 1.58/mysql-test/r/rpl_log.result	2005-05-24 15:41:34 +01:00
+++ 1.59/mysql-test/r/rpl_log.result	2005-05-24 22:31:44 +01:00
@@ -70,12 +70,16 @@
 show binary logs;
 Log_name	File_size
 master-bin.000001	0
-master-bin.000002	276
+master-bin.000002	510
+Warnings:
+Error	29	File 'master-bin.000001' not found (Errcode: 2)
 start slave;
 show binary logs;
 Log_name	File_size
 slave-bin.000001	0
-slave-bin.000002	170
+slave-bin.000002	348
+Warnings:
+Error	29	File 'slave-bin.000001' not found (Errcode: 2)
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4