summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.5->10.0-baseunknown2013-04-171-2/+1
|\
| * compiler warningsSergei Golubchik2013-04-141-2/+1
* | Fixes for stuff seen in buildbot:unknown2013-04-161-1/+1
* | 5.5 mergeSergei Golubchik2013-04-146-2/+155
|\ \ | |/
| * MDEV-4338 - Support FusionIO/directFS atomic writesVladislav Vaintroub2013-04-065-0/+153
| * MDEV-4243 Warnings/errors while compiling with clangSergei Golubchik2013-03-281-2/+2
* | Linking problem on WindowsSergei Golubchik2013-04-101-4/+2
* | error messages: name the storage engine explicitly,Sergei Golubchik2013-04-091-0/+2
* | * don't use 1-8 numbers for open_table_error codes, use an enum.Sergei Golubchik2013-04-091-7/+10
* | 5.5 mergeSergei Golubchik2013-03-2740-479/+1075
|\ \ | |/
| * fix innodb failures on solarisSergei Golubchik2013-03-111-0/+2
| * merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-2832-423/+1017
| |\
| | * Merge Post Fix for BUG#14628410 from mysql-5.1 to mysql-5.5Satya Bodapati2013-01-041-0/+8
| | |\
| | * | Bug #14556349 RENAME OF COMPRESSED TABLE AND INSERT BUFFER MERGE CAUSEAnnamalai Gurusami2012-12-201-2/+36
| | * | Fix Bug#16021177 DICT_LOAD_FOREIGNS() PASSES UNALIGNED MEMORY TOVasil Dimov2012-12-191-1/+2
| | * | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2012-12-181-2/+7
| | |\ \ | | | |/
| | * | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2012-12-181-7/+5
| | |\ \ | | | |/
| | * | Approved by Jimmy and Inaam. rb#1576Bill Qu2012-12-178-15/+138
| | * | merge from 5.1Inaam Rana2012-12-141-7/+14
| | |\ \ | | | |/
| | * | Follow-up fix to Bug#14628410: Remove the Windows InnoDB Plugin specificMarko Mäkelä2012-12-131-97/+0
| | * | Merge fix for Bug#14628410 from mysql-5.1 to mysql-5.5Satya Bodapati2012-12-132-8/+37
| | |\ \ | | | |/
| | * | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-12-111-0/+7
| | |\ \ | | | |/
| | * | UNIV_DEBUG build of some environments needsYasufumi Kinoshita2012-12-042-0/+2
| | * | merge from 5.1Inaam Rana2012-11-301-16/+4
| | |\ \ | | | |/
| | * | Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-287-18/+120
| | |\ \ | | | |/
| | | * Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-287-15/+126
| | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-11-281-4/+16
| | |\ \ | | | |/
| | * | Bug #14676249 : ROW_VERS_IMPL_X_LOCKED_LOW() MIGHT HIT !BPAGE->FILE_PAGE_WAS_...Yasufumi Kinoshita2012-11-264-1/+29
| | |\ \ | | | |/
| | * | merge from 5.1Inaam Rana2012-11-163-62/+40
| | |\ \ | | | |/
| | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-11-151-2/+0
| | |\ \ | | | |/
| | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-11-154-149/+247
| | |\ \ | | | |/
| | * | Fix Bug #14753402 - FAILING ASSERTION: LEN == IFIELD->FIXED_LENJimmy Yang2012-11-142-3/+31
| | * | This is a backport of "WL#5674 InnoDB: report all deadlocks (Bug#1784)"Vasil Dimov2012-11-124-47/+116
| | * | Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT...Yasufumi Kinoshita2012-11-129-5/+112
| | |\ \ | | | |/
| | | * Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT...Yasufumi Kinoshita2012-11-129-2/+102
| | * | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-11-094-5/+74
| | |\ \ | | | |/
| * | | MDEV-4028 - Converted rdiff files to uniformElena Stepanova2013-02-037-56/+56
* | | | 5.5 mergeSergei Golubchik2013-01-2926-239/+431
|\ \ \ \ | |/ / /
| * | | MDEV-4065 thd_kill_statement serviceSergei Golubchik2013-01-181-9/+8
| * | | mysql-5.5.29 mergeSergei Golubchik2013-01-158-42/+108
| |\ \ \ | | |/ /
| | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-221-1/+5
| | |\ \ | | | |/
| | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-181-7/+12
| | |\ \ | | | |/
| | * | Bug #13702112 : WAIT_FOR_READ IS STUCK IN THE 90SYasufumi Kinoshita2012-10-171-3/+4
| | |\ \
| | * \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-163-6/+35
| | |\ \ \ | | | |/ /
| | * | | bug#14704286Krunal Bauskar krunal.bauskar@oracle.com2012-10-151-0/+5
| | * | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2012-10-092-1/+17
| | |\ \ \
| | * | | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITHAnnamalai Gurusami2012-10-081-2/+2
| | * | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-083-4/+24
| | |\ \ \ \
| | * \ \ \ \ Merge from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-09-283-79/+0
| | |\ \ \ \ \
| | * | | | | | Bug#14594600 ASSERT FROM DROP TABLE CONCURRENT WITH IBUF MERGESInaam Rana2012-09-201-24/+47