bk commit into 4.0 tree

[monty]

Below is the list of changes that have just been committed into a local
4.0 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1428 02/11/21 02:13:37 monty@stripped +1 -0
  Added 'table lock' state while MySQL is waiting to get locks for tables.

  sql/lock.cc
    1.41 02/11/21 02:13:35 monty@stripped +3 -1
    Added 'table lock' state while MySQL is waiting to get locks for tables.

# 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:	mashka.mysql.fi
# Root:	/home/my/mysql-4.0

--- 1.40/sql/lock.cc	Sat Nov 16 20:19:07 2002
+++ 1.41/sql/lock.cc	Thu Nov 21 02:13:35 2002
@@ -117,7 +117,7 @@
       thd->proc_info=0;
       break;
     }
-    thd->proc_info=0;
+    thd->proc_info="Table lock";
     thd->locked=1;
     if (thr_multi_lock(sql_lock->locks,sql_lock->lock_count))
     {
@@ -136,6 +136,7 @@
       thd->locked=0;
       break;
     }
+    thd->proc_info=0;
 
     /* some table was altered or deleted. reopen tables marked deleted */
     mysql_unlock_tables(thd,sql_lock);
@@ -145,6 +146,7 @@
     if (wait_for_tables(thd))
       break;					// Couldn't open tables
   }
+  thd->proc_info=0;
   if (thd->killed)
   {
     my_error(ER_SERVER_SHUTDOWN,MYF(0));