Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 5.5->10.0-base | unknown | 2013-04-17 | 1 | -2/+1 |
|\ | |||||
| * | compiler warnings | Sergei Golubchik | 2013-04-14 | 1 | -2/+1 |
* | | Fixes for stuff seen in buildbot: | unknown | 2013-04-16 | 1 | -1/+1 |
* | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 6 | -2/+155 |
|\ \ | |/ | |||||
| * | MDEV-4338 - Support FusionIO/directFS atomic writes | Vladislav Vaintroub | 2013-04-06 | 5 | -0/+153 |
| * | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 1 | -2/+2 |
* | | Linking problem on Windows | Sergei Golubchik | 2013-04-10 | 1 | -4/+2 |
* | | error messages: name the storage engine explicitly, | Sergei Golubchik | 2013-04-09 | 1 | -0/+2 |
* | | * don't use 1-8 numbers for open_table_error codes, use an enum. | Sergei Golubchik | 2013-04-09 | 1 | -7/+10 |
* | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 40 | -479/+1075 |
|\ \ | |/ | |||||
| * | fix innodb failures on solaris | Sergei Golubchik | 2013-03-11 | 1 | -0/+2 |
| * | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 32 | -423/+1017 |
| |\ | |||||
| | * | Merge Post Fix for BUG#14628410 from mysql-5.1 to mysql-5.5 | Satya Bodapati | 2013-01-04 | 1 | -0/+8 |
| | |\ | |||||
| | * | | Bug #14556349 RENAME OF COMPRESSED TABLE AND INSERT BUFFER MERGE CAUSE | Annamalai Gurusami | 2012-12-20 | 1 | -2/+36 |
| | * | | Fix Bug#16021177 DICT_LOAD_FOREIGNS() PASSES UNALIGNED MEMORY TO | Vasil Dimov | 2012-12-19 | 1 | -1/+2 |
| | * | | Merge mysql-5.1 -> mysql-5.5 | Vasil Dimov | 2012-12-18 | 1 | -2/+7 |
| | |\ \ | | | |/ | |||||
| | * | | Merge mysql-5.1 -> mysql-5.5 | Vasil Dimov | 2012-12-18 | 1 | -7/+5 |
| | |\ \ | | | |/ | |||||
| | * | | Approved by Jimmy and Inaam. rb#1576 | Bill Qu | 2012-12-17 | 8 | -15/+138 |
| | * | | merge from 5.1 | Inaam Rana | 2012-12-14 | 1 | -7/+14 |
| | |\ \ | | | |/ | |||||
| | * | | Follow-up fix to Bug#14628410: Remove the Windows InnoDB Plugin specific | Marko Mäkelä | 2012-12-13 | 1 | -97/+0 |
| | * | | Merge fix for Bug#14628410 from mysql-5.1 to mysql-5.5 | Satya Bodapati | 2012-12-13 | 2 | -8/+37 |
| | |\ \ | | | |/ | |||||
| | * | | Merging from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2012-12-11 | 1 | -0/+7 |
| | |\ \ | | | |/ | |||||
| | * | | UNIV_DEBUG build of some environments needs | Yasufumi Kinoshita | 2012-12-04 | 2 | -0/+2 |
| | * | | merge from 5.1 | Inaam Rana | 2012-11-30 | 1 | -16/+4 |
| | |\ \ | | | |/ | |||||
| | * | | Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN... | Yasufumi Kinoshita | 2012-11-28 | 7 | -18/+120 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN... | Yasufumi Kinoshita | 2012-11-28 | 7 | -15/+126 |
| | * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-11-28 | 1 | -4/+16 |
| | |\ \ | | | |/ | |||||
| | * | | Bug #14676249 : ROW_VERS_IMPL_X_LOCKED_LOW() MIGHT HIT !BPAGE->FILE_PAGE_WAS_... | Yasufumi Kinoshita | 2012-11-26 | 4 | -1/+29 |
| | |\ \ | | | |/ | |||||
| | * | | merge from 5.1 | Inaam Rana | 2012-11-16 | 3 | -62/+40 |
| | |\ \ | | | |/ | |||||
| | * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-11-15 | 1 | -2/+0 |
| | |\ \ | | | |/ | |||||
| | * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-11-15 | 4 | -149/+247 |
| | |\ \ | | | |/ | |||||
| | * | | Fix Bug #14753402 - FAILING ASSERTION: LEN == IFIELD->FIXED_LEN | Jimmy Yang | 2012-11-14 | 2 | -3/+31 |
| | * | | This is a backport of "WL#5674 InnoDB: report all deadlocks (Bug#1784)" | Vasil Dimov | 2012-11-12 | 4 | -47/+116 |
| | * | | Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT... | Yasufumi Kinoshita | 2012-11-12 | 9 | -5/+112 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT... | Yasufumi Kinoshita | 2012-11-12 | 9 | -2/+102 |
| | * | | Merging from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2012-11-09 | 4 | -5/+74 |
| | |\ \ | | | |/ | |||||
| * | | | MDEV-4028 - Converted rdiff files to uniform | Elena Stepanova | 2013-02-03 | 7 | -56/+56 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 26 | -239/+431 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4065 thd_kill_statement service | Sergei Golubchik | 2013-01-18 | 1 | -9/+8 |
| * | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 8 | -42/+108 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-10-22 | 1 | -1/+5 |
| | |\ \ | | | |/ | |||||
| | * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-10-18 | 1 | -7/+12 |
| | |\ \ | | | |/ | |||||
| | * | | Bug #13702112 : WAIT_FOR_READ IS STUCK IN THE 90S | Yasufumi Kinoshita | 2012-10-17 | 1 | -3/+4 |
| | |\ \ | |||||
| | * \ \ | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-10-16 | 3 | -6/+35 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | bug#14704286 | Krunal Bauskar krunal.bauskar@oracle.com | 2012-10-15 | 1 | -0/+5 |
| | * | | | Merge mysql-5.1 -> mysql-5.5 | Vasil Dimov | 2012-10-09 | 2 | -1/+17 |
| | |\ \ \ | |||||
| | * | | | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -2/+2 |
| | * | | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-10-08 | 3 | -4/+24 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2012-09-28 | 3 | -79/+0 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Bug#14594600 ASSERT FROM DROP TABLE CONCURRENT WITH IBUF MERGES | Inaam Rana | 2012-09-20 | 1 | -24/+47 |