#At file:///home/frazer/bzr/mysql-5.1-telco-7.1/ based on revid:frazer@stripped
3699 Frazer Clement 2010-07-02 [merge]
Merge 7.0->7.1
modified:
mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu_anyval.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu.result 2010-07-02 11:01:48 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu.result 2010-07-02 17:10:16 +0000
@@ -97,7 +97,7 @@ master-bin.000001 # Write_rows 1 # table
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 1 Query
server id 1 Query
@@ -177,7 +177,7 @@ master-bin.000001 # Write_rows 3 # table
master-bin.000001 # Write_rows 3 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 3 # COMMIT
master-bin.000001 # Query 3 # use `test`; DROP TABLE bug45756_master_logged_3
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 3 Query
server id 3 Query
@@ -257,7 +257,7 @@ slave-master-bin.000001 # Write_rows 5 #
slave-master-bin.000001 # Write_rows 5 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 5 # COMMIT
slave-master-bin.000001 # Query 5 # use `test`; drop table `test`.`bug_45756_slave_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 5 Query
server id 5 Query
@@ -346,7 +346,7 @@ slave-master-bin.000001 # Write_rows 6 #
slave-master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 6 # COMMIT
slave-master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 6 Query
server id 6 Query
@@ -494,7 +494,7 @@ master-bin.000001 # Write_rows 1 # table
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 1 Query
server id 1 Query
@@ -574,7 +574,7 @@ master-bin.000001 # Write_rows 3 # table
master-bin.000001 # Write_rows 3 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 3 # COMMIT
master-bin.000001 # Query 3 # use `test`; DROP TABLE bug45756_master_logged_3
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 3 Query
server id 3 Query
@@ -654,7 +654,7 @@ slave-master-bin.000001 # Write_rows 5 #
slave-master-bin.000001 # Write_rows 5 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 5 # COMMIT
slave-master-bin.000001 # Query 5 # use `test`; drop table `test`.`bug_45756_slave_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 5 Query
server id 5 Query
@@ -743,7 +743,7 @@ slave-master-bin.000001 # Write_rows 6 #
slave-master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 6 # COMMIT
slave-master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 6 Query
server id 6 Query
@@ -891,7 +891,7 @@ master-bin.000001 # Write_rows 1 # table
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 1 Query
server id 1 Query
@@ -971,7 +971,7 @@ master-bin.000001 # Write_rows 3 # table
master-bin.000001 # Write_rows 3 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 3 # COMMIT
master-bin.000001 # Query 3 # use `test`; DROP TABLE bug45756_master_logged_3
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 3 Query
server id 3 Query
@@ -1051,7 +1051,7 @@ slave-master-bin.000001 # Write_rows 5 #
slave-master-bin.000001 # Write_rows 5 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 5 # COMMIT
slave-master-bin.000001 # Query 5 # use `test`; drop table `test`.`bug_45756_slave_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 5 Query
server id 5 Query
@@ -1140,7 +1140,7 @@ slave-master-bin.000001 # Write_rows 6 #
slave-master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 6 # COMMIT
slave-master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 6 Query
server id 6 Query
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu_anyval.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu_anyval.result 2010-07-02 11:01:48 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu_anyval.result 2010-07-02 17:10:16 +0000
@@ -97,7 +97,7 @@ master-bin.000001 # Write_rows 1 # table
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 1 Query
server id 1 Query
@@ -177,7 +177,7 @@ master-bin.000001 # Write_rows 3 # table
master-bin.000001 # Write_rows 3 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 3 # COMMIT
master-bin.000001 # Query 3 # use `test`; DROP TABLE bug45756_master_logged_3
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483523 Query
server id 3 Query
@@ -257,7 +257,7 @@ slave-master-bin.000001 # Write_rows 5 #
slave-master-bin.000001 # Write_rows 5 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 5 # COMMIT
slave-master-bin.000001 # Query 5 # use `test`; drop table `test`.`bug_45756_slave_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483525 Query
server id 5 Query
@@ -346,7 +346,7 @@ slave-master-bin.000001 # Write_rows 6 #
slave-master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 6 # COMMIT
slave-master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483526 Query
server id 6 Query
@@ -494,7 +494,7 @@ master-bin.000001 # Write_rows 1 # table
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 1 Query
server id 1 Query
@@ -574,7 +574,7 @@ master-bin.000001 # Write_rows 3 # table
master-bin.000001 # Write_rows 3 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 3 # COMMIT
master-bin.000001 # Query 3 # use `test`; DROP TABLE bug45756_master_logged_3
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483523 Query
server id 3 Query
@@ -654,7 +654,7 @@ slave-master-bin.000001 # Write_rows 5 #
slave-master-bin.000001 # Write_rows 5 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 5 # COMMIT
slave-master-bin.000001 # Query 5 # use `test`; drop table `test`.`bug_45756_slave_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483525 Query
server id 5 Query
@@ -743,7 +743,7 @@ slave-master-bin.000001 # Write_rows 6 #
slave-master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 6 # COMMIT
slave-master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483526 Query
server id 6 Query
@@ -891,7 +891,7 @@ master-bin.000001 # Write_rows 1 # table
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 1 Query
server id 1 Query
@@ -971,7 +971,7 @@ master-bin.000001 # Write_rows 3 # table
master-bin.000001 # Write_rows 3 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 3 # COMMIT
master-bin.000001 # Query 3 # use `test`; DROP TABLE bug45756_master_logged_3
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483523 Query
server id 3 Query
@@ -1051,7 +1051,7 @@ slave-master-bin.000001 # Write_rows 5 #
slave-master-bin.000001 # Write_rows 5 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 5 # COMMIT
slave-master-bin.000001 # Query 5 # use `test`; drop table `test`.`bug_45756_slave_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483525 Query
server id 5 Query
@@ -1140,7 +1140,7 @@ slave-master-bin.000001 # Write_rows 6 #
slave-master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-master-bin.000001 # Query 6 # COMMIT
slave-master-bin.000001 # Query 1 # use `test`; drop table `test`.`bug45756_master_logged_3`
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
binlog_entries
server id 2147483526 Query
server id 6 Query
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc 2010-07-02 11:01:48 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc 2010-07-02 17:10:16 +0000
@@ -15,7 +15,7 @@ create table raw_binlog_rows (txt varcha
# Right trim of length-17 takes out the initial timestamp
# We are primarily interested in server id and event type
--replace_regex /thread_id=[0-9]*/ / /exec_time=[0-9]*/ / /end_log_pos [0-9]*/ / /table id [0-9]*/ / /error_code=[0-9]*/ / /mapped to number [0-9]*/ /
-select right(txt, length(txt)-17) as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
+select replace(right(txt, length(txt)-17), '\r', '') as binlog_entries from raw_binlog_rows where txt like '%server id%' and not (txt like '%Start%' or txt like '%Rotate%');
--disable_query_log
drop table raw_binlog_rows;
Attachment: [text/bzr-bundle] bzr/frazer@mysql.com-20100702171221-7rtcw9jufwzm8tkc.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-7.1 branch (frazer:3699) | Frazer Clement | 2 Jul |
