[Commits] 42dee20: return some clarity

Oleksandr Byelkin sanja at mariadb.com
Mon Oct 24 22:31:07 EEST 2016


revision-id: 42dee2037709eae5bff43af727c6fff9e4438f08 (mariadb-10.2.2-52-g42dee20)
parent(s): 1e9857cb13e4da647ddf32285c1c16771f6aded4
committer: Oleksandr Byelkin
timestamp: 2016-10-24 21:31:07 +0200
message:

return some clarity

---
 sql/sql_insert.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index a532a04..2fff06e 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -727,6 +727,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   THD_STAGE_INFO(thd, stage_init);
   thd->lex->used_tables=0;
   values= its++;
+  if (bulk_parameters_set(thd))
+    DBUG_RETURN(TRUE);
   value_count= values->elements;
 
   DBUG_ASSERT(bulk_iterations > 0);
@@ -1475,9 +1477,6 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
           check_insert_fields(thd, context->table_list, fields, *values,
                               !insert_into_view, 0, &map));
 
-    if (bulk_parameters_set(thd))
-      DBUG_RETURN(TRUE);
-
     if (!res && check_fields)
     {
       bool saved_abort_on_warning= thd->abort_on_warning;


More information about the commits mailing list