summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge parallel replication async deadlock kill into 10.2.Kristian Nielsen2016-09-091-1/+2
|\
| * Parallel replication async deadlock killKristian Nielsen2016-09-081-1/+2
* | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-2/+7
|\ \ | |/
| * Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-0/+1
| |\
| | * Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-6/+10
| | |\
| | * | Fixes for failing tests (post-merge).Nirbhay Choubey2016-08-211-1/+0
| | * | Refs MW-252sjaakola2016-08-211-1/+0
| | * | Refs MW-252sjaakola2016-08-211-0/+1
| | * | Refs: MW-248sjaakola2016-08-211-0/+1
| | * | MW-292 Reset timestamp after transaction replayDaniele Sciascia2016-07-251-0/+1
| | * | MW-265 Add support for wsrep_max_ws_rowsDaniele Sciascia2016-07-191-0/+1
| | * | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+13
| | |\ \
| * | \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-6/+10
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Added new status variables to make it easier to debug certain problems:Monty2016-08-211-0/+4
| | * | | Cleanups and minor fixesMonty2016-08-211-2/+2
| | * | | With parallel replication we have had a couple of bugs where DDL'sMonty2016-08-121-4/+4
| | * | | revert part of 69f1a32Sergei Golubchik2016-06-221-2/+2
| | * | | Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PL...Vladislav Vaintroub2016-06-211-2/+2
| | | |/ | | |/|
* | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mdev9864Igor Babaev2016-08-311-0/+11
|\ \ \ \
| * | | | MDEV-8931: (server part of) session state trackingOleksandr Byelkin2016-08-311-1/+6
| * | | | MDEV-8931: (server part of) session state trackingOleksandr Byelkin2016-08-311-0/+2
| * | | | MDEV-8931: (server part of) session state trackingOleksandr Byelkin2016-08-311-0/+4
* | | | | Merge 10.2 into 10.2-mdev9864.Igor Babaev2016-08-301-45/+223
|\ \ \ \ \ | |/ / / /
| * | | | Better SHOW PROCESSLIST for replicationMonty2016-08-291-1/+7
| * | | | Feature_check_constraint status variableSergei Golubchik2016-08-271-2/+1
| * | | | cleanup: redundant variableSergei Golubchik2016-08-271-1/+1
| * | | | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-191-17/+10
| * | | | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-191-10/+17
| * | | | clarify ER_CANT_DROP_FIELD_OR_KEYSergei Golubchik2016-07-021-0/+6
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-1/+13
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-1/+13
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-1/+13
| | | |\ \
| | | | * \ Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-1/+13
| | | | |\ \
| | | | | * | BUG#20574550 MAIN.MERGE TEST CASE FAILS IF BINLOG_FORMAT=ROWVenkatesh Duggirala2016-02-261-1/+13
| * | | | | | various cleanupsSergei Golubchik2016-06-301-3/+3
| * | | | | | Use default character set for expressionsMichael Widenius2016-06-301-1/+1
| * | | | | | More tests for "MDEV-7563 Support CHECK constraint".Alexander Barkov2016-06-301-0/+16
| * | | | | | various cleanupsMichael Widenius2016-06-301-1/+1
| * | | | | | MDEV-7563 Support CHECK constraint as in (or close to) SQL StandardMichael Widenius2016-06-301-5/+7
| * | | | | | MDEV-5535: Cannot reopen temporary tableNirbhay Choubey2016-06-101-1/+6
| * | | | | | MDEV-5535: Cannot reopen temporary tableNirbhay Choubey2016-06-101-28/+146
| * | | | | | MDEV-10180 main.events_restart fails on valgrind builder: void THD::inc_threa...Sergei Golubchik2016-06-081-1/+0
| * | | | | | cleanup: thread_countSergei Golubchik2016-06-041-0/+14
| * | | | | | fix the method nameSergei Golubchik2016-06-041-2/+2
| * | | | | | Reuse THD for new user connectionsMonty2016-06-041-3/+5
| * | | | | | MDEV-9154 : Remove workarounds (mainly dynamic function loading)Vladislav Vaintroub2016-06-011-1/+0
| * | | | | | Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2Monty2016-04-281-0/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed wrong counting of global Memory_usedMonty2016-04-281-0/+16
| * | | | | | Merge branch '10.2' into bb-10.2-mdev9543Sergei Petrunia2016-04-071-1/+1
| |\ \ \ \ \ \
| | * | | | | | Added new range of MariaDB error messages, starting from 3000Monty2016-04-051-1/+1