summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-7/+20
* use PSI wrappers in aria and other non-MySQL codeSergei Golubchik2011-07-131-5/+1
* post-merge fixes.Sergei Golubchik2011-07-021-1/+2
* 5.5-mergeSergei Golubchik2011-07-021-23/+40
|\
| * merge from 5.1 for bug#11764633Mayank Prasad2011-05-181-0/+8
| * Merge.Sergey Vojtovich2011-04-221-5/+6
| |\
| | * BUG#11867985 - export symbols needed for auditingSergey Vojtovich2011-03-181-5/+6
| * | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denialDmitry Shulga2011-03-151-1/+3
| * | Local mergeMarc Alff2011-03-101-7/+7
| |\ \
| | * | Bug#11764503 (Bug#57341) Query in EXPLAIN EXTENDED shows wrong charactersAlexander Barkov2011-03-041-7/+7
| | |/
| * | Bug#11766528 PERFORMANCE_SCHEMA TRACKS BOTH BINARY AND RELAY LOGS IN THE SAME...Marc Alff2011-03-011-0/+3
| |/
| * Fix for BUG#59432 "--autocommit=on does not work (@@global.autocommit is 0)"Guilhem Bichot2011-01-141-2/+1
| * Bug#58136: Crash in vio_close at concurrent disconnect and KILLDavi Arnaut2010-12-151-1/+1
| * Fix for bug #58669: read_only not enforced on 5.5.xRamil Kalimullin2010-12-071-1/+2
| * merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteamAlfranio Correia2010-12-031-2/+4
| |\
| | * BUG#57275 binlog_cache_size affects trx- and stmt-cache and gets twice the ex...Alfranio Correia2010-11-051-2/+4
| * | Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-11-161-1/+2
| |\ \
| | * | Bug#58052 Binary log IO not being accounted for properlyMarc Alff2010-11-121-1/+2
| * | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-5/+4
| |/ /
| * | Fix for BUG#57316 "It is not clear how to disable autocommit"Guilhem Bichot2010-11-051-1/+2
| |/
* | lots of post-merge changesSergei Golubchik2011-04-251-22/+8
* | merge.Sergei Golubchik2010-11-251-2/+25
|/
* Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-301-4/+4
|\
| * Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-181-3/+3
| |\
| * \ Commit on behalf of Dmitry Lenev.Konstantin Osipov2010-08-121-4/+4
| |\ \
| | * | Fix for bug #52044 "FLUSH TABLES WITH READ LOCK and FLUSHDmitry Lenev2010-07-271-2/+2
* | | | Merging with mysql-5.5Mats Kindahl2010-08-231-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | mergeGeorgi Kodinov2010-08-051-3/+3
| |/ /
* | | WL#5363: Thread pool interfaceMats Kindahl2010-08-171-1/+1
* | | Merging with mysql-5.5-stage.Mats Kindahl2010-08-161-2/+2
|\ \ \ | |/ / |/| |
| * | WL#5363: Thread Pool Service InterfaceMats Kindahl2010-06-071-2/+1
* | | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-271-10/+3
|\ \ \ | |_|/ |/| |
| * | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-2/+2
| * | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-8/+1
* | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATEJon Olav Hauglid2010-07-011-3/+3
|/ /
* | Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-281-0/+2
|\ \
| * | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-071-0/+1
| * | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-0/+1
| |/
* | Merge of bug#51851.Mattias Jonsson2010-05-241-2/+2
|/
* Fix compile error (different storage class for mysql_temp_dir_list) Alexander Nozdrin2010-04-121-1/+1
* A post-fix patch for WL#4877/WL#5030:Alexander Nozdrin2010-04-121-1/+1
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+510
View Lorry Controller Status