Merge branch '10.6' into 10.7

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/sql_error.h b/sql/sql_error.h
index d9d7f420baa..d7c29c5f9a4 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -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(); }