database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge a fix from MySQL 5.7, to presumably dead code

Browse Source 
Remove a test that does not apply to MariaDB

In MariaDB, there are no high-priority transactions (no tx_priority).
This should also mean that all references to TRX_STATE_FORCED_ROLLBACK
are dead code.
This commit is contained in:
Marko Mäkelä
2018-02-02 16:15:50 +02:00
parent 4c731a2d7c 6266493fc3
commit d57b2430d7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
storage/innobase/lock/lock0lock.cc
View File

@@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2014, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
@@ -2728,7 +2728,10 @@ RecLock::lock_add_priority(
lock_t* grant_position = NULL;
lock_t* add_position = NULL;
HASH_SEARCH(hash, lock_sys->rec_hash, m_rec_id.fold(), lock_t*,
/* Different lock (such as predicate lock) are on different hash */
hash_table_t* lock_hash = lock_hash_get(m_mode);
HASH_SEARCH(hash, lock_hash, m_rec_id.fold(), lock_t*,
lock_head, ut_ad(lock_head->is_record_lock()), true);
ut_ad(lock_head);