| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-08-03 | 1 | -5/+4 |
| |\ |
|
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 1 | -6/+5 |
| | |\ |
|
| | | * | Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-19 | 1 | -6/+5 |
| | | |\ |
|
| | | | * | Merge branch '5.5' into bb-10.0-merge | Oleksandr Byelkin | 2018-07-17 | 1 | -5/+5 |
| | | | |\ |
|
| | | | | * | MDEV-8540 - Crash on server shutdown since 10.0.16 | Sergey Vojtovich | 2018-06-27 | 1 | -5/+5 |
| * | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -5/+8 |
| |\ \ \ \ \
| |/ / / / |
|
| | * | | | | MDEV-15477: SESSION_SYSVARS_TRACKER does not track last_gtid | Oleksandr Byelkin | 2018-06-25 | 1 | -1/+4 |
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -4/+4 |
| | |\ \ \ \
| | |/ / / |
|
| | | * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -4/+4 |
| | | |\ \ \ |
|
| | | | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -4/+4 |
| | | | |\ \ \ |
|
| | | | | * | | | MDEV-8743: use O_CLOEXEC MYSQL_LOG::open / TC_LOG_MMAP::open | Daniel Black | 2018-03-02 | 1 | -4/+4 |
| | | | | * | | | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -0/+5 |
| | | | | |\ \ \
| | | | | | |/
| | | | | |/| |
|
| | | | | | * | | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -0/+5 |
| | | | | * | | | Merge tag 'mariadb-5.5.57' into 5.5-galera | Jan Lindström | 2017-07-20 | 1 | -0/+7 |
| | | | | |\ \ \
| | | | | |/ / |
|
| | | | | * | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 1 | -7/+10 |
| | | | | |\ \ \ |
|
| | | | | * \ \ \ | Merge remote-tracking branch 'origin/5.5' into 5.5-galera | Nirbhay Choubey | 2016-10-14 | 1 | -1/+1 |
| | | | | |\ \ \ \ |
|
| | | | | * \ \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ |
|
| | | | | * \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | | refs codership/mysql-wsrep#226 Limit binlog recovery to found wsrep position | Teemu Ollakka | 2016-02-10 | 1 | -1/+30 |
| | | | | * | | | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -0/+2 |
| | | | | |\ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.45' into 5.5-galera | Nirbhay Choubey | 2015-08-07 | 1 | -18/+15 |
| | | | | |\ \ \ \ \ \ \ \ |
|
| | | | * | \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -1/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|/
| | | | |/| | | | | | | | |
|
| | | | * | | | | | | | | | | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -2/+14 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -23/+24 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -7/+10 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | MDEV-9423: cannot add new node to the cluser: Binlog.. | Nirbhay Choubey | 2016-08-21 | 1 | -3/+26 |
| | | | * | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -7/+7 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -1/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -2/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | refs codership/mysql-wsrep#110 - clear table map events on SAVEPOINT | Teemu Ollakka | 2015-09-09 | 1 | -0/+5 |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -31/+27 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-05-12 | 1 | -1/+17 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-5.5.43' into 5.5-galera | Nirbhay Choubey | 2015-05-04 | 1 | -11/+26 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | | MDEV-7995 : DMLs not getting replicated with log-bin=OFF & binlog-format != ROW | Nirbhay Choubey | 2015-04-22 | 1 | -1/+17 |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -24/+196 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Post-merge fix | Nirbhay Choubey | 2015-05-08 | 1 | -1/+9 |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | refs #2 - added binlog stmt cache reset after commit. This is needed for non-... | sjaakola | 2015-05-08 | 1 | -1/+22 |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-03-28 | 1 | -70/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | | | |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -0/+5 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -4/+5 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -125/+29 |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | MDEV#5407, MDEV#5386, MVED#4222 | Nirbhay Choubey | 2013-12-10 | 1 | -1/+9 |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-4222: Assertion `( ((global_system_variables.wsrep_on) && | Nirbhay Choubey | 2013-11-29 | 1 | -1/+1 |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. | Jan Lindström | 2013-11-25 | 1 | -0/+1 |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-11-25 | 1 | -13/+2 |
