MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Frazer Clement Date:September 30 2009 10:39am
Subject:bzr push into mysql-5.1-telco-7.1 branch (frazer:3043 to 3044)
View as plain text  
 3044 Frazer Clement	2009-09-30 [merge]
      Merge 7.0->7.1
      modified:
        mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
        mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test
        mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc

 3043 Jonas Oreland	2009-09-30 [merge]
      merge 70 to 71

=== modified file 'mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result'
--- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result	2009-09-29 14:25:03 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result	2009-09-30 10:17:20 +0000
@@ -1,6 +1,6 @@
 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

=== modified file 'mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test'
--- a/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test	2009-09-29 14:25:03 +0000
+++ b/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test	2009-09-30 10:17:20 +0000
@@ -45,7 +45,8 @@ create table raw_binlog_rows (txt varcha
 --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 varcha
 --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 varcha
 --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 varcha
 --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;

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc	2009-09-29 14:25:03 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts.inc	2009-09-30 10:17:20 +0000
@@ -28,8 +28,10 @@ create table binlog_stmt_parts_unassoc (
 set @line_count=0;
 set @stmt_boundary=0;
 
+# Use replace() here to get rid of any unwanted Windows
+# CRs
 insert into binlog_stmt_parts_unassoc
-  select txt,
+  select replace(txt, '\r', ''),
          @line_count:= @line_count + 1,  # So we can preserve order later
          (txt like '%INSERT%' or         # Identify statement boundaries
           txt like '%UPDATE%' or

Thread
bzr push into mysql-5.1-telco-7.1 branch (frazer:3043 to 3044)Frazer Clement30 Sep