Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | 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 |
* | | | 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 |
| | |\ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ | 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 10.1 to 10.2 | Marko Mäkelä | 2017-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | MW-416 | sjaakola | 2017-12-18 | 1 | -0/+18 |
* | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -3/+5 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -0/+2 |
| | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback report | Sergei Golubchik | 2015-12-19 | 1 | -3/+0 |
* | | | | | | | MW-416 | sjaakola | 2017-10-10 | 1 | -1/+1 |
* | | | | | | | MW-416 | sjaakola | 2017-10-10 | 1 | -0/+18 |
* | | | | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
* | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -0/+2 |
* | | | | | | | Reuse THD for new user connections | Monty | 2016-06-04 | 1 | -1/+1 |
* | | | | | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -1/+1 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 1 | -8/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and CREATE... | Alexey Botchkov | 2016-03-23 | 1 | -8/+21 |
* | | | | | | | Removed TABLE->sort to make it possible to have multiple active calls to | Monty | 2016-03-22 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -79/+99 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | refs codership/mysql-wsrep#202 Added schema info into wsrep messages | Philip Stoev | 2015-10-19 | 1 | -2/+4 |
| * | | | | | Fix for build failures on Power8 | Nirbhay Choubey | 2015-02-20 | 1 | -1/+1 |
| * | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | bzr merge -r4091..4101 codership/5.6/ | Nirbhay Choubey | 2014-06-19 | 1 | -1/+41 |
| * | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | 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 |