diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-11 23:34:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-16 15:50:04 +0200 |
| commit | bd7ed1b923e8ddd896103d73461c4313a175cca6 (patch) | |
| tree | f7309f0a96715fe8582949820360bfc0dbb21b56 /storage/innobase/gis | |
| parent | e15e879fae949a05de549a6676ae66d4f7f8c566 (diff) | |
| download | mariadb-git-bd7ed1b923e8ddd896103d73461c4313a175cca6.tar.gz | |
MDEV-13935 INSERT stuck at state Unlocking tables
Revert the dead code for MySQL 5.7 multi-master replication (GCS),
also known as
WL#6835: InnoDB: GCS Replication: Deterministic Deadlock Handling
(High Prio Transactions in InnoDB).
Also, make innodb_lock_schedule_algorithm=vats skip SPATIAL INDEX,
because the code does not seem to be compatible with them.
Add FIXME comments to some SPATIAL INDEX locking code. It looks
like Galera write-set replication might not work with SPATIAL INDEX.
Diffstat (limited to 'storage/innobase/gis')
| -rw-r--r-- | storage/innobase/gis/gis0rtree.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/gis/gis0sea.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc index b8220d73ec0..d45e40c8151 100644 --- a/storage/innobase/gis/gis0rtree.cc +++ b/storage/innobase/gis/gis0rtree.cc @@ -34,7 +34,7 @@ Created 2013/03/27 Allen Lai and Jimmy Yang #include "rem0cmp.h" #include "lock0lock.h" #include "ibuf0ibuf.h" -#include "trx0trx.h" +#include "trx0undo.h" #include "srv0mon.h" #include "gis0geo.h" diff --git a/storage/innobase/gis/gis0sea.cc b/storage/innobase/gis/gis0sea.cc index dcf8cc6f781..173fc76ddfc 100644 --- a/storage/innobase/gis/gis0sea.cc +++ b/storage/innobase/gis/gis0sea.cc @@ -37,6 +37,7 @@ Created 2014/01/16 Jimmy Yang #include "ibuf0ibuf.h" #include "trx0trx.h" #include "srv0mon.h" +#include "que0que.h" #include "gis0geo.h" /** Restore the stored position of a persistent cursor bufferfixing the page */ |