diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 11:32:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 12:03:55 +0300 |
| commit | ea2bc974dce2ac509011807c80b36192cd18f686 (patch) | |
| tree | afbed3c29a2af90c44af2f086c6eb0d83c909840 /sql/sql_class.h | |
| parent | fbfb5b5f68a428ec819bc09d14b30cebf660b37b (diff) | |
| parent | 1ea266f3ef36e779d23697b18cb94e1b0f8e65ef (diff) | |
| download | mariadb-git-ea2bc974dce2ac509011807c80b36192cd18f686.tar.gz | |
Merge 10.1 into 10.2bb-10.2-merge
Diffstat (limited to 'sql/sql_class.h')
| -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 838998af94f..1e4f0225397 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3610,11 +3610,7 @@ public: bool is_bulk_op() const { return MY_TEST(bulk_param); } /// 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. |