diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-04-27 16:45:01 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-04-27 16:45:01 -0400 |
| commit | 4687fe01d7e3ff566e045b1f538562412f4f4c00 (patch) | |
| tree | dc6a3a60b71e4a3cbaadb6dc739d736ab8014ac5 /sql/lock.cc | |
| parent | 3a58af9c0db3a3e34453fe1689ca4287be9b396a (diff) | |
| parent | 1698b4f2ddbb61aa4f3ad69e941bac688822d00d (diff) | |
| download | mariadb-git-4687fe01d7e3ff566e045b1f538562412f4f4c00.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02
BitKeeper/etc/collapsed:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
include/config-win.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/mysqlcheck.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
include/my_dbug.h:
Manual merge.
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/r/information_schema_db.result:
Manual merge.
mysql-test/r/mysqlshow.result:
Manual merge.
sql/Makefile.am:
Manual merge.
sql/lex.h:
Manual merge.
sql/lock.cc:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/set_var.cc:
Manual merge.
sql/slave.cc:
Manual merge.
sql/sql_base.cc:
Manual merge.
sql/sql_delete.cc:
Manual merge.
sql/sql_insert.cc:
Manual merge.
sql/sql_lex.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_update.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
sql/structs.h:
Manual merge.
sql/table.h:
Manual merge.
storage/archive/ha_archive.cc:
Manual merge.
storage/ndb/src/common/util/File.cpp:
Manual merge.
storage/ndb/src/ndbapi/DictCache.cpp:
Manual merge.
support-files/mysql.spec.sh:
Manual merge.
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 4427e57a938..4ce8f4a968d 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -167,7 +167,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, break; } - thd->proc_info="System lock"; + thd_proc_info(thd, "System lock"); DBUG_PRINT("info", ("thd->proc_info %s", thd->proc_info)); if (lock_external(thd, tables, count)) { @@ -177,7 +177,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"); DBUG_PRINT("info", ("thd->proc_info %s", thd->proc_info)); thd->locked=1; /* Copy the lock data array. thr_multi_lock() reorders its contens. */ @@ -212,7 +212,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); @@ -227,7 +227,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(); |