Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-06-12 | 1 | -0/+34 |
|\ | |||||
| * | MDEV-19653 Add class Sql_cmd_create_table | Alexander Barkov | 2019-05-31 | 1 | -0/+34 |
* | | MDEV-19158: MariaDB 10.2.22 is writing duplicate entries into binary log | Sujatha | 2019-05-14 | 1 | -2/+2 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -2/+2 |
| |\ | |||||
| | * | Follow-up to changing FSF address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | MDEV-16240: Assertion `0' failed in row_sel_convert_mysql_key_to_innobasebb-10.2-MDEV-16240 | Oleksandr Byelkin | 2019-04-25 | 1 | -2/+13 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-04-25 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.5 into 10.1 | Marko Mäkelä | 2019-04-24 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-15772 Potential list overrun during XA recovery | Thirunarayanan Balathandayuthapani | 2019-04-24 | 1 | -0/+1 |
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Jan Lindström | 2019-02-28 | 1 | -13/+25 |
|\ \ \ | |/ / | |||||
| * | | Revert offending part of MDEV-9519: Data corruption will happen on the Galera... | Jan Lindström | 2019-02-28 | 1 | -13/+25 |
| * | | MDEV-9519: Data corruption will happen on the Galera cluster size change | Julius Goryavsky | 2019-02-25 | 1 | -14/+36 |
* | | | MDEV-9519: Data corruption will happen on the Galera cluster size change | Julius Goryavsky | 2019-02-26 | 1 | -14/+36 |
* | | | MDEV-15740 Fix wsrep recovery with wsrep_emulate_bin_log | Teemu Ollakka | 2019-01-27 | 1 | -1/+4 |
* | | | MDEV-15740 Backport wsrep recovery fixes from 10.4. | Teemu Ollakka | 2019-01-25 | 1 | -3/+48 |
* | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2018-09-07 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_data | Jan Lindström | 2018-07-24 | 1 | -0/+1 |
| * | | | compiler warnings (clang 4.0.1 on i386) | Sergei Golubchik | 2018-09-04 | 1 | -1/+2 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-31 | 1 | -28/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Revert MDEV-9519 due to regressions | Marko Mäkelä | 2018-08-31 | 1 | -28/+3 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-21 | 1 | -3/+28 |
|\ \ \ \ | |/ / / | |||||
| * | | | This is patch for the https://jira.mariadb.org/browse/MDEV-9519 issue: | Julius Goryavsky | 2018-08-15 | 1 | -3/+28 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-28 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-16615 ASAN SEGV in handler::print_error or server crash after error upon... | Sergei Golubchik | 2018-06-28 | 1 | -2/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -1/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specif... | Sergei Golubchik | 2018-06-20 | 1 | -3/+0 |
| * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -0/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -15/+4 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+6 |
| | |\ \ \ | |||||
| | | * \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -1/+2 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | * | | | MW-322 - CTAS fix merged to 5.5-v25 branch | sjaakola | 2017-07-20 | 1 | -0/+5 |
| | | * | | | Merge tag 'mariadb-5.5.56' into 5.5-galera | Sachin Setiya | 2017-05-03 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -3/+2 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch '5.5' into 5.5-galera | Nirbhay Choubey | 2015-02-18 | 1 | -3/+1 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -8/+3 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -0/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-5.5.38 maria/5.5 | Nirbhay Choubey | 2014-06-10 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -5/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | * Merged revisions 3945, 3946..3950, 3951..3961 | Nirbhay Choubey | 2014-02-28 | 1 | -12/+32 |
| | | * | | | | | | | | | | | | | MDEV#5534: mysql_tzinfo_to_sql generates wrong query | Nirbhay Choubey | 2014-02-14 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -1/+14 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -6/+6 |
| | | * | | | | | | | | | | | | | | MDEV-4108 Compilation warnings with RelWithDebInfo | Nirbhay Choubey | 2013-11-25 | 1 | -0/+7 |
| | | * | | | | | | | | | | | | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -3/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-11-25 | 1 | -13/+2 |