Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -13/+1 |
|\ | |||||
| * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -13/+1 |
| |\ | |||||
| | * | MDEV-7049 MySQL#74585 - InnoDB: Failing assertion: *mbmaxlen < 5 in file ha_i... | Marko Mäkelä | 2018-01-22 | 1 | -11/+1 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -11/+0 |
|\ \ \ | |/ / | |||||
| * | | MDEV-13838: Wrong result after altering a partitioned table | Jan Lindström | 2017-10-10 | 1 | -11/+0 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -3/+7 |
|\ \ \ | |/ / | |||||
| * | | MDEV-13325: InnoDB assert dict_sys->size > 0 during ALTER TABLEbb-10.0-jan | Jan Lindström | 2017-07-21 | 1 | -3/+7 |
* | | | MDEV-12253: Buffer pool blocks are accessed after they have been freed | Jan Lindström | 2017-04-26 | 1 | -0/+9 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -124/+124 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2016-06-21 | 1 | -129/+129 |
| |\ \ | |||||
| | * | | 5.6.31 | Sergei Golubchik | 2016-06-21 | 1 | -130/+130 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -9/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-9276: MySQL Bug #78754: FK definitions missing from SHOW CREATE TABLE in... | Jan Lindström | 2015-12-14 | 1 | -8/+5 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -0/+28 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2015-10-09 | 1 | -0/+28 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.27 | Sergei Golubchik | 2015-10-09 | 1 | -0/+28 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -28/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'bb-10.0-jan' into 10.0 | Sergei Golubchik | 2015-08-05 | 1 | -2/+17 |
| |\ \ \ | |||||
| | * \ \ | Merge commit '96badb16afcf' into 10.0 | Jan Lindström | 2015-08-03 | 1 | -2/+17 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Fixed a couple of compiler warnings. | Sergey Vojtovich | 2014-12-19 | 1 | -1/+1 |
| | | * | | mysql-5.5.41 merge | Sergei Golubchik | 2014-12-19 | 1 | -0/+8 |
| | | |\ \ | |||||
| | | | * | | Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE CALLED | Annamalai Gurusami | 2014-09-18 | 1 | -0/+8 |
| | | * | | | MDEV-7084: innodb index stats inadequate using constant | Jan Lindström | 2014-11-19 | 1 | -2/+10 |
| | | |/ / | |||||
| | | * | | Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY REFERENCES IS | Annamalai Gurusami | 2014-06-10 | 1 | -1/+38 |
| | | * | | Bug 16876388 - PLEASE BACKPORT BUG#16208542 TO 5.5 | unknown | 2013-06-25 | 1 | -16/+13 |
| | | * | | Fix Bug#16400412 UNNECESSARY DICT_UPDATE_STATISTICS DURING CONCURRENT | Vasil Dimov | 2013-03-18 | 1 | -2/+18 |
| | | * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-10-16 | 1 | -0/+12 |
| | | |\ \ | |||||
| * | | \ \ | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 1 | -26/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | 5.6.26 | Sergei Golubchik | 2015-08-03 | 1 | -26/+1 |
| | * | | | move to storage/innobase | Sergei Golubchik | 2015-05-04 | 1 | -0/+1841 |
| | / / | |||||
* | | | | Merge 10.0 -> 10.1 | Kristian Nielsen | 2015-04-20 | 1 | -0/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-7367: Updating a virtual column corrupts table which crashes server | Jan Lindström | 2015-03-31 | 1 | -0/+11 |
* | | | | InnoDB/XtraDB Encryption cleanup. | Jan Lindström | 2015-04-07 | 1 | -3/+1 |
* | | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -2/+19 |
* | | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | InnoDB 5.6.22 | Sergei Golubchik | 2015-01-21 | 1 | -1/+1 |
* | | | | MDEV-6929: Port Facebook Prefix Index Queries Optimization | Jan Lindström | 2014-11-03 | 1 | -4/+7 |
* | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -1/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | innodb-5.6.19 | Sergei Golubchik | 2014-08-06 | 1 | -1/+23 |
| * | | | MDEV-6470: Restrict number of error messages about persistent statictic table... | Jan Lindström | 2014-07-22 | 1 | -0/+3 |
* | | | | MDEV-5834: Merge Kakao Defragmentation implementation to MariaDB 10.1 | Jan Lindström | 2014-08-06 | 1 | -1/+13 |
* | | | | MDEV-6246: Merge 10.0.10-FusionIO to 10.1. | Jan Lindström | 2014-05-22 | 1 | -1/+13 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge: lp:maria/10.0 latest. | Jan Lindström | 2014-03-03 | 1 | -17/+43 |
| |\ \ \ | |||||
| * | | | | Enhancement: Change atomic_writes table option to enum type. Now every file c... | Jan Lindström | 2014-01-10 | 1 | -2/+2 |
| * | | | | Changes for Fusion-io multi-threaded flush, page compressed tables and | Jan Lindström | 2013-12-19 | 1 | -1/+13 |
* | | | | | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -8/+15 |
| |/ / / |/| | | | |||||
* | | | | MDEV-5574 Set AUTO_INCREMENT below max value of column. | Sergei Golubchik | 2014-02-01 | 1 | -17/+43 |
|/ / / | |||||
* | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -227/+525 |
* | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | WL#6161 Integrating with InnoDB codebase in MySQL 5.5 | Narayanan Venkateswaran | 2012-06-07 | 1 | -1/+4 |