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

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-10 13:12:32 +02:00
parent fbfd44be3c c442e1ae21
commit 65a963f755
37 changed files with 309 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_error.h
View File

@ -725,6 +725,13 @@ private:
/** Reset the current row counter. Start counting from the first row. */
void reset_current_row_for_warning(int n) { m_current_row_for_warning= n; }
ulong set_current_row_for_warning(ulong row)
{
ulong old_row= m_current_row_for_warning;
m_current_row_for_warning= row;
return old_row;
}
/** Return the current counter value. */
ulong current_row_for_warning() const { return m_current_row_for_warning; }
@ -1139,6 +1146,9 @@ public:
void opt_clear_warning_info(ulonglong query_id)
{ get_warning_info()->opt_clear(query_id); }
long set_current_row_for_warning(long row)
{ return get_warning_info()->set_current_row_for_warning(row); }
ulong current_row_for_warning() const
{ return get_warning_info()->current_row_for_warning(); }