bk commit into 6.0 tree (mkindahl:1.2629)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
6.0 repository of mkindahl.  When mkindahl 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@stripped, 2008-04-08 15:38:44+02:00, mkindahl@stripped +1 -0
  Updating result file because of error code change.

  mysql-test/r/binlog_index.result@stripped, 2008-04-08 15:38:40+02:00, mkindahl@stripped +2 -2
    Result change.

diff -Nrup a/mysql-test/r/binlog_index.result b/mysql-test/r/binlog_index.result
--- a/mysql-test/r/binlog_index.result	2008-04-03 15:37:55 +02:00
+++ b/mysql-test/r/binlog_index.result	2008-04-08 15:38:40 +02:00
@@ -9,7 +9,7 @@ master-bin.000003	#
 master-bin.000004	#
 purge binary logs TO 'master-bin.000004';
 Warnings:
-Warning	1669	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
+Warning	1670	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
 *** must show a list starting from the 'TO' argument of PURGE ***
 show binary logs;
 Log_name	File_size
@@ -20,7 +20,7 @@ flush logs;
 flush logs;
 *** must be a warning master-bin.000001 was not found ***
 Warnings:
-Warning	1669	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
+Warning	1670	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
 *** must show one record, of the active binlog, left in the index file after PURGE ***
 show binary logs;
 Log_name	File_size