Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-01-25 | 1 | -0/+1 |
|\ | |||||
| * | Cleanup of slave code: | Monty | 2016-01-03 | 1 | -0/+1 |
* | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-12-22 | 1 | -0/+1 |
|\ \ | |||||
| * \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| * | | MDEV-9162 : MariaDB Galera Cluster memory leak on async slave node | Nirbhay Choubey | 2015-12-14 | 1 | -0/+1 |
| * | | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -3/+0 |
| |\ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -4/+12 |
| |\ \ \ | |||||
| * | | | | MDEV-8240 : Unknown option 'table_type' when using Connect Engine on MGC | Nirbhay Choubey | 2015-07-29 | 1 | -40/+42 |
| * | | | | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-06-23 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | MDEV-8260 : Issues related to concurrent CTAS | Nirbhay Choubey | 2015-06-19 | 1 | -0/+2 |
| | * | | | | Merge tag 'mariadb-5.5.43' into 5.5-galera | Nirbhay Choubey | 2015-05-04 | 1 | -6/+5 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -8/+36 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | refs codership/mysql-wsrep#90 made wsrep_OSU_method session variable | Teemu Ollakka | 2015-05-08 | 1 | -1/+1 |
| * | | | | | | | refs codership/mysql-wsrep#90 - fixed race in OSU | Teemu Ollakka | 2015-05-08 | 1 | -0/+1 |
| * | | | | | | | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-03-28 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | MDEV-7194: galera fails to replicate DDL queries when using binlog_checksum | Nirbhay Choubey | 2015-03-27 | 1 | -0/+1 |
| | * | | | | | | cleanup: remove unused THD::COND_wsrep_thd | Nirbhay Choubey | 2015-02-19 | 1 | -1/+0 |
| | * | | | | | | MDEV-7476: Allow SELECT to succeed even when node is not ready | Nirbhay Choubey | 2015-01-27 | 1 | -0/+1 |
| | * | | | | | | Merged r4014 from codership/5.5 | Nirbhay Choubey | 2014-08-12 | 1 | -0/+1 |
| | * | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -5/+17 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -5/+10 |
| | * | | | | | | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -3/+9 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. | Jan Lindström | 2013-11-25 | 1 | -0/+2 |
| | * | | | | | | | | | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-11-25 | 1 | -13/+0 |
| | * | | | | | | | | | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903 | Seppo Jaakola | 2013-08-21 | 1 | -0/+3 |
| | * | | | | | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -3/+16 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | References https://mariadb.atlassian.net/browse/MDEV-4176 | Seppo Jaakola | 2013-02-17 | 1 | -0/+1 |
| | * | | | | | | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -2/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | References lp:1066784 | Seppo Jaakola | 2012-10-23 | 1 | -31/+1 |
| | * | | | | | | | | | | | | | | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -11/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25 | Seppo Jaakola | 2012-08-30 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 1 | -5/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -3/+84 |
| * | | | | | | | | | | | | | | | | | | cleanup: remove unused THD::COND_wsrep_thd | Nirbhay Choubey | 2015-02-19 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | | | | MDEV-7476: Allow SELECT to succeed even when node is not ready | Nirbhay Choubey | 2015-01-27 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -6/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | bzr merge -c4123 codership/5.6/ | Nirbhay Choubey | 2014-08-12 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -3/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -12/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -38/+86 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -15/+243 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |