diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 11:11:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 11:11:53 +0200 |
| commit | f037b910981aa2422af8cd043311eb8369e96f34 (patch) | |
| tree | d4a25c99f080b42fcc7261d906a7841edb9b6fcb /storage | |
| parent | ab812c108978b65f73076ff1e8fbf8011cb23787 (diff) | |
| download | mariadb-git-f037b910981aa2422af8cd043311eb8369e96f34.tar.gz | |
MDEV-17726: Fix compiler warning
Compare against the correct constant 0. NOT_KILLED belongs to
enum killed_state, while THD_IS_NOT_KILLED is what we want.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 293a80ecbcc..0b7bc5f16af 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -13202,7 +13202,7 @@ int ha_innobase::delete_table(const char* name) table, FOREIGN KEY constraints will be ignored and their metadata will not be removed. */ DBUG_ASSERT(sqlcom != SQLCOM_TRUNCATE - || (thd_kill_level(ha_thd()) != NOT_KILLED + || (thd_kill_level(ha_thd()) != THD_IS_NOT_KILLED && (!m_prebuilt || m_prebuilt->table->is_temporary()))); return delete_table(name, sqlcom); |