7 commits

Author	SHA1	Message	Date
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	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
Sergei Golubchik	b7b5f6f1ab	10.0-monty merge ... includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE	2013-07-21 16:39:19 +02:00
Sergei Golubchik	a9035be5b7	10.0-base merge	2013-04-15 15:09:22 +02: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