diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
| commit | a48aa0cd569eda88bef98ed4abe41b0b570fcd51 (patch) | |
| tree | 6008b19aabfe0554432c87614d1022594f08fc5f /sql/sql_insert.cc | |
| parent | 8409f721ffe2d91b11d3fc03c6872ff57051bbf8 (diff) | |
| parent | 386e5d476e9bf8f216c760c9076ae0ecdc99054d (diff) | |
| download | mariadb-git-a48aa0cd569eda88bef98ed4abe41b0b570fcd51.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index b12b470209c..32695a450c4 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -761,9 +761,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, DBUG_RETURN(TRUE); } + THD_STAGE_INFO(thd, stage_init_update); lock_type= table_list->lock_type; - - THD_STAGE_INFO(thd, stage_init); thd->lex->used_tables=0; values= its++; if (bulk_parameters_set(thd)) @@ -860,7 +859,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, #endif error=0; - THD_STAGE_INFO(thd, stage_update); if (duplic == DUP_REPLACE && (!table->triggers || !table->triggers->has_delete_triggers())) table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE); @@ -940,6 +938,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, goto values_loop_end; } } + + THD_STAGE_INFO(thd, stage_update); do { DBUG_PRINT("info", ("iteration %llu", iteration)); @@ -3357,7 +3357,7 @@ bool Delayed_insert::handle_inserts(void) } if (WSREP((&thd))) - thd_proc_info(&thd, "insert done"); + thd_proc_info(&thd, "Insert done"); else thd_proc_info(&thd, 0); mysql_mutex_unlock(&mutex); |