Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-03-19 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-17262: mysql crashed on galera while node rejoined cluster (#895) | sysprg | 2019-03-18 | 1 | -0/+1 |
* | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 1 | -2/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -2/+7 |
| |\ \ | | |/ | |||||
| | * | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2018-09-07 | 1 | -2/+7 |
| | |\ | |||||
| | | * | MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_data | Jan Lindström | 2018-07-24 | 1 | -7/+14 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -12/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -12/+24 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -12/+24 |
| | |\ \ | | | |/ | |||||
| | | * | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -13/+25 |
| | | |\ | |||||
| | | | * | MariaDB adjustments. | Jan Lindström | 2018-04-24 | 1 | -24/+24 |
| | | | * | Provider rollback for ineffective trx | Teemu Ollakka | 2018-04-24 | 1 | -5/+34 |
| | | | * | MDEV-7129 : Galera duplicate error on autoincrement field primary key | Nirbhay Choubey | 2015-01-07 | 1 | -1/+2 |
| | | | * | Merge lp:codership-mysql/5.5 -r3961..3980. | Jan Lindström | 2014-04-16 | 1 | -0/+6 |
| | | | * | * Merged revisions 3945, 3946..3950, 3951..3961 | Nirbhay Choubey | 2014-02-28 | 1 | -13/+6 |
| | | | * | Merging revisions 3934..3944 from codership-mysql/5.5. | Nirbhay Choubey | 2014-02-03 | 1 | -2/+7 |
| | | | * | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -92/+81 |
| | | | * | MDEV-5408: Crash in mariadb-wsrep during plugin load at startup | Jan Lindström | 2013-12-10 | 1 | -4/+6 |
| | | | * | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-11-25 | 1 | -54/+150 |
| | | | * | Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-09-26 | 1 | -7/+19 |
| | | | * | Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903 | Seppo Jaakola | 2013-08-21 | 1 | -1/+6 |
| | | | * | References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..... | Seppo Jaakola | 2013-05-25 | 1 | -0/+1 |
| | | | * | merged in revisions 3853..3857 from lp:codership-mysql/5.5-23 | Seppo Jaakola | 2013-05-21 | 1 | -0/+5 |
| | | | * | fixes for the merge with codership-mysql, revision 3839 | Seppo Jaakola | 2013-02-05 | 1 | -1/+1 |
| | | | * | merged with codership-mysql up to revision 3839 | Seppo Jaakola | 2013-02-05 | 1 | -1/+7 |
| | | | * | remerging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 1 | -0/+449 |
| | | | * | re-merging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 1 | -449/+0 |
| | | | * | References lp:1066784 | Seppo Jaakola | 2012-10-23 | 1 | -0/+9 |
| | | | * | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 1 | -1/+1 |
| | | | * | References lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -2/+9 |
| | | | * | Merged changes from lp:codership-mysql up to rev 3743 | Seppo Jaakola | 2012-04-26 | 1 | -3/+17 |
| | | | * | Added wsrep specific files | Seppo Jaakola | 2012-04-26 | 1 | -0/+419 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-05-11 | 1 | -22/+22 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-10 | 1 | -22/+22 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-16005 sporadic failures with galera tests MW-328B and MW-328C | sjaakola | 2018-04-24 | 1 | -22/+22 |
| | * | | MDEV-14875: galera_new_cluster crashes mysqld when existing server contains d... | Jan Lindström | 2018-03-19 | 1 | -4/+4 |
* | | | | Changed database, tablename and alias to be LEX_CSTRING | Monty | 2018-01-30 | 1 | -5/+17 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-30 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2018-01-30 | 1 | -4/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-14875: galera_new_cluster crashes mysqld when existing server contains d... | Jan Lindström | 2018-01-30 | 1 | -4/+4 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-11-30 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-11-29 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-11-21 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2017-11-10 | 1 | -0/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MW-402 cascading FK issues | sjaakola | 2017-11-08 | 1 | -0/+3 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-11-10 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Add more execution stages (commit, rollback, etc) | Monty | 2017-11-05 | 1 | -1/+1 |