Merge branch '11.2' into 11.3

This commit is contained in:
Oleksandr Byelkin
2023-11-14 18:33:03 +01:00
618 changed files with 17156 additions and 9729 deletions

View File

@ -602,6 +602,16 @@ private:
*/
bool has_sql_condition(const char *message_str, size_t message_length) const;
/**
Checks if Warning_info contains SQL-condition with the given error id
@param sql_errno SQL-condition error number
@return true if the Warning_info contains an SQL-condition with the given
error id.
*/
bool has_sql_condition(uint sql_errno) const;
/**
Reset the warning information. Clear all warnings,
the number of warnings, reset current row counter
@ -1167,6 +1177,9 @@ public:
bool has_sql_condition(const char *message_str, size_t message_length) const
{ return get_warning_info()->has_sql_condition(message_str, message_length); }
bool has_sql_condition(uint sql_errno) const
{ return get_warning_info()->has_sql_condition(sql_errno); }
void reset_for_next_command()
{ get_warning_info()->reset_for_next_command(); }