diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
| commit | f6633bf058802ad7da8196d01fd19d75c53f7274 (patch) | |
| tree | b7ba9832aae2a3d0c72d2bf3d89cf2a5f13a44f6 /sql/handler.cc | |
| parent | fc5932a1b733b331be20c3f1b45c61c798227dba (diff) | |
| parent | e555540ab6b9c3e0d4fdd00af093b115a9401d0a (diff) | |
| download | mariadb-git-f6633bf058802ad7da8196d01fd19d75c53f7274.tar.gz | |
Merge branch '10.1' into 10.2
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 95b16a51980..a4a2297bd2f 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4856,7 +4856,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 |