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/row0ins.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/row0ins.h')
| -rw-r--r-- | storage/innobase/include/row0ins.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h index 48a3044f1d6..4038c32b9c0 100644 --- a/storage/innobase/include/row0ins.h +++ b/storage/innobase/include/row0ins.h @@ -97,7 +97,7 @@ row_ins_clust_index_entry_low( bool dup_chk_only) /*!< in: if true, just do duplicate check and return. don't execute actual insert. */ - __attribute__((warn_unused_result)); + MY_ATTRIBUTE((warn_unused_result)); /***************************************************************//** Tries to insert an entry into a secondary index. If a record with exactly the @@ -125,7 +125,7 @@ row_ins_sec_index_entry_low( bool dup_chk_only) /*!< in: if true, just do duplicate check and return. don't execute actual insert. */ - __attribute__((warn_unused_result)); + MY_ATTRIBUTE((warn_unused_result)); /** Sets the values of the dtuple fields in entry from the values of appropriate columns in row. @param[in] index index handler @@ -178,7 +178,7 @@ row_ins_clust_index_entry( bool dup_chk_only) /*!< in: if true, just do duplicate check and return. don't execute actual insert. */ - __attribute__((warn_unused_result)); + MY_ATTRIBUTE((warn_unused_result)); /***************************************************************//** Inserts an entry into a secondary index. Tries first optimistic, then pessimistic descent down the tree. If the entry matches enough @@ -194,7 +194,7 @@ row_ins_sec_index_entry( bool dup_chk_only) /*!< in: if true, just do duplicate check and return. don't execute actual insert. */ - __attribute__((warn_unused_result)); + MY_ATTRIBUTE((warn_unused_result)); /***********************************************************//** Inserts a row to a table. This is a high-level function used in SQL execution graphs. |