summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-12/+18
|\
| * MDEV-5433 select_result::send_error() is unusedSergei Golubchik2014-03-261-8/+2
| * 5.5 mergeSergei Golubchik2014-03-261-4/+12
| |\
| | * MDEV-5829: STOP SLAVE resets global status variablesMichael Widenius2014-03-141-4/+13
| * | MDEV-9095: Executing triggers on slave in row-based replicationunknown2014-03-191-0/+3
| * | MDEV-5619: CREATE OR REPLACE does not release MDL_EXCLUSIVE upon failureMichael Widenius2014-03-121-0/+1
* | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-38/+86
|\ \ \ | |/ /
| * | @@old_mode=zero_date_time_castSergei Golubchik2014-03-071-2/+3
| * | Merge MDEV-5657 (parallel replication) to 10.0unknown2014-02-261-12/+17
| |\ \
| | * | MDEV-5657: Parallel replication.unknown2014-02-261-12/+17
| * | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-1/+1
| * | | Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-5/+12
| |\ \ \ | | |/ /
| | * | Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-101-5/+12
| | |\ \
| | | * | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-5/+12
| * | | | 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
* | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-4/+8
|\ \ \ \ | |/ / /
| * | | 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
* | | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-15/+243
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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