diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-21 14:02:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-21 14:02:04 +0300 |
| commit | 620ea816adeceaba7c875679ab8505f4c07a22b8 (patch) | |
| tree | a52749e4f0c1fd07bc9f0c2a1159706a4e7789c3 /sql/handler.cc | |
| parent | a1b6691f93e50ad4a8a53dbf89ba578d6a64b2cb (diff) | |
| parent | b4c225ac354686242b5336da84b7a758640936bd (diff) | |
| download | mariadb-git-620ea816adeceaba7c875679ab8505f4c07a22b8.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0a5ed2dffbb..d2408767530 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -5608,6 +5608,7 @@ extern "C" enum icp_result handler_index_cond_check(void* h_arg) THD *thd= h->table->in_use; enum icp_result res; + DEBUG_SYNC(thd, "handler_index_cond_check"); enum thd_kill_levels abort_at= h->has_transactions() ? THD_ABORT_SOFTLY : THD_ABORT_ASAP; if (thd_kill_level(thd) > abort_at) |