summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Automatic mergeMichael Widenius2014-02-051-12/+28
|\
| * Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-10/+20
| * Implementation of MDEV-5491: CREATE OR REPLACE TABLEMichael Widenius2014-01-291-2/+8
* | 10.0-base mergeSergei Golubchik2014-02-031-9/+28
|\ \ | |/ |/|
| * 5.5 mergeSergei Golubchik2014-02-011-0/+5
| |\
| | * Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNOREMichael Widenius2014-01-261-0/+5
| * | MDEV-5363: Make parallel replication waits killableunknown2013-12-131-0/+19
| * | MDEV-5363: Make parallel replication waits killableunknown2013-12-051-9/+4
* | | 10.0-base mergeSergei Golubchik2013-12-161-4/+8
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-11-231-1/+7
| |\ \ | | |/
| | * mysql-5.5.34 mergeSergei Golubchik2013-11-191-2/+8
| | |\
| | | * WL#7076: Backporting wl6715 to support both formats Ashish Agarwal2013-08-231-4/+14
| | | |\
| | | | * WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-4/+14
| | | * | Bug#11765252 - READ OF FREED MEMORY WHEN "USE DB" ANDPraveenkumar Hulakund2013-08-211-1/+8
| | | |\ \
| | | | * | Bug#11765252 - READ OF FREED MEMORY WHEN "USE DB" ANDPraveenkumar Hulakund2013-08-211-1/+8
| | | * | | Bug#17083851 BACKPORT BUG#11765744 TO 5.1, 5.5 AND 5.6 prabakaran thirumalai2013-07-301-0/+10
| | | |\ \ \ | | | | |/ / | | | | | / | | | | |/ | | | |/|
| | | | * Bug#17083851 BACKPORT BUG#11765744 TO 5.1, 5.5 AND 5.6 prabakaran thirumalai2013-07-301-0/+11
* | | | | 10.0-base mergeSergei Golubchik2013-11-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 5.5. mergeSergei Golubchik2013-11-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | MDEV-4824 userstats - wrong user statisticsSergei Golubchik2013-11-111-1/+1
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-1/+157
|\ \ \ \ \ | |/ / / /
| * | | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-1/+157
| |\ \ \ \
| | * | | | MDEV-4506: Parallel replication: error handling.unknown2013-10-141-11/+21
| | * | | | Fixes for parallel slave:Michael Widenius2013-10-141-0/+21
| | * | | | MDEV-4506, parallel replication.unknown2013-09-131-1/+1
| | * | | | MDEV-4506: Parallel replication: Intermediate commitunknown2013-07-121-1/+3
| | * | | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-07-031-0/+1
| | * | | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-06-261-0/+122
* | | | | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-9/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | support DEFINER=role and DEFINER=current_roleSergei Golubchik2013-10-181-9/+12
| * | | | | Added acl_setrole function. The function enables/disables role privileges toVicențiu Ciorbaru2013-10-171-0/+2
* | | | | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-1/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-1/+28
| |\ \ \ \ \
| | * | | | | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-1/+3
| | * | | | | MDEV-407: Print EXPLAIN [ANALYZE] in the slow query logSergey Petrunya2013-09-191-0/+20
| | * | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-08-241-0/+5
| | |\ \ \ \ \
| | | * | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-181-0/+5
| | | |/ / / /
* | | | | | | MDEV-4928 Merge collation customization improvements Alexander Barkov2013-10-021-0/+29
* | | | | | | 10.0-base merge.Sergei Golubchik2013-09-211-3/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-2/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | MDEV-4978 - Server cursor is broken with blobs in the select list,Sergey Vojtovich2013-09-061-2/+4
| * | | | | | MDEV-4911 - add KILL query id, and add query id information to processlistSergey Vojtovich2013-09-131-1/+2
| | |/ / / / | |/| | | |
* | | | | | cleanupSergei Golubchik2013-08-121-17/+2
* | | | | | 10.0-monty mergeSergei Golubchik2013-07-211-49/+142
|\ \ \ \ \ \
| * | | | | | Merge the following patch from MySQL 5.6.10, in order to make perfschema.binl...unknown2013-07-111-0/+38
| * | | | | | strict.test now works.Michael Widenius2013-07-021-1/+1
| * | | | | | ha_partition.cc and ha_partition.h are now completely mergedMichael Widenius2013-06-271-6/+8
| * | | | | | A fix of unions with duplicate rows and returning bug fix for lp:732124 union...unknown2013-06-261-15/+15
| * | | | | | Finished merging wl5986 started by Igor.unknown2013-06-191-15/+16
| * | | | | | More merge fixes:Michael Widenius2013-06-161-0/+32