diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-06 09:43:16 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-08 15:49:03 +0300 |
| commit | fec844aca88e1c6b9c36bb0b811e92d9d023ffb9 (patch) | |
| tree | 3e8602113e591b163bf23fffe95c8908cac88ea3 /storage/innobase/include/lock0prdt.h | |
| parent | 2e814d4702d71a04388386a9f591d14a35980bfe (diff) | |
| download | mariadb-git-fec844aca88e1c6b9c36bb0b811e92d9d023ffb9.tar.gz | |
Merge InnoDB 5.7 from mysql-5.7.14.
Contains also:
MDEV-10549 mysqld: sql/handler.cc:2692: int handler::ha_index_first(uchar*): Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type != 2' failed. (branch bb-10.2-jan)
Unlike MySQL, InnoDB still uses THR_LOCK in MariaDB
MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
enable tests that were fixed in MDEV-10549
MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
fix main.innodb_mysql_sync - re-enable online alter for partitioned innodb tables
Diffstat (limited to 'storage/innobase/include/lock0prdt.h')
| -rw-r--r-- | storage/innobase/include/lock0prdt.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/storage/innobase/include/lock0prdt.h b/storage/innobase/include/lock0prdt.h index 8941a134a8f..6c61f07a4e8 100644 --- a/storage/innobase/include/lock0prdt.h +++ b/storage/innobase/include/lock0prdt.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 @@ -203,22 +203,25 @@ lock_prdt_rec_move( const buf_block_t* donator); /*!< in: buffer block containing the donating record */ -/*********************************************************************//** -Check whether there are R-tree Page lock on a buffer page +/** Check whether there are R-tree Page lock on a buffer page +@param[in] trx trx to test the lock +@param[in] space space id for the page +@param[in] page_no page number @return true if there is none */ bool lock_test_prdt_page_lock( /*=====================*/ - ulint space, /*!< in: space id for the page */ - ulint page_no); /*!< in: page number */ + const trx_t* trx, + ulint space, + ulint page_no); -/*************************************************************//** -Removes predicate lock objects set on an index page which is discarded. */ +/** Removes predicate lock objects set on an index page which is discarded. +@param[in] block page to be discarded +@param[in] lock_hash lock hash */ void -lock_prdt_free_from_discard_page( +lock_prdt_page_free_from_discard( /*=============================*/ - const buf_block_t* block, /*!< in: page to be discarded */ + const buf_block_t* block, hash_table_t* lock_hash); - /*!< in: lock hash */ #endif |