diff options
author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-10-17 16:24:31 +0530 |
---|---|---|
committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-10-18 11:08:25 +0530 |
commit | a1e5bdf87f50cd1f03c889a4be61ecef2da8f526 (patch) | |
tree | 324e265663cb83f473208794d82723df00191dfb /sql/sql_insert.cc | |
parent | c27f04ede5a92f37d0b22e5c90523bcccb1af37a (diff) | |
download | mariadb-git-bb-10.7-row_number-MDEV-26841.tar.gz |
MDEV-26841: ROW_NUMBER is not set and differs from the message uponbb-10.7-row_number-MDEV-26841
ER_WRONG_VALUE_COUNT_ON_ROW for the 1st row
Analysis: Current row for warning does not increment for prepare phase
Fix: Increment current row for warning if number of fields in the table and
row values dont match and number of values in rows is greater than number
of fields
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 3dff6722a3d..d3df63fe0e6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -229,6 +229,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, } if (values.elements != table->s->visible_fields) { + thd->get_stmt_da()->reset_current_row_for_warning(1); my_error(ER_WRONG_VALUE_COUNT_ON_ROW, MYF(0), 1L); DBUG_RETURN(-1); } @@ -253,6 +254,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, if (fields.elements != values.elements) { + thd->get_stmt_da()->reset_current_row_for_warning(1); my_error(ER_WRONG_VALUE_COUNT_ON_ROW, MYF(0), 1L); DBUG_RETURN(-1); } |