summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3->5.5 mergeSergei Golubchik2011-11-221-2/+2
|\
| * Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-6/+3
| * Merge with 5.2Michael Widenius2011-09-101-3/+6
| |\
| | * Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-3/+6
* | | mergeSergei Golubchik2011-11-031-2/+2
|\ \ \
| * | | compilation warnings on WindowsSergei Golubchik2011-11-021-2/+2
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-3/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Merge from mysql-5.5.14-releaseunknown2011-07-061-2/+3
| |\ \ \
| | * \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-06-061-9/+9
| | |\ \ \
| | * \ \ \ weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-05-101-3/+4
| | |\ \ \ \
| | * \ \ \ \ Merge from mysql-5.1-security to mysql-5.5-securityJon Olav Hauglid2011-04-111-2/+3
| | |\ \ \ \ \
| | | * \ \ \ \ Merge from mysql-5.0-security to mysql-5.1-securityJon Olav Hauglid2011-04-111-1/+2
| | | |\ \ \ \ \
| | | | * | | | | Bug#11882603 SELECT_ACL ON ANY COLUMN IN MYSQL.PROC ALLOWS TO SEEJon Olav Hauglid2011-04-111-1/+2
| * | | | | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
* | | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-13/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-0/+3
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-0/+3
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-0/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-0/+3
| * | | | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-13/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-13/+1
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
* | | | | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-29/+88
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Manual-merge of patch for bug#11753738 from mysql-5.1 tree.Dmitry Shulga2011-06-101-1/+16
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLYDmitry Shulga2011-06-101-0/+15
| * | | | | | | | | | merge from latest 5.5Guilhem Bichot2011-05-211-7/+7
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge 5.5Mikael Ronström2011-04-151-3/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Changed prefix from ES_ to STMT_ on Query arena stateMikael Ronstrom2011-03-041-7/+7
| | * | | | | | | | | | mergeMikael Ronstrom2011-03-041-1/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | BUG#59549, fix compiler error on Windows, step 2Mikael Ronstrom2011-01-201-7/+7
| * | | | | | | | | | | Merge from 5.1.Guilhem Bichot2011-05-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | / / / / / / / | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-3/+3
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns emptyAlexander Nozdrin2011-04-151-3/+4
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | WL#5670: Proposal: Remove SHOW NEW MASTER statementSven Sandberg2011-02-161-1/+0
| | |/ / / / / / | |/| | | | | |
| * | | | | | | merge mysql-5.5->mysql-5.5-bugteamGeorgi Kodinov2010-12-161-7/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#45445: cannot execute procedures with thread_stack set to 128k.Alexander Nozdrin2010-11-241-7/+4
| * | | | | | | | Bug #58350: 5.5.7-rc compile failed at sp_head.ccGeorgi Kodinov2010-12-081-1/+1
| |/ / / / / / /
| * | | | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-11-181-2/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW overKonstantin Osipov2010-11-121-0/+5
| | * | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-11-121-1/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-2/+7
| * | | | | | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well.Alexander Barkov2010-11-181-5/+2
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Auto-merge from mysql-5.1-bugteam for bug#54375.Dmitry Shulga2010-11-111-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Fixed bug#54375 - Error in stored procedure leaves connectionDmitry Shulga2010-11-111-1/+1
| * | | | | | | Patch for Bug#55850 (Trigger warnings not cleared).Alexander Nozdrin2010-10-261-6/+20
| * | | | | | | Fixed bug#45445 - cannot execute procedures with thread_stackDmitry Shulga2010-10-211-4/+7
| * | | | | | | Reverting a patch for Bug#45445 (cannot execute procedures with thread_stack ...Alexander Nozdrin2010-10-131-1/+4
| * | | | | | | A follow up for the patch for Bug#45445, increase stack sizeDmitry Shulga2010-10-121-2/+3
| * | | | | | | Fixed bug#45445 - cannot execute procedures with thread_stackDmitry Shulga2010-10-071-2/+21