summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-1/+10
|\
| * 5.5 mergeSergei Golubchik2014-05-091-1/+5
| |\
| | * mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-1/+1
| | |\
| | | * BUG#18054998 - BACKPORT FIX FOR BUG#11765785 to 5.5Thayumanavar2014-01-131-11/+1
| * | | revno: 5265Sergei Golubchik2014-05-071-0/+5
* | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-1/+8
|\ \ \ \ | |/ / /
| * | | RBR triggers compiled-out with ifdefs in 10.0unknown2014-03-191-0/+4
| * | | MDEV-9095: Executing triggers on slave in row-based replicationunknown2014-03-191-0/+1
| * | | MDEV-5804: If same GTID is received on multiple master connections in multi-s...unknown2014-03-121-0/+1
| * | | MDEV-5804: If same GTID is received on multiple master connections in multi-s...unknown2014-03-091-1/+2
* | | | Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-4/+0
|\ \ \ \
| * | | | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-251-4/+0
* | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-4/+13
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | mergeSergei Golubchik2014-02-281-1/+1
| |\ \ \
| | * \ \ 10.0-base mergeSergei Golubchik2014-02-261-1/+1
| | |\ \ \
| | | * \ \ 5.5 mergeSergei Golubchik2014-02-251-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+1
| | | | |\ \ | | | | | |/
| | | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| * | | | | Merge MDEV-5657 (parallel replication) to 10.0unknown2014-02-261-2/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | MDEV-5657: Parallel replication.unknown2014-02-261-2/+4
| | |/ / /
| * | | | Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-0/+4
| |\ \ \ \ | | |/ / /
| | * | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-0/+2
| * | | | Automatic mergeMichael Widenius2014-02-051-1/+1
| |\ \ \ \
| | * | | | Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-1/+1
| * | | | | 10.0-base mergeSergei Golubchik2014-02-031-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
* | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-8/+9
|\ \ \ \ \ | |/ / / /
| * | | | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-1/+2
| * | | | 10.0-base mergeSergei Golubchik2013-12-161-4/+0
| |\ \ \ \ | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2013-11-231-1/+0
| | |\ \ \ | | | |/ /
| | | * | mysql-5.5.34 mergeSergei Golubchik2013-11-191-1/+0
| | | |\ \ | | | | |/
| | | | * WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-0/+1
| | | | * BUG#16196591 - CLIENTS CANNOT CONNECT TO MYSQLThayumanavar2013-02-051-0/+1
| | * | | MDEV-5306: Missing locking around rpl_global_gtid_binlog_stateunknown2013-11-181-3/+0
| * | | | MDEV-5277 - Ensure that all MySQL 5.6 options are supported by theSergey Vojtovich2013-11-251-0/+2
* | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-8/+32
|\ \ \ \ \ | |/ / / /
| * | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-7/+32
| |\ \ \ \ | | |/ / /
| | * | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-7/+31
| | |\ \ \
| | | * | | 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/+15
| | | * | | Fixes for parallel slave:Michael Widenius2013-10-141-3/+3
| | | * | | MDEV-4506: Parallel replication: Intermediate commit.unknown2013-07-051-0/+2
| | | * | | MDEV-4506: Parallel replication: Intermediate commit.unknown2013-07-041-1/+2
| | | * | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-07-031-1/+1
| | | * | | MDEV-4506: Parallel replication. Intermediate commit.unknown2013-06-261-2/+3
| | | * | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate...unknown2013-06-241-2/+6
| * | | | | 10.0-base merge.Sergei Golubchik2013-09-211-1/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-1/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | MDEV-4472 Audit-plugin. Server-related part of the task.Alexey Botchkov2013-09-091-1/+0
* | | | | bzr merge -r3890..3891 lp:codership-mysql/5.5Seppo Jaakola2013-11-061-2/+6
* | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-6/+14
|\ \ \ \ \ | |/ / / /