bzr commit into mysql-6.0-rpl branch (zhenxing.he:2846) Bug#44058

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/b44058/6.0-rpl/ based on revid:luis.soares@stripped

 2846 He Zhenxing	2009-05-08
      BUG#44058 Possible semi-sync replication bugs
      
      Fix previous patch.
      
      Move thd_enter_cond/thd_exit_cond from plugin.h to replication.h

    M  include/mysql/plugin.h
    M  include/mysql/plugin.h.pp
    M  sql/replication.h
    M  sql/sql_class.h
=== modified file 'include/mysql/plugin.h'
--- a/include/mysql/plugin.h	2009-04-29 09:23:18 +0000
+++ b/include/mysql/plugin.h	2009-05-08 07:49:21 +0000
@@ -699,34 +699,6 @@ int get_user_var_str(const char *name,
                      char *value, unsigned long len,
                      unsigned int precision, int *null_value);
 
-/**
-   Set thread entering a condition
-
-   This function should be called before putting a thread to wait for
-   a condition. @a mutex should be held before calling this
-   function. After being waken up, @f thd_exit_cond should be called.
-
-   @param thd      The thread entering the condition, NULL means current thread
-   @param cond     The condition the thread is going to wait for
-   @param mutex    The mutex associated with the condition, this must be
-                   held before call this function
-   @param msg      The new process message for the thread
-*/
-const char* thd_enter_cond(MYSQL_THD thd, pthread_cond_t *cond,
-                           pthread_mutex_t *mutex, const char *msg);
-
-/**
-   Set thread leaving a condition
-
-   This function should be called after a thread being waken up for a
-   condition.
-
-   @param thd      The thread entering the condition, NULL means current thread
-   @param old_msg  The process message, ususally this should be the old process
-                   message before calling @f thd_enter_cond
-*/
-void thd_exit_cond(MYSQL_THD thd, const char *old_msg);
-
   
 #ifdef __cplusplus
 }

=== modified file 'include/mysql/plugin.h.pp'
--- a/include/mysql/plugin.h.pp	2009-04-29 09:23:18 +0000
+++ b/include/mysql/plugin.h.pp	2009-05-08 07:49:21 +0000
@@ -152,6 +152,3 @@ int get_user_var_real(const char *name,
 int get_user_var_str(const char *name,
                      char *value, unsigned long len,
                      unsigned int precision, int *null_value);
-const char* thd_enter_cond(void* thd, pthread_cond_t *cond,
-                           pthread_mutex_t *mutex, const char *msg);
-void thd_exit_cond(void* thd, const char *old_msg);

=== modified file 'sql/replication.h'
--- a/sql/replication.h	2008-09-23 15:06:18 +0000
+++ b/sql/replication.h	2009-05-08 07:49:21 +0000
@@ -455,6 +455,35 @@ int unregister_binlog_relay_io_observer(
 */
 MYSQL *rpl_connect_master(MYSQL *mysql);
 
+/**
+   Set thread entering a condition
+
+   This function should be called before putting a thread to wait for
+   a condition. @a mutex should be held before calling this
+   function. After being waken up, @f thd_exit_cond should be called.
+
+   @param thd      The thread entering the condition, NULL means current thread
+   @param cond     The condition the thread is going to wait for
+   @param mutex    The mutex associated with the condition, this must be
+                   held before call this function
+   @param msg      The new process message for the thread
+*/
+const char* thd_enter_cond(MYSQL_THD thd, pthread_cond_t *cond,
+                           pthread_mutex_t *mutex, const char *msg);
+
+/**
+   Set thread leaving a condition
+
+   This function should be called after a thread being waken up for a
+   condition.
+
+   @param thd      The thread entering the condition, NULL means current thread
+   @param old_msg  The process message, ususally this should be the old process
+                   message before calling @f thd_enter_cond
+*/
+void thd_exit_cond(MYSQL_THD thd, const char *old_msg);
+
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2009-05-07 11:44:40 +0000
+++ b/sql/sql_class.h	2009-05-08 07:49:21 +0000
@@ -24,7 +24,7 @@
 #include "log.h"
 #include "rpl_tblmap.h"
 #include "mdl.h"
-
+#include "replication.h"
 
 #include <waiting_threads.h>
 


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