bk commit into 4.0 tree (acurtis:1.2090) BUG#6616

[antony]

Below is the list of changes that have just been committed into a local
4.0 repository of acurtis. When acurtis 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
  1.2090 05/04/21 06:50:25 acurtis@stripped +2 -0
  Bug#6616 - MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
    Fix for race condition in lock

  BitKeeper/etc/logging_ok
    1.333 05/04/21 06:50:25 acurtis@stripped +1 -0
    Logging to logging@stripped accepted

  sql/lock.cc
    1.50 05/04/21 06:50:16 acurtis@stripped +3 -1
    Bug#6616
      abort only on new refreshes, don't need to check current thd version.

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug6616

--- 1.49/sql/lock.cc	2004-11-30 21:20:49 +00:00
+++ 1.50/sql/lock.cc	2005-04-21 06:50:16 +01:00
@@ -804,6 +804,7 @@
   (void) pthread_mutex_lock(&LOCK_open);
   if (need_exit_cond= must_wait)
   {
+    ulong version;
     if (thd->global_read_lock)		// This thread had the read locks
     {
       if (is_not_commit)
@@ -818,8 +819,9 @@
     }
     old_message=thd->enter_cond(&COND_refresh, &LOCK_open,
 				"Waiting for release of readlock");
+    version= refresh_version;
     while (must_wait && ! thd->killed &&
-	   (!abort_on_refresh || thd->version == refresh_version))
+	   (!abort_on_refresh || version == refresh_version))
       (void) pthread_cond_wait(&COND_refresh,&LOCK_open);
     if (thd->killed)
       result=1;

--- 1.332/BitKeeper/etc/logging_ok	2005-03-30 01:41:08 +01:00
+++ 1.333/BitKeeper/etc/logging_ok	2005-04-21 06:50:25 +01:00
@@ -6,6 +6,7 @@
 Miguel@stripped
 Sinisa@stripped
 acurtis@stripped
+acurtis@stripped
 ahlentz@stripped
 akishkin@stripped
 antony@stripped