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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
parent 2a4c573339 6cfd2ba397
commit b83c379420
381 changed files with 10233 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_error.h
View File

@@ -599,6 +599,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
@@ -1146,6 +1156,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(); }