merge with mysql-5.5.21

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index 520b2b58bb9..fef910de65d 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -140,15 +140,13 @@ public:
     standard lock acquisition order to avoid deadlocks:
     run_lock, data_lock, relay_log.LOCK_log, relay_log.LOCK_index
   */
-  mysql_mutex_t data_lock, run_lock;
-
+  mysql_mutex_t data_lock, run_lock, sleep_lock;
   /*
     start_cond is broadcast when SQL thread is started
     stop_cond - when stopped
     data_cond - when data protected by data_lock changes
   */
-  mysql_cond_t start_cond, stop_cond, data_cond;
-
+  mysql_cond_t start_cond, stop_cond, data_cond, sleep_cond;
   /* parent Master_info structure */
   Master_info *mi;