diff options
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 71d5b80eaa3..86eb6f28807 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2017, MariaDB Corporation. + Copyright (c) 2008, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4525,7 +4525,8 @@ extern "C" int thd_rpl_is_parallel(const MYSQL_THD thd) extern "C" int thd_rpl_stmt_based(const MYSQL_THD thd) { - return !thd->is_current_stmt_binlog_format_row() && + return thd && + !thd->is_current_stmt_binlog_format_row() && !thd->is_current_stmt_binlog_disabled(); } |