summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* mysql 5.5.23 mergeSergei Golubchik2012-04-101-1/+1
|\
| * Merge the 5.5.22 release build into main 5.5,Joerg Bruehe2012-03-201-0/+17
| |\
| * \ Merge from 5.1 to 5.5Praveenkumar Hulakund2012-02-291-1/+1
| |\ \
| | * | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE...Praveenkumar Hulakund2012-02-291-1/+1
* | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-0/+17
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge from mysql-5.1-security to mysql-5.5-securityJon Olav Hauglid2012-01-091-0/+17
| |\ \ \ | | |/ / | |/| |
| | * | Backport from mysql-trunk of:Jon Olav Hauglid2012-01-091-0/+17
| | |/
* | | mysql-5.5 mergeSergei Golubchik2012-01-161-2/+4
|\ \ \ | |/ /
| * | Bug12589870 post merge fixes - manual mergeTatjana Azundris Nuernberg2011-10-191-1/+1
| |\ \ | | |/
| * | Merge from 5.1-securityMagne Mahre2011-10-071-1/+11
| |\ \
| * | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF ADmitry Shulga2011-08-131-2/+4
* | | | 5.3 mergeSergei Golubchik2012-01-131-3/+14
|\ \ \ \
| * | | | Fixed valgrind error when storing db_name_length in query_cache.Michael Widenius2011-12-131-5/+6
| * | | | Merge with 5.2.Michael Widenius2011-12-111-5/+33
| |\ \ \ \
| | * \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-5/+33
| | |\ \ \ \
| | | * \ \ \ Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+11
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Bug12589870 post-merge fixes for Sparc64 and friendsTatjana Azundris Nuernberg2011-10-191-1/+1
| | | | | |/ | | | | |/|
| | | | * | BUG#12589870 CRASHES WITH MULTIQUERY PACKET + USE<DB> + QUERY CACHEMagne Mahre2011-10-071-1/+11
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-4/+22
| | | |\ \ \ | | | | |/ /
| | | | * | Merge from mysql-5.1.58-releaseKaren Langford2011-07-061-1/+2
| | | | |\ \
| | | | | * \ merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-06-061-3/+3
| | | | | |\ \
| | | | * | \ \ Updated/added copyright headersKent Boortz2011-07-031-2/+17
| | | | |\ \ \ \
| | | | * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | | |\ \ \ \ \
| | | | | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |