post-merge fixes

sql/slave.cc:
  add mutex protection, like in sql_parse.cc

4 files changed, 10 insertions, 3 deletions

diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def
index 6536c0221f8..46309c92bbe 100644
--- a/mysql-test/suite/innodb/t/disabled.def
+++ b/mysql-test/suite/innodb/t/disabled.def
@@ -10,6 +10,7 @@
 #
 ##############################################################################
 
-#innodb_bug53756 : Waiting for merge with Percona Server; bug fixed in innodb_plugin in MySQL 5.1.50
+innodb_bug13635833: Disabled until merging with XtraDB 5.1.63
+
 innodb-lock:  Disabled until merging with XtraDB 5.1.60
 innodb_replace:  Disabled until merging with XtraDB 5.1.60
diff --git a/mysql-test/suite/innodb_plugin/t/disabled.def b/mysql-test/suite/innodb_plugin/t/disabled.def
index 72fec47a09a..a8f74a04a53 100644
--- a/mysql-test/suite/innodb_plugin/t/disabled.def
+++ b/mysql-test/suite/innodb_plugin/t/disabled.def
@@ -10,7 +10,10 @@
 #
 ##############################################################################
 
+innodb_bug13635833: Disabled until merging with XtraDB 5.1.63
+
 innodb_bug52745: Disabled as this has valgrind failures (also in MySQL 5.1.50)
 innodb-index:    Disabled until merging with XtraDB 5.1.60
 innodb-lock:     Disabled until merging with XtraDB 5.1.60
 innodb_replace:  Disabled until merging with XtraDB 5.1.60
+innodb-blob:     Disabled until merging with XtraDB 5.1.63
diff --git a/mysql-test/suite/innodb_plugin/t/innodb-blob.test b/mysql-test/suite/innodb_plugin/t/innodb-blob.test
index eb2bc13d609..7d2968c720d 100644
--- a/mysql-test/suite/innodb_plugin/t/innodb-blob.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-blob.test
@@ -3,7 +3,6 @@
 # columns are stored off-page.
 
 --source include/have_innodb_plugin.inc
-skip Not fixed in XtraDB yet;
 
 # DEBUG_SYNC must be compiled in.
 --source include/have_debug_sync.inc
diff --git a/sql/slave.cc b/sql/slave.cc
index e793061b844..41068ffa211 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1451,7 +1451,9 @@ Waiting for the slave SQL thread to free enough relay log space");
 #endif
     if (rli->sql_force_rotate_relay)
     {
+      pthread_mutex_lock(&active_mi->data_lock);
       rotate_relay_log(rli->mi);
+      pthread_mutex_unlock(&active_mi->data_lock);
       rli->sql_force_rotate_relay= false;
     }
 
@@ -4531,7 +4533,6 @@ int rotate_relay_log(Master_info* mi)
   DBUG_ENTER("rotate_relay_log");
   Relay_log_info* rli= &mi->rli;
   int error= 0;
-  safe_mutex_assert_owner(&mi->data_lock);
 
   /*
      We need to test inited because otherwise, new_file() will attempt to lock
@@ -4559,7 +4560,10 @@ int rotate_relay_log(Master_info* mi)
     output in SHOW SLAVE STATUS meanwhile. So we harvest now.
     If the log is closed, then this will just harvest the last writes, probably
     0 as they probably have been harvested.
+
+    Note that it needs to be protected by mi->data_lock.
   */
+  safe_mutex_assert_owner(&mi->data_lock);
   rli->relay_log.harvest_bytes_written(&rli->log_space_total);
 end:
   DBUG_RETURN(error);