8 commits

Author	SHA1	Message	Date
Sergei Golubchik	6b05688f6d	innodb 5.6.23	2015-02-18 17:59:21 +01:00
Jan Lindström	3486135bb5	MDEV-6928: Add trx pointer to struct mtr_t ... Merge Facebook commit 25295d003cb0c17aa8fb756523923c77250b3294 authored by Steaphan Greene from https://github.com/facebook/mysql-5.6 This adds a pointer to the trx to each mtr. This allows the trx to be accessed in parts of the code where it was otherwise not available. This is needed later.	2014-10-24 22:26:31 +03:00
Sergei Golubchik	8ee9d19607	innodb 5.6.17	2014-05-07 17:32:23 +02:00
Sergei Golubchik	e2e5d07b28	MDEV-6184 10.0.11 merge ... InnoDB 5.6.16	2014-05-06 09:57:39 +02:00
Sergei Golubchik	15ee97214d	InnoDB 5.6.15 merge. ... update test results	2014-02-26 19:36:33 +01: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