summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-2/+12
|\
| * Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-101-1/+7
| |\
| | * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-1/+7
* | | Automatic mergeMichael Widenius2014-02-051-5/+20
|\ \ \
| * | | Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-0/+1
| * | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-5/+12
| * | | Increased back_log to 150, but not more than max_connections.Michael Widenius2013-12-271-0/+7
* | | | 10.0-base mergeSergei Golubchik2014-02-031-4/+23
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 5.5 mergeSergei Golubchik2014-02-011-1/+2
| |\ \ | | |/ | |/|
| | * MDEV-5419 no audit events for warnings converted to errors in the strict mode.Alexey Botchkov2014-01-231-1/+2
* | | 10.0-base mergeSergei Golubchik2013-12-161-35/+79
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-12-151-0/+2
| |\ \ | | |/
| | * MDEV-5321 Calling mysql_library_end accesses freed memory; dumps memory to di...Alexey Botchkov2013-11-251-0/+2
| * | 5.5 mergeSergei Golubchik2013-11-231-27/+77
| |\ \ | | |/
| | * mysql-5.5.34 mergeSergei Golubchik2013-11-191-27/+78
| | |\
| | | * WL#7076: Backporting wl6715 to support both formats Ashish Agarwal2013-08-231-3/+42
| | | |\
| | | | * WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-1/+40
| | | * | Bug#16865959 - PLEASE BACKPORT BUG 14749800.Praveenkumar Hulakund2013-07-241-27/+41
| | | |/
| * | | MDEV-5306: Missing locking around rpl_global_gtid_binlog_stateunknown2013-11-181-8/+0
* | | | remove #ifdef ENABLE_BEFORE_END_OF_MERGE_QQSergei Golubchik2013-12-091-4/+0
* | | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not workSergei Golubchik2013-12-091-0/+1
* | | | MDEV-5277 - Ensure that all MySQL 5.6 options are supported by theSergey Vojtovich2013-11-251-1/+65
* | | | MDEV-5220 - [PATCH] MariaDB 10.0.4 doesn't compile without perfschemaSergey Vojtovich2013-11-141-6/+6
* | | | 10.0-base mergeSergei Golubchik2013-11-131-4/+4
|\ \ \ \ | |/ / /
| * | | 5.5. mergeSergei Golubchik2013-11-131-4/+4
| |\ \ \ | | |/ /
| | * | MDEV-5236 Status variables are not all listed alphabeticallySergei Golubchik2013-11-111-4/+4
* | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-13/+39
|\ \ \ \ | |/ / /
| * | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-13/+38
| |\ \ \
| | * | | MDEV-4506: Parallel replication.unknown2013-10-241-0/+1
| | * | | Moved the remaining variables, that depends on sql execution, from Relay_log_...Michael Widenius2013-10-151-0/+3
| | * | | Fixes for parallel slave:Michael Widenius2013-10-141-6/+7
| | * | | MDEV-4506: Parallel replication: Intermediate commit.unknown2013-07-051-2/+7
| | * | | MDEV-4506: Parallel replication: Intermediate commit.unknown2013-07-041-2/+4
| | * | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-07-031-2/+3
| | * | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-06-261-2/+5
| | * | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate...unknown2013-06-241-5/+14
* | | | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-1/+44
|\ \ \ \ \ | |/ / / /
| * | | | recursive privilege propagation for roles.Sergei Golubchik2013-10-181-0/+39
| * | | | Implemented SHOW GRANTS functionalityVicențiu Ciorbaru2013-10-181-1/+0
| * | | | Added SHOW GRANTS recursive role print.Vicențiu Ciorbaru2013-10-181-0/+1
| * | | | Implemented syntax recognition for REVOKE ROLEVicențiu Ciorbaru2013-10-181-0/+1
| * | | | Implemented syntax recognition for DROP ROLEVicențiu Ciorbaru2013-10-181-0/+1
| * | | | Implemented syntax recognition for CREATE ROLEVicențiu Ciorbaru2013-10-181-0/+1
| * | | | Changed GRANT ROLE to use SQLCOM_GRANT_ROLEVicențiu Ciorbaru2013-10-181-1/+1
| * | | | Added syntax detection for the GRANT role TO {user | role } command.Vicențiu Ciorbaru2013-10-181-0/+1
| * | | | Merge 5.5 -> 10.0-baseAlexander Barkov2013-10-211-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge 5.3 -> 5.5Alexander Barkov2013-10-211-1/+1
| | |\ \ \
| | | * \ \ Merge 5.2 -> 5.3Alexander Barkov2013-10-211-1/+1
| | | |\ \ \
| | | | * \ \ Merge 5.1 -> 5.2Alexander Barkov2013-10-211-1/+1
| | | | |\ \ \
| | | | | * | | A clean-up for DEV-4890 Valgrind warnings on shutdown on a build with openSSLAlexander Barkov2013-10-211-1/+1