summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3.4 mergeSergei Golubchik2012-02-151-2/+2
|\
| * Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-2/+2
* | 5.3 mergeSergei Golubchik2012-01-131-4/+1
|\ \ | |/
| * Rewrite IGNORE handling:Michael Widenius2011-12-111-3/+0
| * Merge with 5.2.Michael Widenius2011-12-111-11/+11
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-11/+11
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-11/+11
| | | |\
* | | | \ 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | BUG#834534: Assertion `0' failed in replace_where_subcondition with semijoin ...Sergey Petrunya2011-08-291-1/+0
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \
| * \ \ \ \ 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-2/+2
* | | | | | 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
View Lorry Controller Status