diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
| commit | beded7d9c9592ca8fdfc367f7c64f89c35995c44 (patch) | |
| tree | a215a54ed5043bb17fe7d69a69439e05b21682d5 /sql/sql_error.cc | |
| parent | af71da5d2f90c82b2357e808640003907c488bc2 (diff) | |
| parent | 2553f143fdeb9068eb02a8fda58750c24071f5ef (diff) | |
| download | mariadb-git-beded7d9c9592ca8fdfc367f7c64f89c35995c44.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 47f24ad9cb8..b72d642efbc 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -510,8 +510,10 @@ Diagnostics_area::set_error_status(uint sql_errno, void Diagnostics_area::disable_status() { + DBUG_ENTER("disable_status"); DBUG_ASSERT(! is_set()); m_status= DA_DISABLED; + DBUG_VOID_RETURN; } Warning_info::Warning_info(ulonglong warn_id_arg, |