List:Commits« Previous MessageNext Message »
From:Frazer Clement Date:November 11 2011 6:21pm
Subject:bzr push into mysql-trunk-cluster branch (frazer.clement:3406 to 3407)
View as plain text  
 3407 Frazer Clement	2011-11-11
      mysql-trunk-cluster replication testcases fixes
      
      Accomodate various differences in mysql-trunk-cluster.

    added:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-slave.opt
      mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-slave.opt
    renamed:
      mysql-test/include/show_binlog_using_logname.inc => mysql-test/suite/ndb_rpl/t/show_binlog_using_logname.inc
    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt
      mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc
      mysql-test/suite/ndb_rpl/t/show_binlog_using_logname.inc
 3406 Ole John Aske	2011-11-10
      MRR refactoring of ha_ndbcluster::multi_range_read_info() and ha_ndbcluster::multi_range_read_info_const()
      to use the same pattern as the DS-MRR implementation of these methods (DsMrr_impl::dsmrr_info_[const])
      
      This should simplify future maintenance if this code if/when it changes.

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result	2011-09-21 10:57:59 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result	2011-11-11 18:19:40 +0000
@@ -52,7 +52,17 @@ Last_SQL_Errno	0
 Last_SQL_Error	
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
+Master_UUID	#
+Master_Info_File	#
+SQL_Delay	0
+SQL_Remaining_Delay	NULL
+Slave_SQL_Running_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Master_Retry_Count	10
 Master_Bind	
+Last_IO_Error_Timestamp	
+Last_SQL_Error_Timestamp	
+Master_SSL_Crl	
+Master_SSL_Crlpath	
 Slave Binlog contains all ops as log_slave_updates is on
 show variables like 'server_id';
 Variable_name	Value

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test	2011-11-11 18:19:40 +0000
@@ -39,7 +39,7 @@ sync_slave_with_master master;
 SELECT * FROM t1 ORDER BY a;
 #SELECT * FROM t2 ORDER BY a;
 # BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36
---replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 # 42 # 
 --query_vertical show slave status;
 
 --echo Slave Binlog contains all ops as log_slave_updates is on

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test	2011-10-04 12:53:30 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test	2011-11-11 18:19:40 +0000
@@ -39,7 +39,7 @@ let $mysqld_name=mysqld.1.1;
 --source include/restart_mysqld.inc
 #show binlog events in 'master-bin.000002';
 let $log_name=master-bin.000002;
--- source include/show_binlog_using_logname.inc
+-- source suite/ndb_rpl/t/show_binlog_using_logname.inc
 
 drop table if exists t1;
 

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt	2011-05-13 07:40:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt	2011-11-11 18:19:40 +0000
@@ -1 +1 @@
---new --default-storage-engine=ndbcluster
+--new --default-storage-engine=ndbcluster --innodb

=== added file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-slave.opt'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-slave.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-slave.opt	2011-11-11 18:19:40 +0000
@@ -0,0 +1 @@
+--innodb

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test	2011-09-21 10:11:58 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test	2011-11-11 18:19:40 +0000
@@ -33,7 +33,7 @@ let $mysqld_name=mysqld.1.1;
 let $log_name=master-bin.000002;
 let $end_pos=143;
 let $off_set=0;
--- source include/show_binlog_using_logname.inc
+-- source suite/ndb_rpl/t/show_binlog_using_logname.inc
 
 --disable_result_log
 --connection slave

=== added file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-slave.opt'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-slave.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-slave.opt	2011-11-11 18:19:40 +0000
@@ -0,0 +1 @@
+--innodb

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc	2011-05-20 11:50:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc	2011-11-11 18:19:40 +0000
@@ -10,7 +10,7 @@
 # Selects out the log name, start & end pos
 # from the ndb_apply_status table
 #
-# include/show_binlog_using_logname.inc
+# suite/ndb_rpl/t/show_binlog_using_logname.inc
 # To select out 1 row from offset 1
 # from the start position in the binlog whose
 # name is = log_name
@@ -163,7 +163,7 @@ SET AUTOCOMMIT=1;
 --echo
 
 connection master;
---source  include/show_binlog_using_logname.inc
+--source  suite/ndb_rpl/t/show_binlog_using_logname.inc
 
 # Flush the logs on the master moving all
 # Transaction to a new binlog and ensure
@@ -213,7 +213,7 @@ SET AUTOCOMMIT=1;
 --echo
 
 connection master;
---source  include/show_binlog_using_logname.inc
+--source  suite/ndb_rpl/t/show_binlog_using_logname.inc
 
 # Now we reset both the master and the slave
 # Run some more transaction and ensure
@@ -261,7 +261,7 @@ SET AUTOCOMMIT=1;
 --echo
 
 connection master;
---source include/show_binlog_using_logname.inc
+--source suite/ndb_rpl/t/show_binlog_using_logname.inc
 
 # Since we are doing replication, it is a good
 # idea to check to make sure all data was 
@@ -285,7 +285,7 @@ DROP DATABASE tpcb;
 
 #connection master;
 #--eval SHOW BINLOG EVENTS in '$log_name' from $start_pos
-#--source include/show_binlog_using_logname.inc
+#--source suite/ndb_rpl/t/show_binlog_using_logname.inc
 
 --echo ****** Do dumps compare ************
 

=== renamed file 'mysql-test/include/show_binlog_using_logname.inc' => 'mysql-test/suite/ndb_rpl/t/show_binlog_using_logname.inc'
--- a/mysql-test/include/show_binlog_using_logname.inc	2011-10-04 12:53:30 +0000
+++ b/mysql-test/suite/ndb_rpl/t/show_binlog_using_logname.inc	2011-11-11 18:19:40 +0000
@@ -14,8 +14,13 @@ if (!$start_pos)
   # 'SHOW BINLOG EVENTS LIMIT 1' is used to get the right value.
   --let $start_pos= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos, 1)
 }
+if (!$off_set)
+{
+  # If $off_set not in use, set it to 0
+  --let $off_set= 0
+}
 --replace_result $start_pos <start_pos>
 --replace_column 2 # 5 <end_pos>
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
---eval show binlog events in '$log_name'  from $start_pos limit 0,1
+--eval show binlog events in '$log_name'  from $start_pos limit $off_set,1
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (frazer.clement:3406 to 3407) Frazer Clement14 Nov