| Commit message (Expand) | Author | Age | Files | Lines |
* | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -12/+28 |
|\ |
|
| * | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 1 | -10/+20 |
| * | Implementation of MDEV-5491: CREATE OR REPLACE TABLE | Michael Widenius | 2014-01-29 | 1 | -2/+8 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -9/+28 |
|\ \
| |/
|/| |
|
| * | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -0/+5 |
| |\ |
|
| | * | Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNORE | Michael Widenius | 2014-01-26 | 1 | -0/+5 |
| * | | MDEV-5363: Make parallel replication waits killable | unknown | 2013-12-13 | 1 | -0/+19 |
| * | | MDEV-5363: Make parallel replication waits killable | unknown | 2013-12-05 | 1 | -9/+4 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -4/+8 |
|\ \ \
| |/ / |
|
| * | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -1/+7 |
| |\ \
| | |/ |
|
| | * | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -2/+8 |
| | |\ |
|
| | | * | WL#7076: Backporting wl6715 to support both formats | Ashish Agarwal | 2013-08-23 | 1 | -4/+14 |
| | | |\ |
|
| | | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 1 | -4/+14 |
| | | * | | Bug#11765252 - READ OF FREED MEMORY WHEN "USE DB" AND | Praveenkumar Hulakund | 2013-08-21 | 1 | -1/+8 |
| | | |\ \ |
|
| | | | * | | Bug#11765252 - READ OF FREED MEMORY WHEN "USE DB" AND | Praveenkumar Hulakund | 2013-08-21 | 1 | -1/+8 |
| | | * | | | Bug#17083851 BACKPORT BUG#11765744 TO 5.1, 5.5 AND 5.6 | prabakaran thirumalai | 2013-07-30 | 1 | -0/+10 |
| | | |\ \ \
| | | | |/ /
| | | | | /
| | | | |/
| | | |/| |
|
| | | | * | Bug#17083851 BACKPORT BUG#11765744 TO 5.1, 5.5 AND 5.6 | prabakaran thirumalai | 2013-07-30 | 1 | -0/+11 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | MDEV-4824 userstats - wrong user statistics | Sergei Golubchik | 2013-11-11 | 1 | -1/+1 |
* | | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -1/+157 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -1/+157 |
| |\ \ \ \ |
|
| | * | | | | MDEV-4506: Parallel replication: error handling. | unknown | 2013-10-14 | 1 | -11/+21 |
| | * | | | | Fixes for parallel slave: | Michael Widenius | 2013-10-14 | 1 | -0/+21 |
| | * | | | | MDEV-4506, parallel replication. | unknown | 2013-09-13 | 1 | -1/+1 |
| | * | | | | MDEV-4506: Parallel replication: Intermediate commit | unknown | 2013-07-12 | 1 | -1/+3 |
| | * | | | | MDEV-4506: Parallel replication. Intermediate commit. | unknown | 2013-07-03 | 1 | -0/+1 |
| | * | | | | MDEV-4506: Parallel replication. Intermediate commit. | unknown | 2013-06-26 | 1 | -0/+122 |
* | | | | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -9/+14 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | support DEFINER=role and DEFINER=current_role | Sergei Golubchik | 2013-10-18 | 1 | -9/+12 |
| * | | | | | Added acl_setrole function. The function enables/disables role privileges to | Vicențiu Ciorbaru | 2013-10-17 | 1 | -0/+2 |
* | | | | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -1/+28 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -1/+28 |
| |\ \ \ \ \ |
|
| | * | | | | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -1/+3 |
| | * | | | | | MDEV-407: Print EXPLAIN [ANALYZE] in the slow query log | Sergey Petrunya | 2013-09-19 | 1 | -0/+20 |
| | * | | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-08-24 | 1 | -0/+5 |
| | |\ \ \ \ \ |
|
| | | * | | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-06-18 | 1 | -0/+5 |
| | | |/ / / / |
|
* | | | | | | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -0/+29 |
* | | | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -3/+6 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+4 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | * | | | | | MDEV-4978 - Server cursor is broken with blobs in the select list, | Sergey Vojtovich | 2013-09-06 | 1 | -2/+4 |
| * | | | | | | MDEV-4911 - add KILL query id, and add query id information to processlist | Sergey Vojtovich | 2013-09-13 | 1 | -1/+2 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | cleanup | Sergei Golubchik | 2013-08-12 | 1 | -17/+2 |
* | | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -49/+142 |
|\ \ \ \ \ \ |
|
| * | | | | | | Merge the following patch from MySQL 5.6.10, in order to make perfschema.binl... | unknown | 2013-07-11 | 1 | -0/+38 |
| * | | | | | | strict.test now works. | Michael Widenius | 2013-07-02 | 1 | -1/+1 |
| * | | | | | | ha_partition.cc and ha_partition.h are now completely merged | Michael Widenius | 2013-06-27 | 1 | -6/+8 |
| * | | | | | | A fix of unions with duplicate rows and returning bug fix for lp:732124 union... | unknown | 2013-06-26 | 1 | -15/+15 |
| * | | | | | | Finished merging wl5986 started by Igor. | unknown | 2013-06-19 | 1 | -15/+16 |
| * | | | | | | More merge fixes: | Michael Widenius | 2013-06-16 | 1 | -0/+32 |