summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| |\ \ \ \ | | |/ / /
| | * | | 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
|\ \ | |/ |/|
| * Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-7/+5
* | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ...Kristofer Pettersson2009-07-291-2/+2
* | Merge from 5.0Gleb Shchepa2009-07-241-4/+2
|\ \
| * | Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-4/+2
| * | Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-2/+31
| |\ \
| | * | Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-5/+5