summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-211-48/+7
|\
| * Fixed some merge issues:Michael Widenius2013-06-181-0/+1
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-151-48/+6
* | 10.0-base mergeSergei Golubchik2013-07-181-14/+33
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-171-14/+33
| |\ \
| | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-161-13/+32
| | |\ \
| | | * \ Merge from 5.1 to 5.5Chaithra Gopalareddy2013-04-141-1/+7
| | | |\ \
| | | | * | Bug#16347426:ASSERTION FAILED: (SELECT_INSERT &&Chaithra Gopalareddy2013-04-141-1/+6
| | | | * | Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
| | | * | | Bug#16359402 CRASH WITH AGGREGATES: ASSERTION FAILED: N < M_SIZETor Didriksen2013-03-191-0/+1
| | | * | | Bug#16359402 CRASH WITH AGGREGATES: ASSERTION FAILED: N < M_SIZETor Didriksen2013-03-141-10/+25
| | | * | | merge 5.1 => 5.5Tor Didriksen2012-10-011-0/+1
| | | |\ \ \ | | | | |/ /
* | | | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-06-061-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3 merge.Sergei Golubchik2013-05-201-0/+1
| | |\ \ \ \
| | | * | | | MDEV-4290:unknown2013-05-031-0/+1
| | * | | | | The bugAlexander Barkov2013-05-081-1/+1
* | | | | | | 10.0-base mergeSergei Golubchik2013-04-151-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).Alexey Botchkov2013-04-131-0/+1
| * | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-1/+1
| * | | | | 5.5 mergeSergei Golubchik2013-03-271-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3->5.5 mergeSergei Golubchik2013-02-281-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-4123 fix.unknown2013-02-111-1/+2
| * | | | | [NOT] EXISTS to IN transformation.unknown2013-02-261-0/+2
* | | | | | 10.0-base mergeSergei Golubchik2013-01-311-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-01-291-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3 mergeSergei Golubchik2013-01-151-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | 5.2->5.3 mergeSergei Golubchik2013-01-101-0/+2
| | | |\ \ \
| | | | * \ \ 5.1 mergeSergei Golubchik2013-01-101-0/+2
| | | | |\ \ \
| | | | | * \ \ mysql-5.1.67 mergeSergei Golubchik2013-01-091-0/+2
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/|
| | | | | | * | Bug#14683676 ENDLESS MEMORY CONSUMPTION IN SETUP_REF_ARRAY WITH MAX IN SUBQUERYTor Didriksen2012-10-011-0/+1
| * | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+1
* | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mwl248->10.0-base.Igor Babaev2012-12-191-0/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Addressed the following issues from the review of the patch:Igor Babaev2012-12-051-0/+1
| | | * | | | | | | Merge 5.5->5.5-mwl248.Igor Babaev2012-08-291-1/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | * | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-3/+87
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ MergeIgor Babaev2012-06-011-1/+2
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge.Igor Babaev2012-05-221-0/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Support of the extended syntax for ANALYZE.Igor Babaev2012-05-221-0/+2
* | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-3/+0
| |/ / / / / / / / / / /
* | | | | | | | | | | | MDEV-3862 Lift limitation for merging VIEWS with Subqueries in SELECT list.unknown2012-11-201-1/+2
* | | | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-4/+126
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-3/+125
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-3/+125
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-3/+87
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | MDEV-298: SHOW EXPLAIN: Plan returned by SHOW EXPLAIN only contains 'Using te...Sergey Petrunya2012-07-201-1/+2
| | | * | | | | | | | | | Better comments.Sergey Petrunya2012-07-061-1/+3
View Lorry Controller Status