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/row0row.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/row0row.h')
| -rw-r--r-- | storage/innobase/include/row0row.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h index 4fd93283884..93ff90d020e 100644 --- a/storage/innobase/include/row0row.h +++ b/storage/innobase/include/row0row.h @@ -159,9 +159,9 @@ row_build( row_ext_t** ext, /*!< out, own: cache of externally stored column prefixes, or NULL */ - mem_heap_t* heap) /*!< in: memory heap from which + mem_heap_t* heap); /*!< in: memory heap from which the memory needed is allocated */ - MY_ATTRIBUTE((nonnull(2,3,9))); + /** An inverse function to row_build_index_entry. Builds a row from a record in a clustered index, with possible indexing on ongoing addition of new virtual columns. @@ -212,7 +212,7 @@ row_rec_to_index_entry_low( stored columns */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ - MY_ATTRIBUTE((nonnull, warn_unused_result)); + MY_ATTRIBUTE((warn_unused_result)); /*******************************************************************//** Converts an index record to a typed data tuple. NOTE that externally stored (often big) fields are NOT copied to heap. @@ -227,7 +227,7 @@ row_rec_to_index_entry( stored columns */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ - MY_ATTRIBUTE((nonnull, warn_unused_result)); + MY_ATTRIBUTE((warn_unused_result)); /*******************************************************************//** Builds from a secondary index record a row reference with which we can search the clustered index record. @@ -249,7 +249,7 @@ row_build_row_ref( as long as the row reference is used! */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ - MY_ATTRIBUTE((nonnull, warn_unused_result)); + MY_ATTRIBUTE((warn_unused_result)); /*******************************************************************//** Builds from a secondary index record a row reference with which we can search the clustered index record. */ |