diff options
| author | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
| commit | 128afdc3e5d06381f525e0d9cdc2df7c497e886c (patch) | |
| tree | b7a5df1540af07a49f7d577804919b7027fc4edf /sql/sql_update.cc | |
| parent | 0f95bd31058f21f0872191eac49809622725564d (diff) | |
| parent | 9d58239dea8c615a10a0939e34d052b22808e75f (diff) | |
| download | mariadb-git-128afdc3e5d06381f525e0d9cdc2df7c497e886c.tar.gz | |
Merge community up to enterprise, thus ending the community-server
adventure.
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 0da0b6e6635..69f876ace39 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -165,7 +165,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); @@ -362,7 +362,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"); ha_rows tmp_limit= limit; while (!(error=info.read_record(&info)) && !thd->killed) @@ -427,7 +427,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(); @@ -543,7 +543,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)); /* @@ -1033,7 +1033,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); @@ -1762,7 +1762,7 @@ bool multi_update::send_eof() { char buff[STRING_BUFFER_USUAL_SIZE]; THD::killed_state killed_status= THD::NOT_KILLED; - 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; @@ -1774,7 +1774,7 @@ bool multi_update::send_eof() later carried out killing should not affect binlogging. */ killed_status= (local_error == 0)? THD::NOT_KILLED : thd->killed; - thd->proc_info= "end"; + thd_proc_info(thd, "end"); /* We must invalidate the query cache before binlog writing and ha_autocommit_... */ |