database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

System Versioning pre1.0

Browse Source 
Merge branch '10.3' into trunk
This commit is contained in:
Aleksey Midenkov
2017-11-13 11:06:18 +03:00
parent d8d7251019 a48aa0cd56
commit 497c6add88
433 changed files with 16008 additions and 12469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_insert.cc
View File

@ -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));
@ -3429,7 +3429,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);