diff options
| author | unknown <baker@bk-internal.mysql.com> | 2007-01-14 04:09:38 +0100 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2007-01-14 04:09:38 +0100 |
| commit | 384b21216816181a26591ef269fd9f53c826c128 (patch) | |
| tree | 5978dd6f93d3c9ef71a3720893ad6ccd6dae18e8 /sql/sp_head.cc | |
| parent | 31e01f0a74dd4988ab0628ff0d1b832a190340fe (diff) | |
| parent | 46169fdc9b43e35dedf5f8ac43f6c6fb080bf336 (diff) | |
| download | mariadb-git-384b21216816181a26591ef269fd9f53c826c128.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-community
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index fb99ed1bb5c..c6e49fae801 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2387,9 +2387,9 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, m_lex->unit.cleanup(); - thd->proc_info="closing tables"; + THD_PROC_INFO(thd, "closing tables"); close_thread_tables(thd); - thd->proc_info= 0; + THD_PROC_INFO(thd, 0); if (m_lex->query_tables_own_last) { |