diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
| commit | 8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39 (patch) | |
| tree | 72fa33f92344a89792845bab9225cef56b4138c4 /sql/handler.cc | |
| parent | 3f327432942ef5db14dd905ffd147f234dc74bfb (diff) | |
| parent | 3b862aaa10942e7405b90cf80d0c3baca4cda55d (diff) | |
| download | mariadb-git-8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index c74675ed113..4a9df5b2bf8 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4867,7 +4867,12 @@ static my_bool discover_handlerton(THD *thd, plugin_ref plugin, { if (error) { - DBUG_ASSERT(share->error); // tdc_lock_share needs that + if (!share->error) + { + share->error= OPEN_FRM_ERROR_ALREADY_ISSUED; + plugin_unlock(0, share->db_plugin); + } + /* report an error, unless it is "generic" and a more specific one was already reported |