7 commits

Author	SHA1	Message	Date
Jan Lindström	2e814d4702	Merge InnoDB 5.7 from mysql-5.7.9. ... Contains also MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7 The failure happened because 5.7 has changed the signature of the bool handler::primary_key_is_clustered() const virtual function ("const" was added). InnoDB was using the old signature which caused the function not to be used. MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7 Fixed mutexing problem on lock_trx_handle_wait. Note that rpl_parallel and rpl_optimistic_parallel tests still fail. MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan) Reason: incorrect merge MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan) Reason: incorrect merge	2016-09-02 13:22:28 +03:00
Sergei Golubchik	27d45e4696	MDEV-5574 Set AUTO_INCREMENT below max value of column. ... Update InnoDB to 5.6.14 Apply MySQL-5.6 hack for MySQL Bug#16434374 Move Aria-only HA_RTREE_INDEX from my_base.h to maria_def.h (breaks an assert in InnoDB) Fix InnoDB memory leak	2014-02-01 09:33:26 +01:00
Michael Widenius	068c61978e	Temporary commit of 10.0-merge	2013-03-26 00:03:13 +02:00
Michael Widenius	1d0f70c2f8	Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6	2012-08-01 17:27:34 +03:00
Vasil Dimov	b9f144fa4b	Use C-style comment instead of C++ in a C header. ... Spotted by: Davi Arnaut	2010-09-27 20:08:12 +03:00
Vasil Dimov	c7525a0130	Merge from innodb-branches-innodb+ (2)	2010-04-19 20:53:16 +03:00
Vasil Dimov	c877ff39bc	Import branches/innodb+ from SVN on top of storage/innobase.	2010-04-12 18:20:41 +03:00