From c43a666662ac71e70bde83e6673ebcb2811887af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Thu, 2 Jul 2020 06:04:42 +0300
Subject: [PATCH] Revert "Fix result of merge."

This reverts commit e0793d386517f4ff9c0267830d558f91c75263aa.

In idiomatic C++, accessor functions should not discard qualifiers.
---
 sql/sql_class.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 4d14b42b065..7ca3896a69d 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3408,7 +3408,11 @@ public:
   inline bool is_error() const { return m_stmt_da->is_error(); }
 
   /// Returns Diagnostics-area for the current statement.
-  Diagnostics_area *get_stmt_da() const
+  Diagnostics_area *get_stmt_da()
+  { return m_stmt_da; }
+
+  /// Returns Diagnostics-area for the current statement.
+  const Diagnostics_area *get_stmt_da() const
   { return m_stmt_da; }
 
   /// Sets Diagnostics-area for the current statement.