bk commit into 5.1 tree (jonas:1.2026) BUG#21965

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-08 12:46:23+02:00, jonas@stripped +4 -0
  ndb -
    recommit bug#21965 only drop14c

  configure.in@stripped, 2006-09-08 12:46:21+02:00, jonas@stripped +2 -2
    drop 14c

  sql/log.cc@stripped, 2006-09-08 12:46:21+02:00, jonas@stripped +8 -3
    recommit bug#21965 only for drop14c

  sql/sql_class.h@stripped, 2006-09-08 12:46:21+02:00, jonas@stripped +1 -0
    recommit bug#21965 only for drop14c

  sql/sql_repl.cc@stripped, 2006-09-08 12:46:21+02:00, jonas@stripped +5 -1
    recommit bug#21965 only for drop14c

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop5p14b

--- 1.312/configure.in	2006-09-08 12:46:27 +02:00
+++ 1.313/configure.in	2006-09-08 12:46:27 +02:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p14b)
+AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p14c)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=1
 NDB_VERSION_BUILD=2
-NDB_VERSION_STATUS="a_drop5p14b"
+NDB_VERSION_STATUS="a_drop5p14c"
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4

--- 1.178/sql/log.cc	2006-09-08 12:46:27 +02:00
+++ 1.179/sql/log.cc	2006-09-08 12:46:27 +02:00
@@ -716,13 +716,18 @@
 int MYSQL_LOG::get_current_log(LOG_INFO* linfo)
 {
   pthread_mutex_lock(&LOCK_log);
+  int ret = raw_get_current_log(linfo);
+  pthread_mutex_unlock(&LOCK_log);
+  return ret;
+}
+
+int MYSQL_LOG::raw_get_current_log(LOG_INFO* linfo)
+{
   strmake(linfo->log_file_name, log_file_name, sizeof(linfo->log_file_name)-1);
   linfo->pos = my_b_tell(&log_file);
-  pthread_mutex_unlock(&LOCK_log);
   return 0;
 }
 
-
 /*
   Move all data up in a file in an filename index file
 
@@ -1406,9 +1411,9 @@
   my_free(old_name,MYF(0));
 
 end:
+  pthread_mutex_unlock(&LOCK_index);
   if (need_lock)
     pthread_mutex_unlock(&LOCK_log);
-  pthread_mutex_unlock(&LOCK_index);
 
   DBUG_VOID_RETURN;
 }

--- 1.268/sql/sql_class.h	2006-09-08 12:46:27 +02:00
+++ 1.269/sql/sql_class.h	2006-09-08 12:46:27 +02:00
@@ -357,6 +357,7 @@
 		   bool need_mutex);
   int find_next_log(LOG_INFO* linfo, bool need_mutex);
   int get_current_log(LOG_INFO* linfo);
+  int raw_get_current_log(LOG_INFO* linfo);
   uint next_file_id();
   inline bool is_open() { return log_type != LOG_CLOSED; }
   inline char* get_index_fname() { return index_file_name;}

--- 1.144/sql/sql_repl.cc	2006-09-08 12:46:27 +02:00
+++ 1.145/sql/sql_repl.cc	2006-09-08 12:46:27 +02:00
@@ -1515,10 +1515,14 @@
   if (protocol->send_fields(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
     DBUG_RETURN(TRUE);
+
+  pthread_mutex_lock(mysql_bin_log.get_log_lock());
   mysql_bin_log.lock_index();
   index_file=mysql_bin_log.get_index_file();
 
-  mysql_bin_log.get_current_log(&cur);
+  mysql_bin_log.raw_get_current_log(&cur);
+  pthread_mutex_unlock(mysql_bin_log.get_log_lock()); // lockdep, OK
+  
   cur_dir_len= dirname_length(cur.log_file_name);
 
   reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 0);