summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* Fixed some memory leaksMichael Widenius2013-06-191-1/+8
* Finished merging wl5986 started by Igor.unknown2013-06-191-194/+70
* Fixed some merge issues:Michael Widenius2013-06-181-1/+2
* Applied all changes from Igor and SanjaMichael Widenius2013-06-151-29/+60
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+2
* 10.0-base mergeSergei Golubchik2013-01-311-27/+33
|\
| * 5.5 mergeSergei Golubchik2013-01-291-22/+28
| |\
| | * mysql-5.5.29 mergeSergei Golubchik2013-01-151-2/+2
| | |\
| | | * Bug #15954896 "SP, MULTI-TABLE DELETE AND LONG ALIAS".Dmitry Lenev2012-12-101-22/+28
| | * | 5.3 mergeSergei Golubchik2013-01-151-22/+28
| | |\ \
| | | * \ 5.2->5.3 mergeSergei Golubchik2013-01-101-22/+28
| | | |\ \
| | | | * \ 5.1 mergeSergei Golubchik2013-01-101-22/+28
| | | | |\ \
| | | | | * \ mysql-5.1.67 mergeSergei Golubchik2013-01-091-22/+28
| | | | | |\ \
| | | | | | * | Last-minute fix to 5.1.67,Joerg Bruehe2012-12-071-22/+28
| | | | | | * | Merge from mysql-5.1.62-releaseunknown2012-03-201-0/+17
| | | | | | |\ \
| | | * | | | \ \ 5.2 mergeSergei Golubchik2012-05-201-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | 5.1 mergeSergei Golubchik2012-05-181-1/+1
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | merge with mysql-5.1.63Sergei Golubchik2012-05-171-1/+1
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-081-1/+1
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | / / | | | | | | | |/ / | | | | | | |/| |
| | | * | | | | | mergeSergei Golubchik2012-04-051-0/+17
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | mergeSergei Golubchik2012-04-051-0/+17
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | mysql-5.1.62 mergeSergei Golubchik2012-04-051-0/+17
| | | | | |\ \ \ \ | | | | | | |/ / /
| * | | | | | | | cleanup:Sergei Golubchik2013-01-231-1/+1
| * | | | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-5/+5
| * | | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-6/+6
* | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-5/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-2/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | MDEV-259 audit plugin does not see sub-statementsSergei Golubchik2012-11-081-2/+1
| * | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-3/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-3/+1
| | |/ / / / / / /
* | | | | | | | | small code cleanup taken from MySQL 5.6Sergei Golubchik2012-12-161-3/+1
|/ / / / / / / /
* | | | | | | | SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | MWL#182: Explain running statementsSergey Petrunya2011-10-271-0/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | MWL#182: Explain running statementsSergey Petrunya2011-08-231-0/+1
* | | | | | | | | | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t...Michael Widenius2012-08-281-0/+1
|/ / / / / / / / /
* | | | | | | | | 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