bk commit into 4.1 tree (monty:1.2322)

[monty]

Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty 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.2322 05/06/07 16:34:10 monty@stripped +2 -0
  Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1

  myisam/mi_check.c
    1.147 05/06/07 16:34:09 monty@stripped +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.398 05/06/07 16:33:37 monty@stripped +0 -1
    auto-union

# 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:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-4.1/RESYNC

--- 1.146/myisam/mi_check.c	2005-05-14 01:21:43 +03:00
+++ 1.147/myisam/mi_check.c	2005-06-07 16:34:09 +03:00
@@ -3870,6 +3870,14 @@
       if (!share->state.create_time)
 	share->state.create_time=share->state.check_time;
     }
+    /*
+      When tables are locked we haven't synched the share state and the
+      real state for a while so we better do it here before synching
+      the share state to disk. Only when table is write locked is it
+      necessary to perform this synch.
+    */
+    if (info->lock_type == F_WRLCK)
+      share->state.state= *info->state;
     if (mi_state_info_write(share->kfile,&share->state,1+2))
       goto err;
     share->changed=0;