Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Sergei Golubchik | 2014-02-28 | 1 | -2/+2 |
|\ | |||||
| * | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -2/+2 |
| |\ | |||||
| | * | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -2/+2 |
| | |\ | |||||
| | | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 1 | -3/+5 |
* | | | | | Merge MDEV-5657 (parallel replication) to 10.0 | unknown | 2014-02-26 | 1 | -14/+15 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | MDEV-5657: Parallel replication. | unknown | 2014-02-26 | 1 | -14/+15 |
| |/ / / | |||||
* | | | | Merge MariaDB 10.0-base to 10.0. | unknown | 2014-02-10 | 1 | -12/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-5636: Deadlock in RESET MASTER | unknown | 2014-02-09 | 1 | -12/+23 |
| * | | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. | unknown | 2014-02-07 | 1 | -0/+1 |
* | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -32/+83 |
|\ \ \ \ | |||||
| * | | | | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 1 | -15/+44 |
| * | | | | Implementation of MDEV-5491: CREATE OR REPLACE TABLE | Michael Widenius | 2014-01-29 | 1 | -17/+39 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -47/+119 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | MDEV-5363: Make parallel replication waits killable | unknown | 2013-12-13 | 1 | -43/+91 |
| * | | | MDEV-5363: Make parallel replication waits killable | unknown | 2013-12-05 | 1 | -11/+35 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -139/+172 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4983: Do not leave stale master-bin.state binlog state file | unknown | 2013-11-22 | 1 | -1/+7 |
| * | | | MDEV-4982: GTID looses all binlog state after crash if InnoDB is disabled | unknown | 2013-11-21 | 1 | -97/+158 |
| * | | | MDEV-5306: Missing locking around rpl_global_gtid_binlog_state | unknown | 2013-11-18 | 1 | -43/+9 |
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -28/+365 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -28/+365 |
| |\ \ \ | |||||
| | * | | | MDEV-4506: Parallel replication: error handling. | unknown | 2013-10-14 | 1 | -4/+5 |
| | * | | | Fixes for parallel slave: | Michael Widenius | 2013-10-14 | 1 | -3/+9 |
| | * | | | MDEV-4506: parallel replication. | unknown | 2013-09-23 | 1 | -19/+13 |
| | * | | | MDEV-4506: Parallel replication. | unknown | 2013-09-19 | 1 | -11/+18 |
| | * | | | MDEV-4506: Parallel replication. | unknown | 2013-09-17 | 1 | -0/+1 |
| | * | | | MDEV-4506: parallel replication. | unknown | 2013-09-17 | 1 | -0/+12 |
| | * | | | MDEV-4506, parallel replication. | unknown | 2013-09-13 | 1 | -90/+190 |
| | * | | | MDEV-4506: Parallel replication: Intermediate commit. | unknown | 2013-07-05 | 1 | -0/+47 |
| | * | | | MDEV-4506: Parallel replication. Intermediate commit. | unknown | 2013-06-26 | 1 | -14/+179 |
| | * | | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate... | unknown | 2013-06-24 | 1 | -6/+10 |
* | | | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -0/+9 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -0/+9 |
| |\ \ \ \ | |||||
| | * | | | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-05 | 1 | -2/+2 |
| | * | | | | MDEV-5045: Server crashes in QPF_query::print_explain with log_slow_verbosity... | Sergey Petrunya | 2013-09-20 | 1 | -2/+2 |
| | * | | | | MDEV-407: Print EXPLAIN [ANALYZE] in the slow query log | Sergey Petrunya | 2013-09-19 | 1 | -0/+9 |
* | | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -5/+51 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix various places where code would work incorrectly if the common_header_len... | unknown | 2013-09-04 | 1 | -3/+13 |
| |/ / / / | |||||
| * | | | | MDEV-26: Global transaction ID. | unknown | 2013-08-23 | 1 | -2/+38 |
* | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -23/+27 |
|\ \ \ \ \ | |||||
| * | | | | | MDEV-4756: 10.0-monty tree: log_state.test fails | Sergey Petrunya | 2013-07-04 | 1 | -0/+3 |
| * | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -17/+17 |
| * | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+4 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -3/+3 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -3/+3 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
| | | * | | upmerge to bug#14548159 | Rohit Kalhans | 2012-09-22 | 1 | -10/+23 |
| | | |\ \ |