Skip to content

M
MariaDB
Commit e0793d38 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin
Browse files
Options

Fix result of merge.

parent 37c88445
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
sql/sql_class.h
View file @ e0793d38
...@@ -3408,11 +3408,7 @@ class THD :public Statement, ...@@ -3408,11 +3408,7 @@ class THD :public Statement,
inline bool is_error() const { return m_stmt_da->is_error(); } inline bool is_error() const { return m_stmt_da->is_error(); }
/// Returns Diagnostics-area for the current statement. /// Returns Diagnostics-area for the current statement.
Diagnostics_area *get_stmt_da() Diagnostics_area *get_stmt_da() const
{ return m_stmt_da; }
/// Returns Diagnostics-area for the current statement.
const Diagnostics_area *get_stmt_da() const
{ return m_stmt_da; } { return m_stmt_da; }
/// Sets Diagnostics-area for the current statement. /// Sets Diagnostics-area for the current statement.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7