From e0793d386517f4ff9c0267830d558f91c75263aa Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Tue, 23 Jun 2020 13:42:11 +0200 Subject: Fix result of merge. --- sql/sql_class.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sql/sql_class.h') diff --git a/sql/sql_class.h b/sql/sql_class.h index 7ca3896a69d..4d14b42b065 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3408,11 +3408,7 @@ public: inline bool is_error() const { return m_stmt_da->is_error(); } /// Returns Diagnostics-area for the current statement. - Diagnostics_area *get_stmt_da() - { return m_stmt_da; } - - /// Returns Diagnostics-area for the current statement. - const Diagnostics_area *get_stmt_da() const + Diagnostics_area *get_stmt_da() const { return m_stmt_da; } /// Sets Diagnostics-area for the current statement. -- cgit v1.2.1