summaryrefslogtreecommitdiff
path: root/storage/innobase/include
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4492 InnoDB generates non-existing link to manual based on the server ve...Sergei Golubchik2013-08-131-3/+1
* 10.0-monty mergeSergei Golubchik2013-07-21151-2585/+8100
|\
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-152-6/+6
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-26152-2642/+8217
* | 10.0-base mergeSergei Golubchik2013-04-1512-80/+145
|\ \ | |/ |/|
| * 5.5 mergeSergei Golubchik2013-04-141-0/+5
| |\
| | * MDEV-4338 - Support FusionIO/directFS atomic writesVladislav Vaintroub2013-04-061-0/+5
| * | 5.5 mergeSergei Golubchik2013-03-2712-82/+147
| |\ \ | | |/
| | * merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-2812-82/+147
| | |\
| | | * Merge mysql-5.1 -> mysql-5.5Vasil Dimov2012-12-181-7/+5
| | | |\
| | | * | Approved by Jimmy and Inaam. rb#1576Bill Qu2012-12-173-1/+25
| | | * | Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-282-2/+16
| | | |\ \ | | | | |/
| | | | * Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-282-0/+12
| | | * | merge from 5.1Inaam Rana2012-11-162-9/+9
| | | |\ \ | | | | |/
| | | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-11-152-63/+49
| | | |\ \ | | | | |/
| | | * | This is a backport of "WL#5674 InnoDB: report all deadlocks (Bug#1784)"Vasil Dimov2012-11-121-0/+3
| | | * | Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT...Yasufumi Kinoshita2012-11-124-0/+25
| | | |\ \ | | | | |/
| | | | * Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT...Yasufumi Kinoshita2012-11-124-0/+25
| | | * | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-11-091-0/+15
| | | |\ \ | | | | |/
* | | | | 10.0-base mergeSergei Golubchik2013-01-317-20/+47
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-01-297-12/+45
| |\ \ \ \ | | |/ / /
| | * | | mysql-5.5.29 mergeSergei Golubchik2013-01-152-0/+21
| | |\ \ \ | | | |/ /
| | | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-161-0/+12
| | | |\ \ | | | | |/
| | | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-082-1/+9
| | | |\ \ | | | | |/
| | | * | Merge from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-09-281-7/+0
| | | |\ \
| | | * \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-09-191-1/+1
| | | |\ \ \
| | | * \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-09-171-3/+5
| | | |\ \ \ \
| | | * \ \ \ \ Merge from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-09-011-0/+18
| | | |\ \ \ \ \ | | | | |/ / / /
| | * | | | | | 5.3 mergeSergei Golubchik2013-01-155-12/+24
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Bug#14731482 UPDATE OR DELETE CORRUPTS A RECORD WITH A LONG PRIMARY KEYMarko Mäkelä2012-10-081-1/+6
| | | | |_|_|/ | | | |/| | |
| | | * | | | Bug #13249921 ASSERT !BPAGE->FILE_PAGE_WAS_FREED, USUALLY IN Annamalai Gurusami2012-09-281-7/+2
| | | | |_|/ | | | |/| |
| | | * | | Bug#14636528 INNODB CHANGE BUFFERING IS NOT ENTIRELY CRASH-SAFEMarko Mäkelä2012-09-191-4/+5
| | | | |/ | | | |/|
| | | * | Merge from mysql-5.1.63-releaseSunanda Menon2012-05-081-0/+2
| | | |\ \
| | | | * \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-04-101-2/+2
| | | | |\ \
| | | | * | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-03-011-0/+2
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-183-0/+37
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-164-2/+62
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mysql-5.5.28Sergei Golubchik2012-10-164-2/+62
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Bug #13113026 INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRUFROM 5.6 BACKPORTAnnamalai Gurusami2012-07-254-2/+62
| * | | | | | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-143-0/+37
| |/ / / / /
* | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-195-14/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-0910-17/+30
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#14251529 : FIX FOR BUG 13704145 CREATES POSSIBLE RACE CONDITIONYasufumi Kinoshita2012-06-291-2/+3
| | * | | | WL#6161 Integrating with InnoDB codebase in MySQL 5.5Narayanan Venkateswaran2012-06-0710-15/+27
* | | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-01213-3857/+13893
|/ / / / /
* | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-072-8/+16
| |\ \ \ \
| * \ \ \ \ Bug#11758510 (#50723): INNODB CHECK TABLE FATAL SEMAPHORE WAIT TIMEOUT POSSIB...Yasufumi Kinoshita2012-04-271-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#11758510 (#50723): INNODB CHECK TABLE FATAL SEMAPHORE WAIT TIMEOUT POSSIB...Yasufumi Kinoshita2012-04-271-0/+1
| | | |_|/ | | |/| |
* | | | | cSergei Golubchik2012-05-213-9/+17
|\ \ \ \ \ | | |_|/ / | |/| | |