Attempt to fix Windows testcase output issue

mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result

 Verbose statements from : write-partial-row.binlog
-select txt from raw_binlog_rows where txt like '###%';
-txt
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
+stmt
 ### INSERT INTO mysql.ndb_apply_status
 ### SET
 ###   @1=1
@@ -37,8 +37,8 @@ txt
 ###   @1=2
 drop table raw_binlog_rows;
 Verbose statements from : write-full-row.binlog
-select txt from raw_binlog_rows where txt like '###%';
-txt
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
+stmt
 ### INSERT INTO mysql.ndb_apply_status
 ### SET
 ###   @1=2
@@ -76,8 +76,8 @@ txt
 ###   @1=2
 drop table raw_binlog_rows;
 Verbose statements from : update-partial-row.binlog
-select txt from raw_binlog_rows where txt like '###%';
-txt
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
+stmt
 ### INSERT INTO mysql.ndb_apply_status
 ### SET
 ###   @1=3
@@ -117,8 +117,8 @@ txt
 ###   @1=2
 drop table raw_binlog_rows;
 Verbose statements from : update-full-row.binlog
-select txt from raw_binlog_rows where txt like '###%';
-txt
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
+stmt
 ### INSERT INTO mysql.ndb_apply_status
 ### SET
 ###   @1=4

mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test

@@ -45,7 +45,8 @@ create table raw_binlog_rows (txt varchar(1000));
 --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
 --enable_query_log
 --echo Verbose statements from : $binlog_file
-select txt from raw_binlog_rows where txt like '###%';
+# Output --verbose lines, with extra Windows CR's trimmed
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 drop table raw_binlog_rows;
 
 --disable_query_log
@@ -56,7 +57,8 @@ create table raw_binlog_rows (txt varchar(1000));
 --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
 --enable_query_log
 --echo Verbose statements from : $binlog_file
-select txt from raw_binlog_rows where txt like '###%';
+# Output --verbose lines, with extra Windows CR's trimmed
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 drop table raw_binlog_rows;
 
 --disable_query_log
@@ -67,7 +69,8 @@ create table raw_binlog_rows (txt varchar(1000));
 --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
 --enable_query_log
 --echo Verbose statements from : $binlog_file
-select txt from raw_binlog_rows where txt like '###%';
+# Output --verbose lines, with extra Windows CR's trimmed
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 drop table raw_binlog_rows;
 
 --disable_query_log
@@ -78,5 +81,6 @@ create table raw_binlog_rows (txt varchar(1000));
 --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
 --enable_query_log
 --echo Verbose statements from : $binlog_file
-select txt from raw_binlog_rows where txt like '###%';
+# Output --verbose lines, with extra Windows CR's trimmed
+select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 drop table raw_binlog_rows;