summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | MDEV-4702 - Reduce usage of LOCK_openSergey Vojtovich2013-08-141-2/+1
* | | MDEV-4865 Change related to --log option/variable was merged partiallySergei Golubchik2013-08-131-3/+0
* | | MDEV-4786 - merge 10.0-monty - 10.0Sergey Vojtovich2013-08-011-0/+1
* | | 10.0-monty mergeSergei Golubchik2013-07-211-1/+11
|\ \ \
| * | | MDEV-4058unknown2013-06-271-0/+6
| * | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-0/+3
| * | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-0/+1
* | | | MDEV-4570 [PATCH] Sys_query_cache_limit initialization depends on initializat...unknown2013-07-161-0/+1
* | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | MDEV-4605: Failing to load GTID slave position from rpl.gtid_slave_posunknown2013-06-031-1/+1
* | | | Merge 10.0-base -> 10.0unknown2013-05-281-2/+3
|\ \ \ \ | |/ / /
| * | | MDEV-4478: Implement GTID "strict mode"unknown2013-05-281-2/+3
* | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-0/+6
|\ \ \ \ | |/ / /
| * | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-0/+6
| |\ \ \
| | * | | MDEV-26: global transaction id. Intermediate commit.unknown2012-11-071-0/+1
| | * | | MDEV-26: Global transaction commit. Intermediate commit.unknown2012-11-051-0/+1
| | * | | MDEV-26: Global transaction id. Partial commit.unknown2012-10-231-0/+4
* | | | | 10.0-base mergeSergei Golubchik2013-04-151-30/+19
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | MDEV-3917 multiple use locks (GET_LOCK) in one connection.Alexey Botchkov2013-04-121-1/+1
| * | | Speed up connection time:Michael Widenius2013-03-251-29/+18
| |/ /
* | | 10.0-base mergeSergei Golubchik2013-01-311-1/+5
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-01-291-1/+1
| |\ \ | | |/
| | * Buildbot fixes and cleanups:Michael Widenius2013-01-111-1/+1
| * | cleanup:Sergei Golubchik2013-01-231-1/+4
| * | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-0/+1
* | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+2
|\ \ \ | |/ /
| * | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+2
| |\ \
| | * \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+2
| | |\ \ | | | |/ | | |/|
| | | * Merge 5.5->5.5-mwl248Igor Babaev2012-08-141-0/+1
| | | |\
| | | * | Added missing declaration of statistics_lock.Igor Babaev2012-07-271-0/+1
| | | * | Removed the server option --stat-tables.Igor Babaev2012-06-021-2/+1
| | | * | Inverted the option --skip-stat-tables for --stat-tables.Igor Babaev2012-05-081-2/+2
| | | * | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-1/+1
| | | |\ \
| | | * | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+2
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-4/+6
| |\ \ \ \ \ | | |/ / / /
| * | | | | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-141-0/+3
* | | | | | MDEV-3860 backport --plugin-load-add (and related mysql-test changes)Sergei Golubchik2012-12-151-0/+2
* | | | | | merge with 5.5Sergei Golubchik2012-11-031-7/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 5.3 mergeSergei Golubchik2012-10-181-4/+6
* | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-5/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-0/+1
| * | | | | Made max_relay_log_size depending on master connection.Michael Widenius2012-10-011-1/+1
| * | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-1/+1
| * | | | | Automatic mergeMichael Widenius2012-09-221-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added new status variables:Michael Widenius2012-09-091-0/+1
| | | |_|/ | | |/| |
| * | | | MDEV-232: Remove one fsync() from commit phase.unknown2012-09-131-1/+1