summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-07-14 17:33:22 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-07-14 17:33:22 -0400
commitee9bdcf79aea0fbed7ff9605cc9689f1c8924b21 (patch)
tree92d82fc55595bd924ce86e18ca716d1801ab4f69 /sql/handler.cc
parente2041167346bd91d796c739cf7ab9de052283cb7 (diff)
downloadmariadb-git-ee9bdcf79aea0fbed7ff9605cc9689f1c8924b21.tar.gz
Binlog SE doesn't implement abort_transaction(), so skip warning.
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc10
1 files changed, 9 insertions, 1 deletions
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);