Bug#36423593 Purging ndb_binlog_index affects ndb binlog

Follow up fix for mismatched result due to file path separators. Change-Id: Iec5b01659e12840f30748beb81dbed2dd33471b6

Author: blaudden

mysql-test/suite/ndb_binlog/r/ndb_binlog_purge_orphans.result

@@ -5,6 +5,11 @@ SHOW VARIABLES LIKE 'ndb_log_bin';
 Variable_name	Value
 ndb_log_bin	ON
 RESET MASTER;
+# Find physical binlog file name format as it varies between platforms
+CREATE TABLE check_binlog_name (a int primary key) engine = NDB;
+INSERT INTO check_binlog_name VALUES (1);
+DROP TABLE check_binlog_name;
+RESET MASTER;
 # 1. Insert to create referencing rows
 CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=ndb;
 INSERT INTO t1 VALUES (1);
@@ -60,23 +65,23 @@ Test.000001
 /home/a/b/c/d/e/f/Test.000004
 c:\Progra~1\WinAmp\Skins\Test.000005
 ./Test.000006/
-./binlog.000001
-./binlog.000002
-./binlog.000003
-./binlog.000006
-./binlog.000007
-./binlog.000008
-./binlog.000009
-./binlog.000010
+binlog.000001
+binlog.000002
+binlog.000003
+binlog.000006
+binlog.000007
+binlog.000008
+binlog.000009
+binlog.000010
 # 6. Restart
 # restart
 # 7. Wait for 5 rows
 # 8. Show that referenced rows are still there
 SELECT DISTINCT(File) FROM mysql.ndb_binlog_index;
 File
-./binlog.000006
-./binlog.000007
-./binlog.000008
-./binlog.000009
-./binlog.000010
+binlog.000006
+binlog.000007
+binlog.000008
+binlog.000009
+binlog.000010
 RESET MASTER;

mysql-test/suite/ndb_binlog/t/ndb_binlog_purge_orphans.test

@@ -27,6 +27,17 @@ SHOW VARIABLES LIKE 'ndb_log_bin';
 
 RESET MASTER;
 
+--echo # Find physical binlog file name format as it varies between platforms
+CREATE TABLE check_binlog_name (a int primary key) engine = NDB;
+INSERT INTO check_binlog_name VALUES (1);
+DROP TABLE check_binlog_name;
+let $binlog_name =
+ `SELECT SUBSTRING(File, 1, LENGTH(File)-LENGTH('.000001'))
+ FROM mysql.ndb_binlog_index ORDER BY epoch LIMIT 1`;
+#echo binlog_name: $binlog_name;
+
+RESET MASTER;
+
 --echo # 1. Insert to create referencing rows
 CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=ndb;
 let $i = 1;
@@ -65,6 +76,7 @@ insert into mysql.ndb_binlog_index values
  (9, './Test.000006/', 27, 0, 0, 0, 0, 0, 0, 0, 0, 'Next file');
 
 --source include/show_binary_logs.inc
+--replace_result $binlog_name binlog
 SELECT DISTINCT(File) FROM mysql.ndb_binlog_index;
 
 --echo # 6. Restart
@@ -78,6 +90,7 @@ let $wait_condition=
 --source include/wait_condition.inc
 
 --echo # 8. Show that referenced rows are still there
+--replace_result $binlog_name binlog
 SELECT DISTINCT(File) FROM mysql.ndb_binlog_index;
 
 RESET MASTER;