summaryrefslogtreecommitdiff
path: root/sql/sql_error.h
diff options
context:
space:
mode:
authorRucha Deodhar <rucha.deodhar@mariadb.com>2021-09-26 11:14:49 +0530
committerRucha Deodhar <rucha.deodhar@mariadb.com>2021-09-26 19:47:02 +0530
commit159700376b6d98597361e75c819b7dc642a7fddd (patch)
treee32d3f7b396ba8a7ae81ecff92485c84acf5c1b3 /sql/sql_error.h
parentbe09524b00248393bba5f0b0a9385c17edf76365 (diff)
downloadmariadb-git-bb-10.7-MDEV-26684.tar.gz
MDEV-26684: Unexpected ERROR_INDEX in a condition raised by a diagnosticsbb-10.7-MDEV-26684
statement Not repeatable after MDEV-26606. Test case added.
Diffstat (limited to 'sql/sql_error.h')
-rw-r--r--sql/sql_error.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h
index 0b7319a1e82..a3e00e8419d 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -748,7 +748,7 @@ private:
Sql_condition *push_warning(THD *thd,
const Sql_condition_identity *identity,
const char* msg,
- ulonglong current_error_index);
+ ulong current_error_index);
/**
Add a new SQL-condition to the current list and increment the respective
@@ -1180,7 +1180,7 @@ public:
Sql_condition::enum_warning_level level,
const Sql_user_condition_identity &ucid,
const char* msg,
- ulonglong current_error_index)
+ ulong current_error_index)
{
Sql_condition_identity tmp(sql_errno_arg, sqlstate, level, ucid);
return get_warning_info()->push_warning(thd, &tmp, msg,