diff options
author | Sergei Golubchik <serg@mariadb.org> | 2021-09-15 15:54:49 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2021-09-16 13:38:48 +0200 |
commit | d552e092c9f3e20da078d1b62b976f629f73d3a4 (patch) | |
tree | 1ad8172027bcd1d5c06fe2dd3d6acb2aa4fcb99c /sql/sql_signal.cc | |
parent | 0ff8976e129a0e1f3f17a6ed278ddc4851b4535d (diff) | |
download | mariadb-git-d552e092c9f3e20da078d1b62b976f629f73d3a4.tar.gz |
MDEV-10075: Provide index of error causing error in array INSERT
use existing Warning_info::m_current_row_for_warning instead
of a newly introduced counter.
But use m_current_row_for_warning to count rows also in the parser
and during prepare.
Diffstat (limited to 'sql/sql_signal.cc')
-rw-r--r-- | sql/sql_signal.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc index 5a085c99de7..e023923bd1a 100644 --- a/sql/sql_signal.cc +++ b/sql/sql_signal.cc @@ -419,7 +419,8 @@ bool Sql_cmd_resignal::execute(THD *thd) DBUG_RETURN(result); } - Sql_condition signaled_err(thd->mem_root, *signaled, signaled->message, 0); + Sql_condition signaled_err(thd->mem_root, *signaled, signaled->message, + da->current_row_for_warning()); if (m_cond) { |