Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl

into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index fada45722f6..b4c6a4bf7c5 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -19,6 +19,7 @@
 #define MAX_SLAVE_ERRMSG      1024
 
 #include "rpl_tblmap.h"
+#include "rpl_reporting.h"
 
 struct RPL_TABLE_LIST;
 
@@ -49,7 +50,7 @@ struct RPL_TABLE_LIST;
 
 *****************************************************************************/
 
-typedef struct st_relay_log_info
+typedef struct st_relay_log_info : public Slave_reporting_capability
 {
   /**
      Flags for the state of the replication.
@@ -186,7 +187,6 @@ typedef struct st_relay_log_info
 
   time_t last_master_timestamp;
 
-  void clear_slave_error();
   void clear_until_condition();
 
   /*
@@ -200,11 +200,9 @@ typedef struct st_relay_log_info
   pthread_mutex_t log_space_lock;
   pthread_cond_t log_space_cond;
   THD * sql_thd;
-  int last_slave_errno;
 #ifndef DBUG_OFF
   int events_till_abort;
 #endif  
-  char last_slave_error[MAX_SLAVE_ERRMSG];
 
   /* if not set, the value of other members of the structure are undefined */
   bool inited;