| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge ../10.1-explain-json-r4 into 10.1 | Sergei Petrunia | 2014-11-27 | 1 | -1/+5 |
|\ |
|
| * | Merge ../10.1 into bb-10.1-explain-json | Sergei Petrunia | 2014-10-15 | 1 | -2/+5 |
| |\ |
|
| * | | MDEV-6109: EXPLAIN JSON | Sergei Petrunia | 2014-08-09 | 1 | -1/+5 |
* | | | MDEV-5528 Command line variable to choose MariaDB-5.3 vs MySQL-5.6 temporal d... | Alexander Barkov | 2014-11-03 | 1 | -0/+1 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -10/+7 |
|\ \ \
| |_|/
|/| | |
|
| * | | Don't use LOCK_status for the duration of SHOW STATUS because of possible loo... | Michael Widenius | 2014-09-12 | 1 | -2/+3 |
| * | | remove unused OPT_xxx values from mysqld.cc and the related dead code | Sergei Golubchik | 2014-08-03 | 1 | -8/+0 |
| * | | Fixed problem with very slow shutdown when using 100,000 MyISAM tables with d... | Michael Widenius | 2014-07-19 | 1 | -0/+1 |
| * | | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica... | Kristian Nielsen | 2014-07-08 | 1 | -6/+4 |
| * | | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel | unknown | 2014-06-03 | 1 | -3/+7 |
* | | | MDEV-6513 deprecate engine_condition_pushdown value of the @@optimizer_switch | Sergei Golubchik | 2014-10-10 | 1 | -1/+0 |
* | | | cleanup: remove OPT_WSREP_START_POSITION and OPT_WSREP_SST_AUTH | Sergei Golubchik | 2014-10-01 | 1 | -2/+0 |
* | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -12/+0 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-27 | 1 | -0/+18 |
|\ \ \ |
|
| * | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+18 |
| | |/
| |/| |
|
* | | | Made sql_log_slow a session variable | Monty | 2014-08-09 | 1 | -1/+1 |
|/ / |
|
* | | RBR triggers enabling in 10.1 | Oleksandr Byelkin | 2014-07-02 | 1 | -4/+0 |
* | | MDEV-6107 merge default_tmp_storage_engine | Sergei Golubchik | 2014-06-15 | 1 | -1/+1 |
|/ |
|
* | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -1/+5 |
|\ |
|
| * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -1/+1 |
| |\ |
|
| | * | BUG#18054998 - BACKPORT FIX FOR BUG#11765785 to 5.5 | Thayumanavar | 2014-01-13 | 1 | -11/+1 |
* | | | revno: 5265 | Sergei Golubchik | 2014-05-07 | 1 | -0/+5 |
* | | | RBR triggers compiled-out with ifdefs in 10.0 | unknown | 2014-03-19 | 1 | -0/+4 |
* | | | MDEV-9095: Executing triggers on slave in row-based replication | unknown | 2014-03-19 | 1 | -0/+1 |
* | | | MDEV-5804: If same GTID is received on multiple master connections in multi-s... | unknown | 2014-03-12 | 1 | -0/+1 |
* | | | MDEV-5804: If same GTID is received on multiple master connections in multi-s... | unknown | 2014-03-09 | 1 | -1/+2 |
* | | | merge | Sergei Golubchik | 2014-02-28 | 1 | -1/+1 |
|\ \ \ |
|
| * \ \ | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
| |\ \ \ |
|
| | * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| | |\ \ \
| | | |/ / |
|
| | | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| | | |\ \
| | | | |/ |
|
| | | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | | Merge MDEV-5657 (parallel replication) to 10.0 | unknown | 2014-02-26 | 1 | -2/+4 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | MDEV-5657: Parallel replication. | unknown | 2014-02-26 | 1 | -2/+4 |
| |/ / / |
|
* | | | | Merge MariaDB 10.0-base to 10.0. | unknown | 2014-02-10 | 1 | -0/+4 |
|\ \ \ \
| |/ / / |
|
| * | | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. | unknown | 2014-02-07 | 1 | -0/+2 |
* | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -0/+3 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
* | | | | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -1/+2 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -4/+0 |
|\ \ \ \
| |/ / / |
|
| * | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -1/+0 |
| |\ \ \
| | |/ / |
|
| | * | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -1/+0 |
| | |\ \
| | | |/ |
|
| | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 1 | -0/+1 |
| | | * | BUG#16196591 - CLIENTS CANNOT CONNECT TO MYSQL | Thayumanavar | 2013-02-05 | 1 | -0/+1 |
| * | | | MDEV-5306: Missing locking around rpl_global_gtid_binlog_state | unknown | 2013-11-18 | 1 | -3/+0 |
* | | | | MDEV-5277 - Ensure that all MySQL 5.6 options are supported by the | Sergey Vojtovich | 2013-11-25 | 1 | -0/+2 |
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -7/+32 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -7/+31 |
| |\ \ \ |
|
| | * | | | MDEV-4506: Parallel replication. | unknown | 2013-10-24 | 1 | -0/+1 |
| | * | | | Moved the remaining variables, that depends on sql execution, from Relay_log_... | Michael Widenius | 2013-10-15 | 1 | -0/+15 |