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/ha0ha.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/ha0ha.h')
| -rw-r--r-- | storage/innobase/include/ha0ha.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h index 11c12c4ebc3..15a99ddf683 100644 --- a/storage/innobase/include/ha0ha.h +++ b/storage/innobase/include/ha0ha.h @@ -211,7 +211,7 @@ struct ha_node_t { #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG buf_block_t* block; /*!< buffer block containing the data, or NULL */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ - const rec_t* data; /*!< pointer to the data */ + const rec_t* data; /*!< pointer to the data */ }; #ifdef UNIV_DEBUG |