summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* workaround for incorrectly (?) generated code onSergei Golubchik2013-01-241-1/+3
* cleanup:Sergei Golubchik2013-01-231-32/+32
* cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-5/+5
* MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-20/+99
* Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-19/+16
|\
| * Merge 5.5 -> mwl248Igor Babaev2013-01-081-19/+16
| |\
| | * MDEV-3945 - do not hold LOCK_thread_count when freeing THD.Vladislav Vaintroub2012-12-211-19/+16
* | | Merge mwl248->10.0-base.Igor Babaev2012-12-191-0/+4
|\ \ \
| * \ \ Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+4
| |\ \ \ | | |/ /
| | * | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+4
| | |\ \ | | | |/ | | |/|
| | | * Merge 5.5 -> mwl248Igor Babaev2012-09-081-3/+9
| | | |\
| | | * | Fixed bug mdev-464.Igor Babaev2012-08-171-2/+0
| | | * | Merge 5.5->5.5-mwl248Igor Babaev2012-08-141-4/+5
| | | |\ \
| | | * | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-0/+3
| | | * | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-8/+17
| | | |\ \ \
| | | * | | | Removed the server option --stat-tables.Igor Babaev2012-06-021-8/+1
| | | * | | | MergeIgor Babaev2012-06-011-9/+12
| | | |\ \ \ \
| | | * \ \ \ \ Merge.Igor Babaev2012-05-181-5/+5
| | | |\ \ \ \ \
| | | * | | | | | Inverted the option --skip-stat-tables for --stat-tables.Igor Babaev2012-05-081-6/+6
| | | * | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-117/+162
| | | |\ \ \ \ \ \
| | | * | | | | | | The pilot implementation of mwl#250: Use the statistics from persistentIgor Babaev2012-04-111-5/+0
| | | * | | | | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+15
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-091-213/+35
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | MWL#248: added the option skip-stat-tables.Igor Babaev2012-01-091-1/+9
| | | | * | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+2
* | | | | | | | | | | | MDEV-3927 Add variable "have yassl"Sergei Golubchik2012-12-181-1/+7
* | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-20/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-18/+55
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | 5.3 mergeSergei Golubchik2012-10-181-1/+27
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ mergeSergei Golubchik2012-09-271-25/+25
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge from 5.1.unknown2012-09-261-25/+25
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix some failures in 5.1 Buildbot:unknown2012-09-261-25/+25
| | * | | | | | | | | | | | MDEV-495 backport --ignore-db-dir.Alexey Botchkov2012-09-271-1/+34
| | * | | | | | | | | | | | 5.2 merge.Sergei Golubchik2012-08-221-15/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | 5.1 mergeSergei Golubchik2012-08-221-15/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-15/+23
| | | | |\ \ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ \ 5.2 mergeSergei Golubchik2012-05-201-12/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | 5.1 mergeSergei Golubchik2012-05-181-12/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | merge with mysql-5.1.63Sergei Golubchik2012-05-171-12/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2012-02-201-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | | | mysql-5.5.28Sergei Golubchik2012-10-161-8/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bug#14549809 LINKING PROBLEM IN 5.5.28 BUILDS WITH THREADPOOL PLUGINTor Didriksen2012-08-281-0/+15
| | * | | | | | | | | | | | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-1/+1
| | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-13/+14
| * | | | | | | | | | | | | | | | sort status variablesSergei Golubchik2012-10-081-7/+4
* | | | | | | | | | | | | | | | | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-141-0/+6
* | | | | | | | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | MWL#182: Explain running statements: merge with 5.5-mainSergey Petrunya2012-08-121-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status