Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2020-03-11 | 1 | -4/+4 |
|\ | |||||
| * | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2020-03-11 | 1 | -4/+4 |
| |\ | |||||
| | * | MDEV-21758 : Events switched randomly to SLAVESIDE_DISABLED | Jan Lindström | 2020-03-09 | 1 | -4/+4 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-09-12 | 1 | -0/+40 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-09-10 | 1 | -0/+40 |
| |\ \ | | |/ | |||||
| | * | MDEV-20511: Galera replication of events is not consistent | Jan Lindström | 2019-09-09 | 1 | -0/+40 |
* | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-05-19 | 1 | -1/+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 |
| | |\ | |||||
| | | * | 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 | Oleksandr Byelkin | 2019-05-12 | 1 | -0/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2019-05-04 | 1 | -0/+6 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-19265 Server should throw warning if event is created and event_schedule... | Vladislav Vaintroub | 2019-04-28 | 1 | -0/+6 |
* | | | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2018-11-06 | 1 | -9/+9 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -9/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -9/+7 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | wsrep: create a macro for the error: label | Sergei Golubchik | 2018-10-24 | 1 | -9/+7 |
* | | | | | compilation failure on Windows | Sergei Golubchik | 2018-10-31 | 1 | -1/+1 |
* | | | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2018-10-05 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 1 | -0/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -0/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2018-09-07 | 1 | -0/+2 |
| | | |\ \ | |||||
| | | | * | | MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_data | Jan Lindström | 2018-07-24 | 1 | -0/+3 |
* | | | | | | MDEV-11953: support of brackets in UNION/EXCEPT/INTERSECT operations | Oleksandr Byelkin | 2018-07-04 | 1 | -4/+5 |
* | | | | | | Merge remote-tracking branch 'origin/10.3' into 10.4 | Alexander Barkov | 2018-07-03 | 1 | -5/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -5/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -5/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -5/+3 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+15 |
| | | | |\ \ | |||||
| | | | | * | | MW-416 Replicating DDL after ACL check, 5.6 version | sjaakola | 2017-10-19 | 1 | -0/+15 |
| | | | | * | | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -3/+5 |
| | | | | |\ \ | | | | | | |/ | |||||
| | | | | * | | bzr merge -r3985..3997 codership/5.5 | Nirbhay Choubey | 2014-06-10 | 1 | -0/+41 |
| | | | | * | | 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 | -1/+1 |
| | | | | * | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -3/+4 |
| | | | | |\ \ \ | |||||
| | | | | * | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -0/+12 |
| | | | * | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -4/+5 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -0/+2 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | mysys: rename ME_xxx flags to match plugin api | Sergei Golubchik | 2018-06-04 | 1 | -7/+7 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Add likely/unlikely to speed up execution | Monty | 2018-05-07 | 1 | -5/+5 |
* | | | | | | | | | | | Changed database, tablename and alias to be LEX_CSTRING | Monty | 2018-01-30 | 1 | -5/+5 |
* | | | | | | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Monty | 2018-01-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Vicențiu Ciorbaru | 2017-12-22 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | MW-416 | sjaakola | 2017-12-19 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-12-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge 10.1 to 10.2 | Marko Mäkelä | 2017-12-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / |