summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-11-21 02:13:37 +0200
committerunknown <monty@mashka.mysql.fi>2002-11-21 02:13:37 +0200
commita407ebd3e8f3b7d5dfccd9c94775ad47b05a0771 (patch)
tree029150b75acb7f0bcc518241e0a762125b60f14a /sql/lock.cc
parent910849ccd1f5f24e90de0f48091a4c6981c71126 (diff)
downloadmariadb-git-a407ebd3e8f3b7d5dfccd9c94775ad47b05a0771.tar.gz
Added 'table lock' state while MySQL is waiting to get locks for tables.
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index 15878fe7d15..4c84bbb6e69 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -117,7 +117,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count)
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 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count)
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 @@ retry:
if (wait_for_tables(thd))
break; // Couldn't open tables
}
+ thd->proc_info=0;
if (thd->killed)
{
my_error(ER_SERVER_SHUTDOWN,MYF(0));