From 5022e56cba7936e17cd5deefc570bcef0ddb0988 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Wed, 11 Dec 2002 15:46:39 +0200
Subject: Ensure that BEGIN / COMMIT is handled properly if slave dies Added
 syntax support for CREATE TABLE foo (a char CHARACTER SET latin1)
 CHARSET=latin1;

---
 sql/slave.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'sql/slave.cc')

diff --git a/sql/slave.cc b/sql/slave.cc
index eb53e488856..a4e0b029bbf 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2711,7 +2711,12 @@ static IO_CACHE *reopen_relay_log(RELAY_LOG_INFO *rli, const char **errmsg)
   if ((rli->cur_log_fd=open_binlog(cur_log,rli->relay_log_name,
 				   errmsg)) <0)
     DBUG_RETURN(0);
-  my_b_seek(cur_log,rli->relay_log_pos);
+  /*
+    We want to start exactly where we was before:
+    relay_log_pos	Current log pos
+    pending		Number of bytes already processed from the event
+  */
+  my_b_seek(cur_log,rli->relay_log_pos + rli->pending);
   DBUG_RETURN(cur_log);
 }
 
-- 
cgit v1.2.1


From b5aa9ae0c768c92321e99939f5533bcce8382366 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Fri, 20 Dec 2002 14:58:27 +0200
Subject: Changed thd variables max_join_size and select_limit to type ha_rows.
 This fixed some optimization problems when using -DBIG_TABLES Portabilty
 fixes for OpenUnix and HPUX Added C and C++ version numbers to mysqlbug

---
 sql/slave.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/slave.cc')

diff --git a/sql/slave.cc b/sql/slave.cc
index a4e0b029bbf..d254221e726 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1548,7 +1548,7 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
   VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
 #endif
 
-  if ((ulong) thd->variables.max_join_size == (ulong) HA_POS_ERROR)
+  if (thd->variables.max_join_size == HA_POS_ERROR)
     thd->options |= OPTION_BIG_SELECTS;
 
   if (thd_type == SLAVE_THD_SQL)
-- 
cgit v1.2.1


From ee59eb241854e05d522236f6ae89cff54b82012f Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Tue, 7 Jan 2003 16:53:10 +0200
Subject: Portability fixes Fixed test suite for HPUX 10.20 and MacOSX

---
 sql/slave.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sql/slave.cc')

diff --git a/sql/slave.cc b/sql/slave.cc
index d254221e726..455b574b355 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -376,6 +376,7 @@ int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock)
   }
   if ((thread_mask & (SLAVE_IO|SLAVE_FORCE_ALL)) && mi->slave_running)
   {
+    DBUG_PRINT("info",("Terminating IO thread"));
     mi->abort_slave=1;
     if ((error=terminate_slave_thread(mi->io_thd,io_lock,
 				        io_cond_lock,
@@ -386,6 +387,7 @@ int terminate_slave_threads(MASTER_INFO* mi,int thread_mask,bool skip_lock)
   }
   if ((thread_mask & (SLAVE_SQL|SLAVE_FORCE_ALL)) && mi->rli.slave_running)
   {
+    DBUG_PRINT("info",("Terminating SQL thread"));
     DBUG_ASSERT(mi->rli.sql_thd != 0) ;
     mi->rli.abort_slave=1;
     if ((error=terminate_slave_thread(mi->rli.sql_thd,sql_lock,
-- 
cgit v1.2.1


From 89ef355b9e8844d6da47da788adcf2249ee8fa77 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Wed, 8 Jan 2003 11:24:39 +0200
Subject: Fix for bug in LOAD DATA INFILE and replication Fix for SHOW
 VARIABLES in embedded server

---
 sql/slave.cc | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'sql/slave.cc')

diff --git a/sql/slave.cc b/sql/slave.cc
index 455b574b355..b8689a28a54 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2343,12 +2343,6 @@ static int process_io_rotate(MASTER_INFO *mi, Rotate_log_event *rev)
 
   memcpy(mi->master_log_name, rev->new_log_ident, rev->ident_len+1);
   mi->master_log_pos= rev->pos;
-
-  pthread_mutex_lock(&mi->rli.data_lock);
-  memcpy(mi->rli.master_log_name, rev->new_log_ident, rev->ident_len+1);
-  mi->rli.master_log_pos= rev->pos;
-  pthread_mutex_unlock(&mi->rli.data_lock);
-
   DBUG_PRINT("info", ("master_log_pos: '%s' %d",
 		      mi->master_log_name, (ulong) mi->master_log_pos));
 #ifndef DBUG_OFF
-- 
cgit v1.2.1