Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -6/+5 |
|\ | |||||
| * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -6/+5 |
| |\ | |||||
| | * | MDEV-7049 MySQL#74585 - InnoDB: Failing assertion: *mbmaxlen < 5 in file ha_i... | Marko Mäkelä | 2018-01-22 | 1 | -5/+5 |
* | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-innodb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-10-26 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | 5.6.38 | Vicențiu Ciorbaru | 2017-10-25 | 1 | -1/+3 |
* | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix gcc 6.3.x compiler warnings. | Jan Lindström | 2017-02-16 | 1 | -6/+6 |
| | * | | Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY REFERENCES IS | Annamalai Gurusami | 2014-06-10 | 1 | -2/+10 |
| | * | | Merge from mysql-5.1 to mysql-5.5 | Annamalai Gurusami | 2013-03-29 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF | Annamalai Gurusami | 2013-03-29 | 1 | -1/+1 |
| | | * | | Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF | Annamalai Gurusami | 2013-03-28 | 1 | -4/+21 |
| | * | | | Merge from mysql-5.1 to mysql-5.5 | Annamalai Gurusami | 2013-03-28 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF | Annamalai Gurusami | 2013-03-27 | 1 | -4/+21 |
| | | |/ / | |||||
| | * | | | Fix Bug#16400412 UNNECESSARY DICT_UPDATE_STATISTICS DURING CONCURRENT | Vasil Dimov | 2013-03-18 | 1 | -2/+8 |
| | * | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-10-08 | 1 | -1/+6 |
| | |\ \ \ | | | |/ / | |||||
* | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -8/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2016-06-21 | 1 | -8/+8 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | 5.6.31 | Sergei Golubchik | 2016-06-21 | 1 | -8/+8 |
* | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -0/+17 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADD | Jan Lindström | 2016-04-22 | 1 | -0/+17 |
* | | | | | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -4/+119 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'Buggynours:10.0' into 10.0 | Sergei Golubchik | 2015-05-05 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | Add #include <ostream> in dict0mem.h and change iterator to const_iterator in... | Buggynours | 2015-03-03 | 1 | -0/+1 |
| * | | | | | InnoDB-5.6.24 | Sergei Golubchik | 2015-05-05 | 1 | -4/+118 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 1 | -4/+118 |
| | * | | | move to storage/innobase | Sergei Golubchik | 2015-05-04 | 1 | -0/+1214 |
| | / / | |||||
* | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -8/+84 |
|\ \ \ \ | |/ / / | |||||
| * | | | InnoDB 5.6.21 | Sergei Golubchik | 2014-11-20 | 1 | -8/+72 |
| * | | | MDEV-6926: innodb_rows_updated is misleading on slav | Jan Lindström | 2014-10-26 | 1 | -0/+12 |
* | | | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -10/+124 |
|\ \ \ \ | |/ / / | |||||
| * | | | InnoDB 5.6.20 | Sergei Golubchik | 2014-09-11 | 1 | -10/+124 |
* | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -1/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | innodb-5.6.19 | Sergei Golubchik | 2014-08-06 | 1 | -1/+6 |
| * | | | MDEV-6470: Restrict number of error messages about persistent statictic table... | Jan Lindström | 2014-07-22 | 1 | -0/+6 |
* | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -1/+29 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -1/+29 |
* | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -3/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-5574 Set AUTO_INCREMENT below max value of column. | Sergei Golubchik | 2014-02-01 | 1 | -3/+5 |
* | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -42/+255 |
|\ \ \ \ | |/ / / | |||||
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -42/+255 |
* | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+3 |
|/ / / | |||||
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -1/+6 |
|\ \ \ | |||||
| * \ \ | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -1/+6 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Bug#14731482 UPDATE OR DELETE CORRUPTS A RECORD WITH A LONG PRIMARY KEY | Marko Mäkelä | 2012-10-08 | 1 | -1/+6 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -71/+166 |
|/ / | |||||
* | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-02-28 | 1 | -4/+6 |
|\ \ | |/ | |||||
* | | Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES. | Jimmy Yang | 2011-08-16 | 1 | -5/+9 |
* | | Implement worklog #5743 InnoDB: Lift the limit of index key prefixes. | Jimmy Yang | 2011-05-31 | 1 | -8/+34 |