From ee9bdcf79aea0fbed7ff9605cc9689f1c8924b21 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Tue, 14 Jul 2015 17:33:22 -0400 Subject: [PATCH] Binlog SE doesn't implement abort_transaction(), so skip warning. --- sql/handler.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sql/handler.cc b/sql/handler.cc index ee433949d33..70f30580a07 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6026,9 +6026,17 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal) { handlerton *hton= ha_info->ht(); if (!hton->abort_transaction) - WSREP_WARN("cannot abort transaction"); + { + /* Skip warning for binlog SE */ + if (hton->db_type != DB_TYPE_BINLOG) + { + WSREP_WARN("Cannot abort transaction."); + } + } else + { hton->abort_transaction(hton, bf_thd, victim_thd, signal); + } ha_info_next= ha_info->next(); } DBUG_RETURN(0);