10 commits

Author	SHA1	Message	Date
Jan Lindström	26de9061e8	Merge following commit from 5.5: ... commit ef92aaf9ec Author: Jan Lindström <jan.lindstrom@mariadb.com> Date: Wed Jun 22 22:37:28 2016 +0300 MDEV-10083: Orphan ibd file when playing with foreign keys Analysis: row_drop_table_for_mysql did not allow dropping referenced table even in case when actual creating of the referenced table was not successfull if foreign_key_checks=1. Fix: Allow dropping referenced table even if foreign_key_checks=1 if actual table create returned error.	2016-06-23 07:42:40 +03:00
Sergei Golubchik	a79d46c3a4	Merge branch 'merge-innodb-5.6' into 10.0	2016-06-21 14:58:19 +02:00
Sergei Golubchik	720e04ff67	5.6.31	2016-06-21 14:21:03 +02:00
Sergei Golubchik	6d06fbbd1d	move to storage/innobase	2015-05-04 19:17:21 +02:00
Jan Lindström	e9c10f9916	MDEV-7908: assertion in innobase_release_savepoint ... Problem was that in XA prepared state we should still be able to release a savepoint, but assertions were too strict.	2015-04-06 17:38:51 +03:00
Sergei Golubchik	6b05688f6d	innodb 5.6.23	2015-02-18 17:59:21 +01:00
Sergei Golubchik	a9a6bd5256	InnoDB 5.6.21	2014-11-20 16:59:22 +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

Renamed from storage/innobase/trx/trx0roll.c (Browse further)