| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | MDEV-16240: Assertion `0' failed in row_sel_convert_mysql_key_to_innobasebb-10.2-MDEV-16240 | Oleksandr Byelkin | 2019-04-25 | 1 | -11/+49 |
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -4/+2 |
| |\ | |||||
| | * | fix gcc 8 compiler warnings | Sergei Golubchik | 2019-03-14 | 1 | -4/+2 |
| * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-03-04 | 1 | -2/+1 |
| |\ \ | |/ | |||||
| | * | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2019-03-01 | 1 | -2/+1 |
| | |\ | |||||
| | | * | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-02-28 | 1 | -2/+1 |
| | | |\ | |||||
| | | | * | MDEV-17055: Server crashes in find_order_in_list upon 2nd (3rd) execution of ... | Oleksandr Byelkin | 2019-02-28 | 1 | -1/+0 |
| | | | * | A cleanup in derived table handling: removing duplicate code from st_select_l... | Alexander Barkov | 2019-02-28 | 1 | -1/+1 |
| | * | | | MDEV-9519: Data corruption will happen on the Galera cluster size change | Julius Goryavsky | 2019-02-25 | 1 | -2/+0 |
| * | | | | MDEV-9519: Data corruption will happen on the Galera cluster size change | Julius Goryavsky | 2019-02-26 | 1 | -2/+0 |
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Remove unused code. | Sergey Vojtovich | 2018-10-19 | 1 | -1/+1 |
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -0/+32 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -0/+32 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+29 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge tag 'mariadb-5.5.59' into 5.5-galera | Jan Lindström | 2018-01-19 | 1 | -1/+1 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -7/+7 |
| | | | |\ \ \ | |||||
| | | | * | | | | MW-322 CTAS fix | sjaakola | 2017-07-20 | 1 | -1/+1 |
| | | | * | | | | MW-322 - CTAS fix merged to 5.5-v25 branch | sjaakola | 2017-07-20 | 1 | -0/+29 |
| | | | * | | | | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 1 | -1/+1 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 1 | -6/+7 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 1 | -0/+2 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -3/+13 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 1 | -16/+40 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | * | \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -7/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -10/+38 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -3/+13 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -17/+40 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-06-23 | 1 | -24/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | MDEV-8260 : Issues related to concurrent CTAS | Nirbhay Choubey | 2015-06-19 | 1 | -22/+49 |
| | | | * | | | | | | | | | | | | | | | | Merge revisions from maria/5.5 (5.5.41) | Nirbhay Choubey | 2014-12-22 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -2/+9 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -48/+46 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -2/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..... | Seppo Jaakola | 2013-05-25 | 1 | -1/+14 |
| | | | * | | | | | | | | | | | | | | | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -8/+42 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -4/+54 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | References lp:1066784 | Seppo Jaakola | 2012-10-23 | 1 | -15/+8 |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunk | Seppo Jaakola | 2012-09-18 | 1 | -1/+17 |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 1 | -4/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -0/+22 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 1 | -12/+15 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -16/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |