diff options
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 3b6aa5f1aa2..6d3e29516ba 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -167,7 +167,7 @@ int mysql_update(THD *thd, mysql_handle_derived(thd->lex, &mysql_derived_filling))) DBUG_RETURN(1); - thd->proc_info="init"; + THD_PROC_INFO(thd, "init"); table= table_list->table; table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); @@ -359,7 +359,7 @@ int mysql_update(THD *thd, else init_read_record_idx(&info, thd, table, 1, used_index); - thd->proc_info="Searching rows for update"; + THD_PROC_INFO(thd, "Searching rows for update"); uint tmp_limit= limit; while (!(error=info.read_record(&info)) && !thd->killed) @@ -424,7 +424,7 @@ int mysql_update(THD *thd, updated= found= 0; thd->count_cuted_fields= CHECK_FIELD_WARN; /* calc cuted fields */ thd->cuted_fields=0L; - thd->proc_info="Updating"; + THD_PROC_INFO(thd, "Updating"); query_id=thd->query_id; transactional_table= table->file->has_transactions(); @@ -512,7 +512,7 @@ int mysql_update(THD *thd, end_read_record(&info); free_io_cache(table); // If ORDER BY delete select; - thd->proc_info="end"; + THD_PROC_INFO(thd, "end"); VOID(table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY)); /* @@ -960,7 +960,7 @@ int multi_update::prepare(List<Item> ¬_used_values, thd->count_cuted_fields= CHECK_FIELD_WARN; thd->cuted_fields=0L; - thd->proc_info="updating main table"; + THD_PROC_INFO(thd, "updating main table"); tables_to_update= get_table_map(fields); @@ -1512,11 +1512,11 @@ err2: bool multi_update::send_eof() { char buff[STRING_BUFFER_USUAL_SIZE]; - thd->proc_info="updating reference tables"; + THD_PROC_INFO(thd, "updating reference tables"); /* Does updates for the last n - 1 tables, returns 0 if ok */ int local_error = (table_count) ? do_updates(0) : 0; - thd->proc_info= "end"; + THD_PROC_INFO(thd, "end"); /* We must invalidate the query cache before binlog writing and ha_autocommit_... */ |