summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MDEV-5657 (parallel replication) to 10.0unknown2014-02-261-18/+34
|\
| * MDEV-5657: Parallel replication.unknown2014-02-261-18/+34
* | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-5/+5
* | Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-0/+1
|\ \ | |/
| * Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-101-0/+1
| |\
| | * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-0/+1
* | | Automatic mergeMichael Widenius2014-02-051-0/+32
|\ \ \
| * | | Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-0/+32
* | | | 10.0-base mergeSergei Golubchik2014-02-031-16/+49
|\ \ \ \ | | |/ / | |/| |
| * | | 5.5 mergeSergei Golubchik2014-02-011-1/+3
| |\ \ \ | | |_|/ | |/| |
| | * | merge 5.3 -> 5.5Alexander Barkov2014-01-281-1/+2
| | |\ \
| | | * | MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.cAlexander Barkov2014-01-281-1/+2
| | * | | MDEV-5419 no audit events for warnings converted to errors in the strict mode.Alexey Botchkov2014-01-231-0/+1
| * | | | MDEV-5363: Make parallel replication waits killableunknown2014-01-061-0/+2
| * | | | MDEV-5363: Make parallel replication waits killableunknown2013-12-131-16/+29
| * | | | MDEV-5363: Make parallel replication waits killableunknown2013-12-051-3/+18
* | | | | MDEV-4816: rpl.rpl_trunc_temp fails in 10.0-sergSergey Petrunya2014-01-201-1/+1
| |_|_|/ |/| | |
* | | | remove duplicate function (see thd_tx_isolation())Sergei Golubchik2013-12-221-5/+0
* | | | 10.0-base mergeSergei Golubchik2013-12-161-0/+4
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-11-231-0/+4
| |\ \ \ | | |/ /
| | * | mysql-5.5.34 mergeSergei Golubchik2013-11-191-0/+4
| | |\ \
| | | * \ WL#7076: Backporting wl6715 to support both formats Ashish Agarwal2013-08-231-17/+65
| | | |\ \
| | | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-17/+65
| | | * | | Bug#17083851 BACKPORT BUG#11765744 TO 5.1, 5.5 AND 5.6 prabakaran thirumalai2013-07-301-0/+1
| | | |\ \ \
| | | | * | | Bug#17083851 BACKPORT BUG#11765744 TO 5.1, 5.5 AND 5.6 prabakaran thirumalai2013-07-301-0/+1
| | | | * | | Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
| | | * | | | Bug #14017206 WITH CONSISTENT SNAPSHOT DOES NOT WORK WITH ISOLATION LEVELAnnamalai Gurusami2013-07-101-0/+4
| | | | |/ / | | | |/| |
| | | * | | Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSINGJon Olav Hauglid2013-05-081-2/+4
* | | | | | remove #ifdef ENABLE_BEFORE_END_OF_MERGE_QQSergei Golubchik2013-12-091-2/+0
* | | | | | cleanups:Sergei Golubchik2013-12-091-2/+0
* | | | | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not workSergei Golubchik2013-12-091-2/+2
* | | | | | MroongaSE: addint thd_autoinc and thd_error_context plugin servicesAlexander Barkov2013-12-121-5/+41
* | | | | | 10.0-base mergeSergei Golubchik2013-11-131-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5. mergeSergei Golubchik2013-11-131-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-4824 userstats - wrong user statisticsSergei Golubchik2013-11-111-0/+1
* | | | | | Merge 10.0-base to 10.0unknown2013-11-071-1/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-4506: Parallel replicationunknown2013-11-061-1/+27
* | | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-6/+264
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-6/+264
| |\ \ \ \ \
| | * | | | | MDEV-4506: Parallel replication: error handling.unknown2013-10-141-7/+11
| | * | | | | Fixes for parallel slave:Michael Widenius2013-10-141-0/+18
| | * | | | | MDEV-4506: Parallel replication: After-review fixes.unknown2013-09-231-1/+1
| | * | | | | MDEV-4506: parallel replication.unknown2013-09-231-13/+11
| | * | | | | MDEV-4506: parallel replication.unknown2013-09-171-0/+13
| | * | | | | MDEV-4506, parallel replication.unknown2013-09-131-1/+6
| | * | | | | MDEV-4506: Parallel replication: Intermediate commitunknown2013-07-121-6/+11
| | * | | | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-07-031-0/+7
| | * | | | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-06-261-0/+208
* | | | | | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | support DEFINER=role and DEFINER=current_roleSergei Golubchik2013-10-181-5/+5