diff options
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 d02bc89068e..ac290a50b9b 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -54,7 +54,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(thd, "init"); + thd_proc_info(thd, "init"); table->map=1; if (mysql_prepare_delete(thd, table_list, &conds)) @@ -205,7 +205,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, deleted=0L; init_ftfuncs(thd, select_lex, 1); - THD_PROC_INFO(thd, "updating"); + thd_proc_info(thd, "updating"); if (table->triggers) table->triggers->mark_fields_used(thd, TRG_EVENT_DELETE); @@ -261,7 +261,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, } if (thd->killed && !error) error= 1; // Aborted - THD_PROC_INFO(thd, "end"); + thd_proc_info(thd, "end"); end_read_record(&info); free_io_cache(table); // Will not do any harm if (options & OPTION_QUICK) @@ -485,7 +485,7 @@ multi_delete::prepare(List<Item> &values, SELECT_LEX_UNIT *u) DBUG_ENTER("multi_delete::prepare"); unit= u; do_delete= 1; - THD_PROC_INFO(thd, "deleting from main table"); + thd_proc_info(thd, "deleting from main table"); DBUG_RETURN(0); } @@ -749,7 +749,7 @@ int multi_delete::do_deletes() bool multi_delete::send_eof() { - THD_PROC_INFO(thd, "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 @@ -758,7 +758,7 @@ bool multi_delete::send_eof() local_error= local_error || error; /* reset used flags */ - THD_PROC_INFO(thd, "end"); + thd_proc_info(thd, "end"); /* We must invalidate the query cache before binlog writing and @@ -903,7 +903,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, |