summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-34/+133
|\
| * Fixed LP bug #794890.Igor Babaev2011-06-131-5/+8
| * Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-16/+42
| |\
| | * Fixed bugs causing failures fot the funcs_1 test suite.Igor Babaev2011-06-031-1/+6
| | * MergeIgor Babaev2011-05-201-15/+36
| | |\
| | | * Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-15/+36
| | | |\
| | | | * MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-15/+36
| * | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-2/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-2/+1
| * | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-16/+47
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge with MariaDB 5.1Michael Widenius2011-05-031-13/+44
| | |\ \ \
| | | * \ \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-13/+44
| | | |\ \ \
| | * | \ \ \ 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.2Michael Widenius2011-03-091-16/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| | | |\ \ \ \
| * | | | | | | Fix for LP#697622 Assertion `! is_set()' failed when preparing a HANDLER stat...Michael Widenius2011-01-121-5/+2
| * | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-041-0/+61
| * | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge with 5.1Michael Widenius2010-11-301-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-0/+4
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
* | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-48/+54
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-2/+2
* | | | | | | | merge.Sergei Golubchik2010-11-251-10/+14
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-17/+56
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |