Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-01-07 | 1 | -3/+5 |
|\ | |||||
| * | MDEV-21429 TRUNCATE and OPTIMIZE are being refused due to "row size too large" | Marko Mäkelä | 2020-01-07 | 1 | -3/+5 |
* | | MDEV-20949: Merge 10.2 into 10.3 | Marko Mäkelä | 2019-11-14 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | MDEV-20949 Stop issuing 'row size' error on DML | Eugene Kosov | 2019-11-13 | 1 | -1/+6 |
* | | Merge 10.2 into 10.3 | Eugene Kosov | 2019-07-16 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | MDEV-19292 "Row size too large" error when creating table with lots columns w... | Eugene Kosov | 2019-07-05 | 1 | -0/+7 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-03-25 | 1 | -2/+10 |
|\ \ \ | |/ / | |||||
| * | | MDEV-18090 Assertion failures due to virtual columns after upgrading to 10.2 | Marko Mäkelä | 2019-03-25 | 1 | -2/+10 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-03-19 | 1 | -3/+1 |
|\ \ \ | |/ / | |||||
| * | | Replace innobase_is_v_fld() with Field::stored_in_db() | Marko Mäkelä | 2019-03-19 | 1 | -3/+1 |
* | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-17 | 1 | -13/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove references to MySQL 5.7 native InnoDB partitioning | Marko Mäkelä | 2019-03-13 | 1 | -9/+0 |
| * | | MDEV-18836 ASAN: heap-use-after-free after TRUNCATE | Marko Mäkelä | 2019-03-13 | 1 | -4/+0 |
* | | | dirty merge | Oleksandr Byelkin | 2019-02-07 | 1 | -7/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-02 | 1 | -7/+7 |
| |\ \ | | |/ | |||||
| | * | Merge branch '10.0-galera' into 10.1 | Oleksandr Byelkin | 2019-01-31 | 1 | -1/+5 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-10-30 | 1 | -1/+5 |
| | | |\ | |||||
| | | | * | Generalize "bool shared/exclusive" argument to enum | Vasil Dimov | 2018-10-10 | 1 | -1/+5 |
| | | | * | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -0/+1 |
| | | | |\ | |||||
| | | | | * | BUG#27216817: INNODB: FAILING ASSERTION: PREBUILT->TABLE->N_MYSQL_HANDLES_OPE... | Sergei Golubchik | 2018-04-19 | 1 | -0/+1 |
| | | | * | | Fix compiler error on gcc 6.x and most of the compiler warnings. | Jan Lindström | 2017-04-05 | 1 | -2/+2 |
| | | | * | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -0/+1 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -0/+1 |
| | | | | |\ | |||||
| | | | | | * | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 1 | -0/+1 |
| | | | * | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -1/+1 |
| | | | * | | | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -2/+2 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -2/+2 |
| | | | | |\ \ | | | | | | |/ | |||||
| | | | | | * | Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS | Murthy Narkedimilli | 2013-06-10 | 1 | -2/+2 |
| | | | * | | | References https://mariadb.atlassian.net/browse/MDEV-4176 | Seppo Jaakola | 2013-02-17 | 1 | -1/+1 |
| | | | * | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -4/+5 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | * | | | References lp:1066784 | Seppo Jaakola | 2012-10-23 | 1 | -0/+3 |
| | | | * | | | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 1 | -0/+1 |
| | | | |\ \ \ | |||||
| | | | * | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -0/+38 |
| | | * | | | | | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 1 | -1/+5 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Fix a build failure noticed on Yakkety. | Nirbhay Choubey | 2016-11-02 | 1 | -2/+2 |
| | | * | | | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -9/+9 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -0/+14 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -7/+0 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -7/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API... | Seppo Jaakola | 2013-11-26 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -63/+223 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+41 |
* | | | | | | | | | | | | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-12-13 | 1 | -9/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | MDEV-17989 InnoDB: Failing assertion: dict_tf2_is_valid(flags, flags2) | Marko Mäkelä | 2018-12-13 | 1 | -9/+4 |