bk commit into 5.1 tree (skozlov:1.2557)

[Serge Kozlov]

Below is the list of changes that have just been committed into a local
5.1 repository of skozlov.  When skozlov 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-05 15:09:53+04:00, skozlov@stripped +2 -0
  Fix for binlog_index test case: hide difference for paths from warning messages between Windows and Unix 

  mysql-test/suite/binlog/r/binlog_index.result@stripped, 2008-04-05 15:09:45+04:00, skozlov@stripped +3 -3
    updated result

  mysql-test/suite/binlog/t/binlog_index.test@stripped, 2008-04-05 15:09:46+04:00, skozlov@stripped +3 -1
    updated test case

diff -Nrup a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result
--- a/mysql-test/suite/binlog/r/binlog_index.result	2008-04-03 23:39:56 +04:00
+++ b/mysql-test/suite/binlog/r/binlog_index.result	2008-04-05 15:09:45 +04:00
@@ -9,7 +9,7 @@ master-bin.000003	#
 master-bin.000004	#
 purge binary logs TO 'master-bin.000004';
 Warnings:
-Warning	1612	Being purged log ./master-bin.000001 was not found
+Warning	1612	Being purged 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	1612	Being purged log ./master-bin.000001 was not found
+Warning	1612	Being purged 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
@@ -33,7 +33,7 @@ purge binary logs TO 'master-bin.000002'
 ERROR HY000: Fatal error during log purge
 show warnings;
 Level	Code	Message
-Error	1377	a problem with deleting ./master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files
+Error	1377	a problem with deleting master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files
 Error	1377	Fatal error during log purge
 reset master;
 End of tests
diff -Nrup a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test
--- a/mysql-test/suite/binlog/t/binlog_index.test	2008-04-03 23:39:57 +04:00
+++ b/mysql-test/suite/binlog/t/binlog_index.test	2008-04-05 15:09:46 +04:00
@@ -13,11 +13,11 @@ flush logs;
 flush logs;
 
 source include/show_binary_logs.inc;
-
 let $MYSQLD_DATADIR= `select @@datadir`;
 remove_file $MYSQLD_DATADIR/master-bin.000001;
 
 # there must be a warning with file names
+replace_regex /\.[\\\/]master/master/;
 purge binary logs TO 'master-bin.000004';
 
 --echo *** must show a list starting from the 'TO' argument of PURGE ***
@@ -37,6 +37,7 @@ remove_file $MYSQLD_DATADIR/master-bin.0
 --echo *** must be a warning master-bin.000001 was not found ***
 let $date=`select NOW()  +  INTERVAL 1 MINUTE`;
 --disable_query_log
+replace_regex /\.[\\\/]master/master/;
 eval purge binary logs BEFORE '$date';
 --enable_query_log
 
@@ -59,6 +60,7 @@ mkdir $MYSQLD_DATADIR/master-bin.000001;
 
 --error ER_BINLOG_PURGE_FATAL_ERR
 purge binary logs TO 'master-bin.000002';
+replace_regex /\.[\\\/]master/master/;
 show warnings;
 rmdir $MYSQLD_DATADIR/master-bin.000001;
 --disable_warnings