diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 12:59:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 12:59:18 +0300 |
| commit | d62b0368ca53cc10b45b703bbeefcf0b674bd39d (patch) | |
| tree | e65926bf20605d24a87619553374a74e7ef1c2c8 /sql/handler.h | |
| parent | 9d6d1221230e2acf9fac2ab6fe685c0a2a7845aa (diff) | |
| parent | 088b37b5eaa8c3198c7f8ea0358d15135833f6bb (diff) | |
| download | mariadb-git-d62b0368ca53cc10b45b703bbeefcf0b674bd39d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index ff67235cd70..9eec3f13c73 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2,7 +2,7 @@ #define HANDLER_INCLUDED /* Copyright (c) 2000, 2019, Oracle and/or its affiliates. - Copyright (c) 2009, 2021, MariaDB + Copyright (c) 2009, 2022, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -5161,7 +5161,7 @@ static inline const char *ha_resolve_storage_engine_name(const handlerton *db_ty static inline bool ha_check_storage_engine_flag(const handlerton *db_type, uint32 flag) { - return db_type == NULL ? FALSE : MY_TEST(db_type->flags & flag); + return db_type && (db_type->flags & flag); } static inline bool ha_storage_engine_is_enabled(const handlerton *db_type) |