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 | 767501a9b1c89e17986d8089131d935d63420ad7 (patch) | |
| tree | b7a5df1540af07a49f7d577804919b7027fc4edf /sql/sql_delete.cc | |
| parent | 6bee08c61dbb89837edc04de8e49fed411f17770 (diff) | |
| parent | 4822696ecb7302efc543e0be109f1c2a8f1bdf4e (diff) | |
| download | mariadb-git-767501a9b1c89e17986d8089131d935d63420ad7.tar.gz | |
Merge community up to enterprise, thus ending the community-server
adventure.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index a757b7c28a5..7a48044877b 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -56,7 +56,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, table->file->print_error(error, MYF(0)); DBUG_RETURN(error); } - thd->proc_info="init"; + thd_proc_info(thd, "init"); table->map=1; if (mysql_prepare_delete(thd, table_list, &conds)) @@ -220,7 +220,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, deleted=0L; init_ftfuncs(thd, select_lex, 1); - thd->proc_info="updating"; + thd_proc_info(thd, "updating"); if (triggers_applicable) { @@ -288,7 +288,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, } killed_status= thd->killed; error= (killed_status == THD::NOT_KILLED)? error : 1; - thd->proc_info="end"; + thd_proc_info(thd, "end"); end_read_record(&info); free_io_cache(table); // Will not do any harm if (options & OPTION_QUICK) @@ -522,7 +522,7 @@ multi_delete::prepare(List<Item> &values, SELECT_LEX_UNIT *u) DBUG_ENTER("multi_delete::prepare"); unit= u; do_delete= 1; - thd->proc_info="deleting from main table"; + thd_proc_info(thd, "deleting from main table"); DBUG_RETURN(0); } @@ -823,7 +823,7 @@ int multi_delete::do_deletes() bool multi_delete::send_eof() { THD::killed_state killed_status= THD::NOT_KILLED; - thd->proc_info="deleting from reference tables"; + thd_proc_info(thd, "deleting from reference tables"); /* Does deletes for the last n - 1 tables, returns 0 if ok */ int local_error= do_deletes(); // returns 0 if success @@ -832,7 +832,7 @@ bool multi_delete::send_eof() local_error= local_error || error; killed_status= (local_error == 0)? THD::NOT_KILLED : thd->killed; /* reset used flags */ - thd->proc_info="end"; + thd_proc_info(thd, "end"); /* We must invalidate the query cache before binlog writing and @@ -979,7 +979,7 @@ end: /* Probably InnoDB table */ ulonglong save_options= thd->options; table_list->lock_type= TL_WRITE; - thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT); + thd->options&= ~(OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT); ha_enable_transaction(thd, FALSE); mysql_init_select(thd->lex); error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0, |