bk commit into 5.0 tree (msvensson:1.1925)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1925 05/05/27 12:01:41 msvensson@neptunus.(none) +2 -0
  Fix rpl_log and rpl_rotate_logs test result
   - Remove the expected warrnings when "show binary logs" are called on zero size binary
log files. 

  mysql-test/r/rpl_rotate_logs.result
    1.70 05/05/27 12:01:37 msvensson@neptunus.(none) +0 -10
    Remove the warnings that is no longer displayed when "show binary logs" is called on
zero size log files. 
    Checked against 4.0, no warnings there.

  mysql-test/r/rpl_log.result
    1.60 05/05/27 12:01:37 msvensson@neptunus.(none) +0 -4
    Remove the warnings that is no longer displayed when "show binary logs" is called on
zero size log files. 
    Checked against 4.0, no warnings there.

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.69/mysql-test/r/rpl_rotate_logs.result	2005-05-24 23:31:44 +02:00
+++ 1.70/mysql-test/r/rpl_rotate_logs.result	2005-05-27 12:01:37 +02:00
@@ -30,9 +30,6 @@
 master-bin.000001	0
 master-bin.000002	0
 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
@@ -48,15 +45,11 @@
 Log_name	File_size
 master-bin.000002	0
 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	407
-Warnings:
-Error	29	File 'master-bin.000002' not found (Errcode: 2)
 purge master logs before now();
 show binary logs;
 Log_name	File_size
@@ -84,9 +77,6 @@
 master-bin.000003	0
 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.59/mysql-test/r/rpl_log.result	2005-05-24 23:31:44 +02:00
+++ 1.60/mysql-test/r/rpl_log.result	2005-05-27 12:01:37 +02:00
@@ -71,15 +71,11 @@
 Log_name	File_size
 master-bin.000001	0
 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	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