From 8f60656fd58610a7ed0b65321d229b44ab618f9a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 6 Nov 2015 16:43:40 +0100 Subject: [PATCH] MDEV-9039 Can't upgrade MariaDB to to 10.1.8 version from 10.0.21 Don't mark the SEQUENCE engine as XA-capable. The engine never registers itself for any transaction, so it doesn't matter whether it is XA-capable or not. The only effect of being "XA-capable" is breaking the "number of XA-capable engines" check of TC_LOG_MMAP. --- storage/sequence/mysql-test/sequence/simple.result | 2 +- storage/sequence/sequence.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/sequence/mysql-test/sequence/simple.result b/storage/sequence/mysql-test/sequence/simple.result index 8ce4722aeff03..ea94e91b1baf0 100644 --- a/storage/sequence/mysql-test/sequence/simple.result +++ b/storage/sequence/mysql-test/sequence/simple.result @@ -3,7 +3,7 @@ ENGINE SEQUENCE SUPPORT YES COMMENT Generated tables filled with sequential values TRANSACTIONS YES -XA YES +XA NO SAVEPOINTS YES set sql_quote_show_create=0; show create table seq_1_to_15_step_2; diff --git a/storage/sequence/sequence.cc b/storage/sequence/sequence.cc index 36ccebfa86f05..7b20615b15fdf 100644 --- a/storage/sequence/sequence.cc +++ b/storage/sequence/sequence.cc @@ -483,7 +483,7 @@ static int init(void *p) hton->create= create_handler; hton->discover_table= discover_table; hton->discover_table_existence= discover_table_existence; - hton->commit= hton->rollback= hton->prepare= + hton->commit= hton->rollback= (int (*)(handlerton *, THD *, bool)) &dummy_ret_int; hton->savepoint_set= hton->savepoint_rollback= hton->savepoint_release= (int (*)(handlerton *, THD *, void *)) &dummy_ret_int;