bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3248 to 3249) WL#5569

[Andrei Elkin]

 3249 Andrei Elkin	2010-12-17
      wl#5569 MTS
      
      fixing PB2 failures, incl valgrind issues, long exec time and asserting in a test.
     @ mysql-test/extra/rpl_tests/rpl_parallel_load.test
        Making slow win machines happy on PB2 to lessen load.
     @ mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
        adding an assert and print out if one will fire.
     @ sql/rpl_rli_pdb.cc
        the \0 term char was not allocated.
     @ sql/rpl_slave.cc
        missed initialization is added.

    modified:
      mysql-test/extra/rpl_tests/rpl_parallel_load.test
      mysql-test/suite/rpl/t/rpl_parallel.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
 3248 Andrei Elkin	2010-12-17 [merge]
      merge from  wl#5569 repo to local branch
      
      rpl_sequential opt files are added to avoid mtr give up to process a bulk of unsafe warnings.

    added:
      mysql-test/suite/rpl/t/rpl_sequential-master.opt
      mysql-test/suite/rpl/t/rpl_sequential-slave.opt
    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_crash_safe.result
      scripts/mysql_system_tables.sql
      sql/rpl_info_dummy.cc
      sql/rpl_info_dummy.h
      sql/rpl_info_factory.cc
      sql/rpl_info_file.cc
      sql/rpl_info_file.h
      sql/rpl_info_handler.h
      sql/rpl_info_table.cc
      sql/rpl_info_table.h
      sql/rpl_info_table_access.cc
      sql/rpl_mi.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2010-12-16 21:41:45 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2010-12-17 12:46:15 +0000
@@ -7,6 +7,15 @@
 #
 
 let $iter = 1000;
+
+# windows run on PB2 is too slow to time out
+disable_query_log;
+if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE"`)
+{
+  let $iter = 100;
+}
+enable_query_log;
+
 let $databases = 4;
 
 connection slave;

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel.test	2010-12-16 21:41:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel.test	2010-12-17 12:46:15 +0000
@@ -34,7 +34,6 @@
 #
 
 source include/master-slave.inc;
-# source include/have_binlog_format_row.inc;
 
 connection slave;
 set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers;

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_start_stop.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2010-12-14 08:57:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2010-12-17 12:46:15 +0000
@@ -113,6 +113,12 @@ connection master;
 sync_slave_with_master;
 #connection slave;
 
+if (`select count(*) != 3 from t1`)
+{
+    query_vertical show slave status;
+    --die Wrong recovery after restart
+}
+
 # cleanup but leaving on t1
 
 connection master;

=== modified file 'sql/rpl_rli_pdb.cc'
--- a/sql/rpl_rli_pdb.cc	2010-12-16 22:00:47 +0000
+++ b/sql/rpl_rli_pdb.cc	2010-12-17 12:46:15 +0000
@@ -334,6 +334,8 @@ Slave_worker *get_slave_worker(const cha
   my_hash_value_type hash_value;
   uchar dblength= (uint) strlen(dbname);
 
+  DBUG_ASSERT(dblength != 0);
+
   // Search in CGAP
   for (i= 0; i < rli->curr_group_assigned_parts.elements; i++)
   {
@@ -387,7 +389,7 @@ Slave_worker *get_slave_worker(const cha
       Allocate an entry to be inserted and if the operation fails
       an error is returned.
     */
-    if (!(db= (char *) my_malloc((size_t)dblength, MYF(0))))
+    if (!(db= (char *) my_malloc((size_t) dblength + 1, MYF(0))))
       goto err;
     if (!(entry= (db_worker *) my_malloc(sizeof(db_worker), MYF(0))))
     {

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-16 22:00:47 +0000
+++ b/sql/rpl_slave.cc	2010-12-17 12:46:15 +0000
@@ -4143,6 +4143,7 @@ int slave_start_workers(Relay_log_info *
   rli->mts_pending_jobs_size_max= ::opt_mts_pending_jobs_size_max;
   rli->mts_wqs_underrun_w_id= (ulong) -1;
   rli->mts_wqs_overrun= 0;
+  rli->mts_wqs_oversize= FALSE;
   rli->mts_coordinator_basic_nap= ::opt_mts_coordinator_basic_nap;
   rli->mts_worker_underrun_level= ::opt_mts_worker_underrun_level;
   rli->mts_total_groups= 0;


Attachment: [text/bzr-bundle] bzr/[e-mail]