diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-09-10 08:06:27 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-09-10 08:06:27 -0400 |
| commit | cf74e43f1583a81016f0ce6cbbe087b38853b5cd (patch) | |
| tree | 778fee9432c6a68f033c652aa8b4d32b49a0e4f3 /sql/lock.cc | |
| parent | f4b671d8bc1ab80342918820a2bc841c5542d57d (diff) | |
| parent | 1f1d673200b312b85739f455c74c25c399f1cc93 (diff) | |
| download | mariadb-git-cf74e43f1583a81016f0ce6cbbe087b38853b5cd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index cf06be5f95f..d0576202606 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -150,7 +150,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, } } - thd->proc_info="System lock"; + thd_proc_info(thd, "System lock"); if (sql_lock->table_count && lock_external(thd, sql_lock->table, sql_lock->table_count)) { @@ -160,7 +160,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, sql_lock=0; break; } - thd->proc_info="Table lock"; + thd_proc_info(thd, "Table lock"); thd->locked=1; /* Copy the lock data array. thr_multi_lock() reorders its contens. */ memcpy(sql_lock->locks + sql_lock->lock_count, sql_lock->locks, @@ -203,7 +203,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, thd->locked=0; break; } - thd->proc_info=0; + thd_proc_info(thd, 0); /* some table was altered or deleted. reopen tables marked deleted */ mysql_unlock_tables(thd,sql_lock); @@ -218,7 +218,7 @@ retry: if (wait_for_tables(thd)) break; // Couldn't open tables } - thd->proc_info=0; + thd_proc_info(thd, 0); if (thd->killed) { thd->send_kill_message(); |