| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -4/+11 |
|\ |
|
| * | Add protection to not access is_open() without LOCK_log mutex | Monty | 2017-02-28 | 1 | -0/+5 |
| * | Added error checking for all calls to flush_relay_log_info() and stmt_done() | Monty | 2017-02-28 | 1 | -4/+6 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Back-port Master_info::using_parallel() to 10.0. | Kristian Nielsen | 2016-11-15 | 1 | -1/+1 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -3/+3 |
|\ \
| |/ |
|
| * | MDEV-10630 rpl.rpl_mdev6020 fails in buildbot with timeout | Monty | 2016-08-22 | 1 | -3/+3 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-01-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Merge branch 'tmp' into tmp-10.0 | Kristian Nielsen | 2016-01-15 | 1 | -0/+2 |
| |\ |
|
| * | | Cleanup of slave code: | Monty | 2016-01-03 | 1 | -1/+1 |
* | | | Merge branch 'tmp' into tmp-10.1 | Kristian Nielsen | 2016-01-15 | 1 | -0/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix error handling for GTID and domain-based parallel replication | Kristian Nielsen | 2016-01-15 | 1 | -0/+2 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -15/+15 |
|\ \ \
| | |/
| |/| |
|
| * | | Fixes to get all test to run on MacosX Lion 10.7 | Monty | 2015-11-29 | 1 | -15/+15 |
* | | | Merge branch 'mdev7818-4' into 10.1 | Kristian Nielsen | 2015-11-13 | 1 | -0/+13 |
|\ \ \
| |/ / |
|
| * | | Change Seconds_behind_master to be updated only at commit in parallel replica... | Kristian Nielsen | 2015-11-13 | 1 | -0/+13 |
| * | | Merge MDEV-8193 into 10.0 | Kristian Nielsen | 2015-09-11 | 1 | -2/+2 |
| |\ \
| | |/
| |/| |
|
| * | | Merge MDEV-8354 into 10.0 | Kristian Nielsen | 2015-06-24 | 1 | -7/+12 |
| |\ \ |
|
* | \ \ | Merge MDEV-8193 into 10.1 | Kristian Nielsen | 2015-09-11 | 1 | -2/+2 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | MDEV-8193: UNTIL clause in START SLAVE is sporadically disobeyed by parallel ... | Kristian Nielsen | 2015-09-11 | 1 | -2/+2 |
| |/ / |
|
* | | | MDEV-8264 encryption for binlog | Sergei Golubchik | 2015-09-04 | 1 | -1/+15 |
* | | | cleanup: [partial] removal of llstr() | Sergei Golubchik | 2015-09-04 | 1 | -45/+20 |
* | | | Revert f1abd015, make a smaller fix | Sergei Golubchik | 2015-09-04 | 1 | -11/+4 |
* | | | cleanup: comments | Sergei Golubchik | 2015-09-04 | 1 | -1/+1 |
* | | | MDEV-8469 Add RESET MASTER TO x to allow specification of binlog file nr | Monty | 2015-07-16 | 1 | -2/+5 |
* | | | Merge MDEV-8354 into 10.1 | Kristian Nielsen | 2015-06-24 | 1 | -7/+12 |
|\ \ \
| | |/
| |/| |
|
| * | | MDEV-8354: out-of-order error with --gtid-ignore-duplicates and row-based rep... | Kristian Nielsen | 2015-06-24 | 1 | -7/+12 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -21/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | MDEV-5114 seconds_behind_master flips to 0 & spikes back, when running show s... | Sergei Golubchik | 2015-05-03 | 1 | -21/+1 |
| |/ |
|
* | | MDEV-8001 - mysql_reset_thd_for_next_command() takes 0.04% in OLTP RO | Sergey Vojtovich | 2015-05-13 | 1 | -1/+1 |
* | | Merge 10.0 -> 10.1 | Kristian Nielsen | 2015-04-20 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | MDEV-7785: errorneous -> erroneous spelling mistake | Kristian Nielsen | 2015-03-16 | 1 | -1/+1 |
* | | after-merge fixes | Kristian Nielsen | 2015-03-04 | 1 | -1/+0 |
* | | Merge MDEV-6589 and MDEV-6403 into 10.1. | Kristian Nielsen | 2015-03-04 | 1 | -10/+61 |
|\ \
| |/ |
|
| * | MDEV-6589: Incorrect relay log start position when restarting SQL thread afte... | Kristian Nielsen | 2015-03-04 | 1 | -11/+61 |
* | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -5/+14 |
|\ \
| |/ |
|
| * | MDEV-7326: Server deadlock in connection with parallel replication | Kristian Nielsen | 2015-01-07 | 1 | -5/+14 |
* | | MDEV-7437 remove suport for "atomics" with rwlocks | Sergei Golubchik | 2015-01-13 | 1 | -2/+0 |
* | | MDEV-6676: Optimistic parallel replication | Kristian Nielsen | 2014-12-06 | 1 | -0/+2 |
|/ |
|
* | MDEV-7237: Parallel replication: incorrect relaylog position after stop/start... | Kristian Nielsen | 2014-12-01 | 1 | -2/+2 |
* | MDEV-6903: gtid_slave_pos is incorrect after master crash | Kristian Nielsen | 2014-11-25 | 1 | -0/+5 |
* | MDEV-6680: Performance of domain_parallel replication is disappointing | Kristian Nielsen | 2014-11-13 | 1 | -0/+1 |
* | MDEV-6718: Server crashed in Gtid_log_event::Gtid_log_event with parallel rep... | Kristian Nielsen | 2014-11-13 | 1 | -61/+90 |
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | compilation fixes for WITH_ATOMIC_OPS=rwlocks | Sergei Golubchik | 2014-09-08 | 1 | -2/+2 |
* | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica... | Kristian Nielsen | 2014-07-11 | 1 | -4/+75 |
|\ |
|
| * | Fix small merge errors after rebase | Kristian Nielsen | 2014-07-08 | 1 | -3/+0 |
| * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica... | Kristian Nielsen | 2014-07-08 | 1 | -1/+3 |
| * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel | unknown | 2014-06-10 | 1 | -1/+4 |
| * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel | unknown | 2014-06-03 | 1 | -0/+31 |