diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:04:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:04:42 +0300 |
| commit | c43a666662ac71e70bde83e6673ebcb2811887af (patch) | |
| tree | 750d8a800260b1e78e66e3ac3c5ddca76a488c6b | |
| parent | 90d1e58ed0a148cf850f187e948e9ca24ab3a88d (diff) | |
| download | mariadb-git-c43a666662ac71e70bde83e6673ebcb2811887af.tar.gz | |
Revert "Fix result of merge."
This reverts commit e0793d386517f4ff9c0267830d558f91c75263aa.
In idiomatic C++, accessor functions should not discard qualifiers.
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 5 insertions, 1 deletions
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. |