database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-26635 ROW_NUMBER is not 0 for errors not caused because of rows

Browse Source
This commit is contained in:
Sergei Golubchik
2021-10-02 20:50:18 +02:00
parent f845a98354
commit a398fcbff6
63 changed files with 383 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_insert.cc
View File

@ -842,7 +842,7 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list,
switch_to_nullable_trigger_fields(*values, table);
}
its.rewind ();
thd->get_stmt_da()->reset_current_row_for_warning();
thd->get_stmt_da()->reset_current_row_for_warning(1);
/* Restore the current context. */
ctx_state.restore_state(context, table_list);
@ -1684,6 +1684,8 @@ int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
ctx_state.restore_state(context, table_list);
}
thd->get_stmt_da()->reset_current_row_for_warning(1);
if (res)
DBUG_RETURN(res);