summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\
| | | * \ 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-031-2/+17
| | |\ \ \ \
| | | * | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLYDmitry Shulga2011-06-101-0/+15
| | | | |_|/ | | | |/| |
| | | * | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-3/+3
| | | |/ /
| | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | |/
* | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-3/+6
* | | | 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
| |\ \ \ | | |/ /
| | * | Fixed bug#54375 - Error in stored procedure leaves connectionDmitry Shulga2010-11-111-1/+1
* | | | merge with 5.1Sergei Golubchik2010-09-111-2/+2
|\ \ \ \ | |/ / /
| * | | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-031-2/+2
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-8/+37
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-8/+37
| |\ \ \ | | |/ /
| | * | Bug#53191 Lock_time in slow log is negative when logging stored routinesKristofer Pettersson2010-06-081-8/+37
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-21/+17
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-21/+13
| |\ \ \ | | |/ /
| | * | Bug#50755: Crash if stored routine def contains version commentsDavi Arnaut2010-04-011-21/+13
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+4
| |\ \ \ | | |/ /
| | * | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-03-291-0/+1
| | * | revert 48525Tatiana A. Nurnberg2010-02-221-1/+0
| | * | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-02-181-0/+1
| | * | Bug #47905 stored procedures with conditional statements notStaale Smedseng2010-02-111-0/+3
* | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-1/+1
* | | | Merge with 5.1Michael Widenius2010-04-011-0/+2
|\ \ \ \ | |/ / /
* | | | mergedSergei Golubchik2010-03-151-2/+10
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-2/+10
| |\ \ \ | | |/ /
| | * | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-0/+1
| | * | Bug#47649 crash during CALL procedureSergey Glukhov2009-12-231-2/+9
* | | | merge 5.1->5.2unknown2010-02-011-6/+18
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-6/+18
| |\ \ \ | | |/ /
| | * | mergeKristofer Pettersson2009-11-201-6/+18
| | |\ \
| | | * | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-6/+18
* | | | | merge 5.1-> 5.2unknown2009-12-081-19/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-18/+22
| |\ \ \ \
| | * \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-18/+22
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug #47412: Valgrind warnings / user can read uninitalized memory using Georgi Kodinov2009-10-261-14/+17
| | | |/ /
| | | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-4/+5
| * | | | Fixes after comments from last push:Michael Widenius2009-11-301-1/+1
| * | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-1/+2
| |/ / /
* | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-1/+4
|/ / /
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-7/+5
|\ \ \ | |/ / |/| |