BUG#48738: post-push fix. Multi-platform test improvements, mainly

           to make the test run gracefully on windows.

There was also a syntax error in windows part of the test.

mysql-test/r/binlog_delete_and_flush_index.result

@@ -2,7 +2,9 @@ RESET MASTER;
 CREATE TABLE t1 (a int);
 ### assertion: index file contains regular entries
 SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index');
-master-bin.000001
+SELECT @index;
+@index
+MYSQLD_DATADIR/master-bin.000001
 
 ### assertion: show original binlogs
 show binary logs;
@@ -15,8 +17,10 @@ master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
 FLUSH LOGS;
 ### assertion: index file contains renamed binlog and the new one
 SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index');
-master-bin-b34582.000001
-master-bin.000002
+SELECT @index;
+@index
+MYSQLD_DATADIR/master-bin-b34582.000001
+MYSQLD_DATADIR/master-bin.000002
 
 ### assertion: original binlog content still exists, despite we
 ###            renamed and changed the index file 
@@ -39,6 +43,8 @@ master-bin.000002	#
 ### assertion: assert that not purged binlog file exists
 ### assertion: show index file contents and these should match show binary logs issued above
 SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index');
-master-bin.000002
+SELECT @index;
+@index
+MYSQLD_DATADIR/master-bin.000002
 
 RESET MASTER;

mysql-test/t/binlog_delete_and_flush_index.test

@@ -45,31 +45,10 @@ RESET MASTER;
 CREATE TABLE t1 (a int);
 
 -- echo ### assertion: index file contains regular entries
--- replace_regex /[\\\/].*master/MYSQLD_DATADIR\/master/
+-- replace_result $datadir MYSQLD_DATADIR
 -- eval SET @index=LOAD_FILE('$index')
-if (`SELECT convert(@@version_compile_os using latin1)
-                IN ('Win32','Win64','Windows')`)
-{
-  -- disable_query_log
-  -- disable_result_log
-  -- let $a= `SELECT REPLACE (@index, '$datadir\', '')`
-  -- enable_result_log
-  -- enable_query_log
-
-  -- echo $a
-
-}
-if (!`SELECT convert(@@version_compile_os using latin1)
-                 IN ('Win32','Win64','Windows')`)
-{
-  -- disable_query_log
-  -- disable_result_log
-  -- let $a= `SELECT REPLACE (@index, '$datadir/', '')`
-  -- enable_result_log
-  -- enable_query_log
-
-  -- echo $a
-}
+-- replace_result $datadir MYSQLD_DATADIR
+SELECT @index;
 
 --echo ### assertion: show original binlogs
 -- source include/show_binary_logs.inc
@@ -79,17 +58,23 @@ if (!`SELECT convert(@@version_compile_os using latin1)
 
 # action: copy binlogs to other names and change entries in index file
 -- copy_file $datadir/master-bin.000001 $datadir/master-bin-b34582.000001
--- let newbinfile=$datadir/master-bin-b34582.000001
-let INDEX_FILE=$index;
+-- let newbinfile= $datadir/master-bin-b34582.000001
+-- let INDEX_FILE= $index
 perl;
-$newbinfile= $ENV{'newbinfile'};
+use File::Spec;
+$newbinfile= File::Spec->rel2abs($ENV{'newbinfile'});
 $file= $ENV{'INDEX_FILE'};
 open(FILE, ">$file") || die "Unable to open $file.";
 truncate(FILE,0);
-print FILE $newbinfile . "\n";
+print FILE "$newbinfile";
 close ($file);
 EOF
 
+# append a new line (platform independent)
+-- append_file $index
+
+EOF
+
 # action: should cause rotation, and creation of new binlogs
 FLUSH LOGS;
 
@@ -97,31 +82,10 @@ FLUSH LOGS;
 -- remove_file $datadir/master-bin.000001
 
 -- echo ### assertion: index file contains renamed binlog and the new one
--- replace_regex /[\\\/].*master/MYSQLD_DATADIR\/master/
+-- replace_result $datadir MYSQLD_DATADIR
 -- eval SET @index=LOAD_FILE('$index')
-if (`SELECT convert(@@version_compile_os using latin1)
-                IN ('Win32','Win64','Windows')`)
-{
-  -- disable_query_log
-  -- disable_result_log
-  -- let $a= `SELECT REPLACE (@index, '$datadir\', '')`
-  -- enable_result_log
-  -- enable_query_log
-
-  -- echo $a
-
-}
-if (!`SELECT convert(@@version_compile_os using latin1)
-                 IN ('Win32','Win64','Windows')`)
-{
-  -- disable_query_log
-  -- disable_result_log
-  -- let $a= `SELECT REPLACE (@index, '$datadir/', '')`
-  -- enable_result_log
-  -- enable_query_log
-
-  -- echo $a
-}
+-- replace_result $datadir MYSQLD_DATADIR
+SELECT @index;
 
 -- echo ### assertion: original binlog content still exists, despite we
 -- echo ###            renamed and changed the index file 
@@ -147,30 +111,9 @@ DROP TABLE t1;
 -- file_exists $datadir/$current_binlog
 
 -- echo ### assertion: show index file contents and these should match show binary logs issued above
--- replace_regex /[\\\/].*master/MYSQLD_DATADIR\/master/
+-- replace_result $datadir MYSQLD_DATADIR
 -- eval SET @index=LOAD_FILE('$index')
-if (`SELECT convert(@@version_compile_os using latin1)
-                IN ('Win32','Win64','Windows')`)
-{
-  -- disable_query_log
-  -- disable_result_log
-  -- let $a= `SELECT REPLACE (@index, '$datadir\', '')`
-  -- enable_result_log
-  -- enable_query_log
-
-  -- echo $a
-
-}
-if (!`SELECT convert(@@version_compile_os using latin1)
-                 IN ('Win32','Win64','Windows')`)
-{
-  -- disable_query_log
-  -- disable_result_log
-  -- let $a= `SELECT REPLACE (@index, '$datadir/', '')`
-  -- enable_result_log
-  -- enable_query_log
-
-  -- echo $a
-}
+-- replace_result $datadir MYSQLD_DATADIR
+SELECT @index;
 
 RESET MASTER;