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/include/hash0hash.h | |
| 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/include/hash0hash.h')
| -rw-r--r-- | storage/innobase/include/hash0hash.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h index 3d099cd2f3a..cbb6da488b5 100644 --- a/storage/innobase/include/hash0hash.h +++ b/storage/innobase/include/hash0hash.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 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 the Free Software @@ -122,7 +123,6 @@ do {\ }\ } while (0) -#ifdef WITH_WSREP /*******************************************************************//** Inserts a struct to the head of hash table. */ @@ -148,7 +148,6 @@ do { \ cell3333->node = DATA; \ } \ } while (0) -#endif /*WITH_WSREP */ #ifdef UNIV_HASH_DEBUG # define HASH_ASSERT_VALID(DATA) ut_a((void*) (DATA) != (void*) -1) # define HASH_INVALIDATE(DATA, NAME) *(void**) (&DATA->NAME) = (void*) -1 |