diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-06-23 13:42:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-06-23 13:42:11 +0200 |
| commit | e0793d386517f4ff9c0267830d558f91c75263aa (patch) | |
| tree | d8b9322b4e3ea19bdce5e6be74755901fe0f8107 /sql | |
| parent | 37c88445e30d52c965bcb19b19fa710c3eb4fad9 (diff) | |
| download | mariadb-git-e0793d386517f4ff9c0267830d558f91c75263aa.tar.gz | |
Fix result of merge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 1 insertions, 5 deletions
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. |