Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Set default progress report time to 5 seconds | Michael Widenius | 2014-02-11 | 1 | -1/+1 |
* | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -2/+2 |
* | | | Merge 10.0-base -> 10.0 | unknown | 2014-02-11 | 1 | -1/+6 |
|\ \ \ | |/ / | |||||
| * | | MDEV-4937: sql_slave_skip_counter does not work with GTID | unknown | 2014-02-11 | 1 | -1/+6 |
* | | | Merge MariaDB 10.0-base to 10.0. | unknown | 2014-02-10 | 1 | -0/+27 |
|\ \ \ | |/ / | |||||
| * | | Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base. | unknown | 2014-02-10 | 1 | -0/+27 |
| |\ \ | |||||
| | * | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. | unknown | 2014-02-07 | 1 | -0/+27 |
* | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -19/+45 |
|\ \ \ \ | |||||
| * | | | | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 1 | -9/+23 |
| * | | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -9/+21 |
| * | | | | Increased back_log to 150, but not more than max_connections. | Michael Widenius | 2013-12-27 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -5/+33 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -5/+33 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNORE | Michael Widenius | 2014-01-26 | 1 | -1/+25 |
| | * | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -4/+8 |
| | |\ | |||||
| | | * | BUG#16032946 - PLEASE GIVE A MESSAGE FOR "THREAD_CONCURRENCY DOESN'T | Nisha Gopalakrishnan | 2013-09-05 | 1 | -3/+7 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -2/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -2/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -2/+6 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16865959 - PLEASE BACKPORT BUG 14749800. | Praveenkumar Hulakund | 2013-07-24 | 1 | -2/+6 |
| | | * | Bug #12546953 "SHOW VARIABLES LIKE 'DATADIR';" RETURN EMPTY. | Anirudh Mangipudi | 2013-02-18 | 1 | -1/+1 |
* | | | | MDEV-4956 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.used_tables | Sergey Vojtovich | 2013-12-10 | 1 | -1/+12 |
* | | | | MDEV-5277 - Ensure that all MySQL 5.6 options are supported by the | Sergey Vojtovich | 2013-11-25 | 1 | -9/+0 |
* | | | | merge 10-base->10.0 | unknown | 2013-11-11 | 1 | -1/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 5.5 -> 10.0-base | Alexander Barkov | 2013-11-08 | 1 | -1/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-5205 - MariaDB does not start if more than 128 cpu's are available | Sergey Vojtovich | 2013-11-05 | 1 | -1/+13 |
* | | | | Fixed things missing in merge between 10.0-base and 10.0 | Michael Widenius | 2013-11-03 | 1 | -0/+1 |
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -0/+77 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -0/+77 |
| |\ \ \ | |||||
| | * | | | MDEV-4506: Parallel replication. | unknown | 2013-10-24 | 1 | -0/+10 |
| | * | | | MDEV-4506: Parallel replication. | unknown | 2013-10-23 | 1 | -0/+2 |
| | * | | | MDEV-4506: Parallel replication: Intermediate commit. | unknown | 2013-07-09 | 1 | -6/+5 |
| | * | | | MDEV-4506: Parallel replication: Intermediate commit. | unknown | 2013-07-05 | 1 | -0/+20 |
| | * | | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate... | unknown | 2013-06-24 | 1 | -0/+46 |
* | | | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -2/+3 |
| |\ \ \ \ | |||||
| | * | | | | MDEV-407: Print EXPLAIN [ANALYZE] in the slow query log | Sergey Petrunya | 2013-09-19 | 1 | -2/+3 |
* | | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -8/+112 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-4650: show variables; ERROR 1946 (HY000): Failed to load replication sla... | unknown | 2013-08-26 | 1 | -11/+1 |
| * | | | | | MDEV-4650: show variables; ERROR 1946 (HY000): Failed to load replication sla... | unknown | 2013-08-26 | 1 | -16/+22 |
| |/ / / / | |||||
| * | | | | MDEV-26: Global transaction ID. | unknown | 2013-08-23 | 1 | -0/+101 |
* | | | | | MDEV-4702 - Reduce usage of LOCK_open | Sergey Vojtovich | 2013-08-14 | 1 | -2/+11 |
* | | | | | MDEV-4865 Change related to --log option/variable was merged partially | Sergei Golubchik | 2013-08-13 | 1 | -79/+2 |
* | | | | | don't error out in Sys_var::global_value_ptr(), | Sergei Golubchik | 2013-08-12 | 1 | -8/+1 |
* | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -91/+151 |
|\ \ \ \ \ | |||||
| * | | | | | Merge from mysql-5.6 fix for bug#11761752 (was already partially merged) | Sergey Petrunya | 2013-07-05 | 1 | -0/+8 |
| * | | | | | MDEV-4058 | unknown | 2013-06-27 | 1 | -0/+17 |
| * | | | | | Don't update table and index statics for temporary tables | Michael Widenius | 2013-06-22 | 1 | -0/+10 |