Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-9040: 10.1.8 fails after upgrade from 10.0.21 | Jan Lindström | 2015-11-05 | 1 | -2/+2 |
* | Fixed failing tests and compiler warnings | Monty | 2015-08-18 | 1 | -3/+6 |
* | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 2 | -11/+132 |
|\ | |||||
| * | after merge fixes: InnoDB and XtraDB | Sergei Golubchik | 2015-06-16 | 1 | -0/+2 |
| * | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2015-06-16 | 2 | -11/+130 |
| |\ | |||||
| | * | 5.6.25 | Sergei Golubchik | 2015-06-16 | 2 | -11/+130 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | InnoDB-5.6.24 | Sergei Golubchik | 2015-05-05 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | 5.6.24 | Sergei Golubchik | 2015-05-04 | 1 | -2/+2 |
| | * | move to storage/innobase | Sergei Golubchik | 2015-05-04 | 3 | -0/+9906 |
* | | MDEV-7942: InnoDB: abuse of UNIV_LIKELY()/UNIV_UNLIKELY() | Jan Lindström | 2015-05-11 | 1 | -2/+2 |
* | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -1/+9 |
* | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -5/+30 |
|\ \ | |/ | |||||
| * | InnoDB 5.6.22 | Sergei Golubchik | 2015-01-21 | 1 | -3/+10 |
| * | MDEV-7477: Make innochecksum work on compressed tables | Jan Lindström | 2015-01-19 | 1 | -2/+20 |
* | | MDEV-6935: Change the default value for innodb_log_compressed_pages to false | Jan Lindström | 2014-10-29 | 1 | -1/+1 |
* | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -16/+24 |
|\ \ | |/ | |||||
| * | InnoDB 5.6.20 | Sergei Golubchik | 2014-09-11 | 1 | -16/+0 |
| * | Merge InnoDB fixes from 5.5 revisions 4229, 4230, 4233, 4237 and 4238 i.e. | Jan Lindström | 2014-07-25 | 1 | -1/+3 |
| * | MDEV-6348: mariadb crash signal 11 | Jan Lindström | 2014-07-08 | 1 | -0/+22 |
* | | MDEV-5834: Merge Kakao Defragmentation implementation to MariaDB 10.1 | Jan Lindström | 2014-08-06 | 1 | -0/+15 |
* | | Merge 10.0 -> 10.1 | Jan Lindström | 2014-05-24 | 1 | -65/+77 |
|\ \ | |/ | |||||
| * | innodb 5.6.17 | Sergei Golubchik | 2014-05-07 | 1 | -65/+77 |
* | | MDEV-6075: Allow > 16K pages on InnoDB | Jan Lindström | 2014-05-13 | 1 | -1/+1 |
|/ | |||||
* | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 3 | -10/+52 |
* | MDEV-5574 Set AUTO_INCREMENT below max value of column. | Sergei Golubchik | 2014-02-01 | 3 | -163/+360 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 3 | -57/+243 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 3 | -55/+123 |
|\ | |||||
| * | 5.3 merge | Sergei Golubchik | 2013-01-15 | 3 | -55/+122 |
| |\ | |||||
| * \ | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 2 | -2/+9 |
| |\ \ | | |/ | |||||
* | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -10/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-08-16 | 1 | -10/+11 |
| |\ \ | |||||
| * | | | WL#6161 Integrating with InnoDB codebase in MySQL 5.5 | Narayanan Venkateswaran | 2012-06-07 | 1 | -0/+2 |
* | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 3 | -54/+167 |
|/ / / | |||||
* | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-02-17 | 2 | -34/+41 |
|\ \ \ | |/ / | |||||
* | | | Bug #13651627 Move ut_ad(0) from the beginning to the end of buf_page_print(), | Marko Mäkelä | 2012-02-02 | 2 | -7/+9 |
* | | | Bug #13413535 61104: INNODB: FAILING ASSERTION: PAGE_GET_N_RECS(PAGE) > 1 | Marko Mäkelä | 2012-01-26 | 1 | -3/+2 |
* | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-12-12 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Revert revno:3452.71.32 (Bug#12612184 fix). | Marko Mäkelä | 2011-10-26 | 1 | -12/+19 |
* | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-10-12 | 1 | -12/+0 |
|\ \ \ | |/ / | |||||
* | | | Revert original fix for Bug 12612184 and the follow up fix for | Inaam Rana | 2011-09-30 | 2 | -38/+31 |
* | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-06-28 | 1 | -31/+59 |
|\ \ \ | |/ / | |||||
* | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-06-16 | 1 | -66/+50 |
|\ \ \ | |/ / | |||||
* | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-06-16 | 2 | -31/+38 |
|\ \ \ | |/ / | |||||
| * | | Bug#12612184 Race condition after btr_cur_pessimistic_update() | Marko Mäkelä | 2011-06-16 | 1 | -19/+12 |
| |/ | |||||
* | | Implement worklog #5743 InnoDB: Lift the limit of index key prefixes. | Jimmy Yang | 2011-05-31 | 1 | -1/+1 |
* | | A non-functional change related to Bug#11830883 | Marko Mäkelä | 2011-05-09 | 1 | -22/+0 |
* | | Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() [part 2] | Marko Mäkelä | 2011-03-21 | 1 | -49/+49 |
* | | Merge mysql-5.1-innodb to mysql-5.5-innodb. | Marko Mäkelä | 2011-03-15 | 1 | -9/+8 |
|\ \ | |/ | |||||
* | | Merge mysql-5.1-innodb to mysql-5.5-innodb. | Marko Mäkelä | 2011-02-08 | 3 | -1/+25 |
|\ \ | |/ |