bzr push into mysql-trunk branch (alfranio.correia:3529 to 3530)

[Alfranio Correia]

 3530 Alfranio Correia	2011-10-27 [merge]
      merge mysql-trunk (local) --> mysql-trunk

    modified:
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      sql/rpl_slave.cc
 3529 Inaam Rana	2011-10-27 [merge]
      merge from parent

    modified:
      mysql-test/r/compare.result
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/plugin.result
      mysql-test/r/sp-error.result
      mysql-test/r/user_var.result
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/table_schema.result
      mysql-test/t/compare.test
      mysql-test/t/index_merge_innodb.test
      mysql-test/t/plugin.test
      mysql-test/t/sp-error.test
      mysql-test/t/user_var.test
      scripts/mysql_system_tables.sql
      sql/event_db_repository.cc
      sql/events.cc
      sql/item_cmpfunc.cc
      sql/opt_range.cc
      sql/records.cc
      sql/records.h
      sql/sp_rcontext.cc
      sql/sql_acl.cc
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_help.cc
      sql/sql_plugin.cc
      sql/sql_select.cc
      sql/sql_servers.cc
      sql/sql_table.cc
      sql/sql_udf.cc
      sql/sql_update.cc
      storage/innobase/dict/dict0dict.c
      storage/innobase/handler/ha_innodb.cc
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_events.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/table_events_stages.cc
      storage/perfschema/table_events_stages.h
      storage/perfschema/table_events_statements.cc
      storage/perfschema/table_events_statements.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
=== modified file 'mysql-test/suite/rpl/r/rpl_alter_repository.result'
--- a/mysql-test/suite/rpl/r/rpl_alter_repository.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_alter_repository.result	2011-10-20 09:01:41 +0000
@@ -152,8 +152,5 @@ slave_relay_log_info	CREATE TABLE `slave
 - Occurrences: 1
 DROP TABLE t_innodb;
 include/stop_slave.inc
-SET @@global.relay_log_info_repository=FILE;
-SET @@global.master_info_repository=FILE;
-SET @@global.sync_master_info=0;
 include/start_slave.inc
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_alter_repository.test'
--- a/mysql-test/suite/rpl/t/rpl_alter_repository.test	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_alter_repository.test	2011-10-20 13:06:58 +0000
@@ -6,6 +6,7 @@
 
 --source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/not_mts_slave_parallel_workers.inc
 --connection slave
 --source include/stop_slave.inc
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -248,8 +249,11 @@ DROP TABLE t_innodb;
 --sync_slave_with_master
 
 --source include/stop_slave.inc
---eval SET @@global.relay_log_info_repository=$saved_relay_repo
---eval SET @@global.master_info_repository=$saved_master_repo
+
+--disable_query_log
+--eval SET @@global.relay_log_info_repository="$saved_relay_repo"
+--eval SET @@global.master_info_repository="$saved_master_repo"
 --eval SET @@global.sync_master_info=$saved_sync_master
+--enable_query_log
 --source include/start_slave.inc
 --source include/rpl_end.inc

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-10-13 14:01:50 +0000
+++ b/sql/rpl_slave.cc	2011-10-20 13:06:58 +0000
@@ -3952,6 +3952,9 @@ bool mts_recovery_groups(Relay_log_info
   LOG_INFO linfo;
   my_off_t offset= 0;
 
+  DBUG_ENTER("mts_recovery_groups");
+  DBUG_ASSERT(rli->recovery_parallel_workers > 0);
+
   /*
     Save relay log position to compare with worker's position.
   */
@@ -3961,8 +3964,10 @@ bool mts_recovery_groups(Relay_log_info
     rli->get_group_master_log_pos()
   };
 
-  DBUG_ENTER("mts_recovery_groups");
-  DBUG_ASSERT(rli->recovery_parallel_workers > 0);
+  Format_description_log_event fdle(BINLOG_VERSION), *p_fdle= &fdle;
+
+  if (!p_fdle->is_valid())
+    DBUG_RETURN(TRUE);
 
   /*
     Gathers information on valuable workers and stores it in 
@@ -3975,6 +3980,13 @@ bool mts_recovery_groups(Relay_log_info
   {
     Slave_worker *worker=
       Rpl_info_factory::create_worker(opt_rli_repository_id, id, rli);
+
+    if (!worker)
+    {
+      error= TRUE;
+      goto err;
+    }
+
     worker->init_info();
     LOG_POS_COORD w_last= { const_cast<char*>(worker->get_group_master_log_name()),
                             worker->get_group_master_log_pos() };
@@ -4019,13 +4031,6 @@ bool mts_recovery_groups(Relay_log_info
         while(!eof);
         continue;
   */
-  Format_description_log_event fdle(BINLOG_VERSION), *p_fdle= &fdle;
-
-  if (!p_fdle->is_valid())
-  {
-    error= TRUE;
-    goto err;
-  }
 
   bitmap_clear_all(groups);
   rli->mts_recovery_group_cnt= 0;

No bundle (reason: useless for push emails).