summaryrefslogtreecommitdiff
path: root/sql/sp.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-2/+2
|\
| * Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-2/+2
| * Make SQLString reallocation addaptiveMichael Widenius2010-11-081-1/+1
* | post-merge fixes.Sergei Golubchik2011-07-021-8/+5
* | 5.5-mergeSergei Golubchik2011-07-021-42/+115
|\ \
| * | Bug #58414 mysql_upgrade fails on dump upgrade between 5.1.53 -> 5.5.8Jon Olav Hauglid2010-11-301-0/+2
| * | Bug#45445: cannot execute procedures with thread_stack set to 128k.Alexander Nozdrin2010-11-241-6/+0
| * | Bug #57663 Concurrent statement using stored function and DROP DATABASEJon Olav Hauglid2010-11-171-0/+100
| * | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-10/+13
| * | Fixed bug#45445 - cannot execute procedures with thread_stackDmitry Shulga2010-10-211-0/+6
| * | Fix for bug#57061 "User without privilege on routine can Dmitry Lenev2010-10-071-32/+0
| * | Bug #56137 "Assertion `thd->lock == 0' failed on upgrading Dmitry Lenev2010-08-311-0/+4
* | | merge.Sergei Golubchik2010-11-251-10/+14
|\ \ \ | | |/ | |/|
| * | 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-15/+16
| |\ \ \ | | |/ /
| | * | Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-1/+6
| | |\ \
| * | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s...Sergei Golubchik2010-06-051-8/+8
| * | | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+4
| |\ \ \ \
| * | | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-1/+2
| * | | | | mergedSergei Golubchik2010-03-151-5/+23
| |\ \ \ \ \
| * \ \ \ \ \ merge 5.1->5.2unknown2010-02-011-16/+193
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge 5.1-> 5.2unknown2009-12-081-2/+2
| |\ \ \ \ \ \ \
| * | | | | | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-8/+11
* | | | | | | | | Cherry-picking patch for Bug#56137 from mysql-5.5-runtime.Alexander Nozdrin2010-08-311-0/+4
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-8/+8
* | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-111-1/+8
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-1/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-1/+6
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-9/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-14/+10
| |/ / / / /
| * | | | | Bug#47736 killing a select from a view when the view is processing a function...Sergey Glukhov2010-02-051-0/+4
| | |_|_|/ | |/| | |
| * | | | Manual merge with Conflicts:unknown2010-01-251-5/+8
| |\ \ \ \
| | * | | | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-5/+8
* | | | | | Bug #51839 mixup of DDL causes slave to stopunknown2010-04-281-14/+16
* | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+12
* | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-9/+15
|\ \ \ \ \ \
| * | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-101-0/+3
| * | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-091-9/+12
* | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-301-0/+13
| |\ \ \ \ \ \
| | * \ \ \ \ \ Auto-merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-0/+13
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug #49132 Replication failure on temporary table + DDLunknown2010-01-221-0/+13
| | | |/ / / /
* | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-5/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-211-6/+8
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-6/+8
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-6/+8
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-2/+2
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-1/+1
| | | | * | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-5/+7
| | | | |\ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |