summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-8/+8
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-4/+4
* Automatic mergeMichael Widenius2013-02-151-6/+8
|\
| * set THR_THD key and current_thd=NULL as early as possible,Sergei Golubchik2013-02-051-6/+8
* | remove "invisible sysvars" oxymoronSergei Golubchik2013-02-021-9/+88
* | 10.0-base mergeSergei Golubchik2013-01-311-23/+102
|\ \ | |/
| * 5.5 mergeSergei Golubchik2013-01-291-3/+3
| |\
| | * 5.3 mergeSergei Golubchik2013-01-151-1/+1
| | |\
| | | * 5.2->5.3 mergeSergei Golubchik2013-01-101-1/+1
| | | |\
| | | | * 5.1 mergeSergei Golubchik2013-01-101-1/+1
| | | | |\
| | | | | * mysql-5.1.67 mergeSergei Golubchik2013-01-091-1/+1
| | | | | |\
| | | | | | * Bug#14621627 THREAD CACHE IS UNFAIRJon Olav Hauglid2012-09-251-1/+1
| | | * | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-8/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-8/+4
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-8/+4
| | | | | |\ \ | | | | | | |/
| | * | | | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-2/+2
| * | | | | | 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 10.0-base -> 10.0.Igor Babaev2013-01-101-19/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | | | | | | | | | | | Merge a couple more fixes from 10.0-base to 10.0unknown2012-12-181-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | MDEV-3927 Add variable "have yassl"Sergei Golubchik2012-12-181-1/+7
* | | | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-20/+0
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-18/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-141-0/+6
* | | | | | | | | | | | | | | | MDEV-3860 backport --plugin-load-add (and related mysql-test changes)Sergei Golubchik2012-12-151-2/+16
* | | | | | | | | | | | | | | | merge with 5.5Sergei Golubchik2012-11-031-15/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
View Lorry Controller Status