summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.1Michael Widenius2011-05-031-13/+44
|\
| * Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-13/+44
| |\
| | * Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".Dmitry Shulga2011-03-151-13/+43
* | | Merge Mariadb 5.1->5.2unknown2011-04-121-3/+3
|\ \ \ | |/ /
| * | Bug fix for lp:732124 union + limit returns wrong resultMichael Widenius2011-03-091-3/+3
* | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-16/+4
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.55Michael Widenius2011-02-201-16/+4
| |\ \ | | |/
| | * 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
| | * | Fixed following problems:Sergey Glukhov2010-12-141-15/+3
* | | | merge with 5.1Michael Widenius2010-11-301-0/+4
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-0/+4
| |\ \ \ | | |/ /
| | * | Bug#54494 crash with explain extended and prepared statementsSergey Glukhov2010-09-231-0/+4
* | | | Automatic mergeMichael Widenius2010-10-011-1/+1
|\ \ \ \
| * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-1/+1
* | | | | merge with 5.1Sergei Golubchik2010-09-111-6/+9
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-031-2/+2
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+7
| |\ \ \ | | |/ /
| | * | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-07-301-2/+2
| | * | Fixed bug #42496 - the server could crash on a debug assert after a failureDmitry Shulga2010-07-211-2/+5
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-12/+48
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-12/+48
| |\ \ \ | | |/ /
| | * | 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
| | * | 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
| | |\ \
| | | * | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-6/+9
| | * | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-9/+8
| | |/ /
* | | | mergedSergei Golubchik2010-03-151-0/+2
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-0/+2
| |\ \ \ | | |/ /
| | * | BUG#47418 RBR fails, failure with mixup of base/temporary/view unknown2010-01-161-0/+2
* | | | merge 5.1-> 5.2unknown2009-12-081-13/+15
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-13/+15
| |\ \ \ | | |/ /
| | * | Bug #47788: Crash in TABLE_LIST::hide_view_error on Georgi Kodinov2009-10-191-0/+3
| | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-13/+12
* | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-7/+8
|/ / /
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-42/+51
|\ \ \ | |/ /
| * | A fix for Bug#44495 "Prepared Statement: CALL p(<x>) - `thd->protocol == &thd...Konstantin Osipov2009-07-151-18/+25
| | |
| | \
| *-. \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-8/+7
| |\ \ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-2/+2
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-2/+2
| | |/
| | * Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-1/+1
| | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-4/+4
| | |\
| | * \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-3/+4
| | |\ \
| | * \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-3/+3
| | |\ \ \
| | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-7/+50
| | |\ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+3
| | |\ \ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+3
| | | |\ \ \ \ \