Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-06-06 | 1 | -1/+14 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Julius Goryavsky | 2020-06-05 | 1 | -1/+14 |
| |\ | |||||
| | * | MDEV-22763 backporting MDEV-20225 fix into 10.1 | sjaakola | 2020-06-03 | 1 | -2/+14 |
| * | | Merge branch '10.1' into 10.2 | Sergei Petrunia | 2020-01-17 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-21341: Fix UBSAN failures: Issue Six | Sergei Petrunia | 2020-01-14 | 1 | -1/+1 |
* | | | MDEV-21341: Fix UBSAN failures: Issue Sixbb-10.3-mdev21341-issueSix | Sergei Petrunia | 2020-01-12 | 1 | -1/+1 |
* | | | 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 |
| |\ \ | | |/ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-17 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | fix gcc 8 compiler warnings | Sergei Golubchik | 2019-03-14 | 1 | -2/+2 |
* | | | | cleanup: trg2bit() helper | Sergei Golubchik | 2019-01-25 | 1 | -4/+2 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -3/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -3/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | wsrep: create a macro for the error: label | Sergei Golubchik | 2018-10-24 | 1 | -3/+2 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 1 | -2/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -2/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2018-09-07 | 1 | -1/+5 |
| | |\ \ | |||||
| | | * | | Fix compile error. | Jan Lindström | 2018-07-19 | 1 | -1/+3 |
| | * | | | MDEV-15890 Strange error message if you try to FLUSH TABLES <view> after LOCK... | Alexey Botchkov | 2018-09-02 | 1 | -1/+1 |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+6 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -0/+1 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
| | | | * | | | MW-416 Replicating DDL after ACL check, 5.6 version | sjaakola | 2017-10-19 | 1 | -0/+5 |
| | | | * | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -0/+3 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -0/+7 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -1/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -2/+2 |
| | | | * | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -0/+52 |
| | | * | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | MDEV-7996 : CURRENT_USER definer does not replicate for triggers | Nirbhay Choubey | 2015-04-16 | 1 | -2/+6 |
| | | * | | | | | | | | | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -60/+13 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API... | Seppo Jaakola | 2013-11-26 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -12/+43 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+52 |
* | | | | | | | | | | | | | | | | | | | | | MDEV-16385 ROW SP variable is allowed in unexpected context | Alexander Barkov | 2018-06-05 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-29 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |