summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* merge from latest 5.5Guilhem Bichot2011-05-211-9/+9
|\
| * Fixed error in mergeMikael Ronstrom2011-04-201-1/+1
| * Merge 5.5Mikael Ronström2011-04-151-12/+24
| |\
| * | Changed prefix from ES_ to STMT_ on Query arena stateMikael Ronstrom2011-03-041-9/+9
| * | BUG#59549, fix compiler error on Windows, step 2Mikael Ronstrom2011-01-201-9/+9
* | | Merge from 5.1.Guilhem Bichot2011-05-211-7/+7
|\ \ \ | |_|/ |/| |
| * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-8/+8
* | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns emptyAlexander Nozdrin2011-04-151-3/+4
* | | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denialDmitry Shulga2011-03-151-10/+21
|\ \ \ | |/ / | | / | |/ |/|
| * Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".Dmitry Shulga2011-03-151-13/+43
* | MergeKent Boortz2010-12-291-1/+1
|\ \ | |/
| * MergeKent Boortz2010-12-291-1/+1
| |\
| | * - Added/updated copyright headersKent Boortz2010-12-281-1/+1
| | * Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-07-301-2/+2
* | | Bug #58350: 5.5.7-rc compile failed at sp_head.ccGeorgi Kodinov2010-12-081-1/+1
* | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-12-141-15/+3
|\ \ \ | |/ /
| * | Fixed following problems:Sergey Glukhov2010-12-141-15/+3
* | | Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-11-181-2/+1
|\ \ \
| * \ \ Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-11-161-2/+9
| |\ \ \
| * | | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-2/+1
* | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well.Alexander Barkov2010-11-181-1/+1
| |/ / / |/| | |
* | | | Bug#54812: assert in Diagnostics_area::set_ok_status Jorgen Loland2010-11-151-1/+8
* | | | Fix for Bug#56934 (mysql_stmt_fetch() incorrectly fills MYSQL_TIMEAlexander Nozdrin2010-11-131-1/+1
|/ / /
* | | mergeGeorgi Kodinov2010-09-291-0/+4
|\ \ \ | |/ /
| * | Bug#54494 crash with explain extended and prepared statementsSergey Glukhov2010-09-231-0/+4
* | | WL#5370 Keep forward-compatibility when changing unknown2010-08-181-8/+0
* | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-041-37/+11
|\ \ \
| * \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-2/+5
| |\ \ \
| * | | | Implement WL#5502 Remove dead 5.0 class Sensitive_cursor.Konstantin Osipov2010-07-271-3/+3
| * | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-34/+8
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-301-2/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-07-301-2/+2
* | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-231-2/+5
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Fixed bug #42496 - the server could crash on a debug assert after a failureDmitry Shulga2010-07-211-2/+5
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-281-0/+29
|\ \ \ | |/ /
| * | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-281-0/+29
| |\ \ | | |/
| | * Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-06-281-0/+28
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-2/+1
* | | Merge trunk-bugfixing -> trunk-runtimeKonstantin Osipov2010-06-171-13/+23
|\ \ \
| * \ \ Manual merge from mysql-5.1-bugteam.Alexey Kopytov2010-06-121-8/+14
| |\ \ \ | | |/ /
| | * | Addendum for the fix for bug #42064:Alexey Kopytov2010-06-121-7/+12
| | * | Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-6/+9
| | |\ \
| * | \ \ Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-111-8/+13
| |\ \ \ \
| | * \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-6/+9
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-6/+9
| * | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-9/+8
| |\ \ \ \ | | |/ / /
| | * | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-9/+8
| | |/ /
* | | | Pre-requisite patch for bug #51263 "Deadlock betweenDmitry Lenev2010-05-251-1/+1
|/ / /
* | | Clean-up, give better names, add comments toKonstantin Osipov2010-05-061-1/+1
* | | Followup to Bug#42546 Backup: RESTORE fails, thinking it finds an existing tableJon Olav Hauglid2010-05-041-1/+1