summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+12
|\
| * Fix of LP BUG#872775.unknown2011-11-011-0/+7
| * Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-0/+3
| * BUG#849763: Wrong result with second execution of prepared statement with sem...Sergey Petrunya2011-09-201-1/+1
| * Fixed LP bug #824463.Igor Babaev2011-08-151-1/+1
* | mysql-5.5.18 mergeSergei Golubchik2011-11-031-13/+76
|\ \
| * | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-291-0/+42
| * | 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-0/+10
| |\ \
| | * | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-0/+10
| | * | Merge from mysql-5.1.58-releaseKaren Langford2011-07-061-11/+17
| | |\ \
| * | | | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ...Alfranio Correia2011-07-181-0/+5
| * | | | Merge from mysql-5.5.14-releaseunknown2011-07-061-11/+17
| |\ \ \ \
| | * \ \ \ merge 5.1 => 5.5 : Bug#12329653Tor Didriksen2011-05-051-11/+17
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | merge 5.0 => 5.1 : Bug#12329653Tor Didriksen2011-05-041-11/+17
| | | |\ \ \
| | | | * | | Bug#12329653 - EXPLAIN, UNION, PREPARED STATEMENT, CRASH, SQL_FULL_GROUP_BYTor Didriksen2011-05-041-10/+16
| * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| | | |/ /
| | | * | Postfix bug#49124Libing Song2011-01-261-1/+1
| | | * | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slaveunknown2011-01-151-4/+4
* | | | | merge with 5.3Sergei Golubchik2011-10-191-10/+79
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fixed LP BUG#800696.unknown2011-07-191-1/+0
| * | | | Fixed LP bug #794901.Igor Babaev2011-07-161-1/+7
| * | | | Fixed LP bug #794890.Igor Babaev2011-06-131-0/+3
| * | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-7/+49
| |\ \ \ \
| | * | | | Fixed typo (exlude -> exclude).unknown2011-05-301-1/+1
| | * | | | Applied Sanja's patch to fix LP bug #784297 in the tree for mwl106.Igor Babaev2011-05-271-0/+2
| | * | | | Fix warningsVladislav Vaintroub2011-05-201-1/+1
| | * | | | Fixed LP bug #784281.Igor Babaev2011-05-171-0/+2
| | * | | | Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-7/+45
| | |\ \ \ \
| | | * \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-7/+46
| | | |\ \ \ \
| | | | * | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-7/+46
| * | | | | | | Fixed the abort failure of a test case from vcol.vcol_misc.Igor Babaev2011-05-281-0/+1
| |/ / / / / /
| * | | | | | Moving max/min optimization from prepare to optimization phase. MWL#148Oleksandr Byelkin2011-05-041-1/+2
| * | | | | | MWL#89unknown2011-05-021-0/+11
| |\ \ \ \ \ \
| | * \ \ \ \ \ MWL#89unknown2011-03-301-0/+11
| | |\ \ \ \ \ \
| | | * | | | | | MWL#89unknown2011-02-101-1/+1
| | | * | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-11-051-0/+11
| | | |\ \ \ \ \ \
| | | | * | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-10-041-0/+3
| | | | * | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-09-051-0/+8
| | | | |/ / / / /
| * | | | | | | | Added ALTER ONLINE TABLE, which will give an error if the change can't be don...Michael Widenius2011-04-281-1/+1
| |/ / / / / / /
| * | | | | | | Merge with 5.2Michael Widenius2011-03-091-8/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-8/+9
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge with MySQL 5.1.55Michael Widenius2011-02-201-8/+9
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
* | | | | | | | | fix memory leaks and other problems found by safemallocSergei Golubchik2011-07-101-8/+25
* | | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-44/+38
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Bug #11755431 (former 47205)Jon Olav Hauglid2011-03-081-14/+13
| * | | | | | | | WL#5670: Proposal: Remove SHOW NEW MASTER statementSven Sandberg2011-02-161-3/+2
| * | | | | | | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-12-141-8/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Fixed following problems:Sergey Glukhov2010-12-141-8/+9