summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* cleanup: freshen up CREATE SERVER codeSergei Golubchik2014-12-041-15/+0
* Merge branch '10.1' into bb-10.1-mergeSergei Golubchik2014-12-031-0/+8
|\
| * EXPLAIN FORMAT=JSON: Add support for non-merged semi-joinsSergei Petrunia2014-11-291-1/+6
| * EXPLAIN FORMAT=JSON: support derived tablesSergei Petrunia2014-11-281-0/+2
| * Merge ../10.1-explain-json-r4 into 10.1Sergei Petrunia2014-11-271-0/+1
| |\
| | * Merge ../10.1 into bb-10.1-explain-jsonSergei Petrunia2014-10-151-14/+34
| | |\
| | * | MDEV-6109: EXPLAIN JSON10.1-explain-jsonSergei Petrunia2014-05-271-0/+1
* | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
* | | | MDEV-5231: Per query variables from Percona Server (rewritten)Oleksandr Byelkin2014-11-111-0/+13
* | | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1Sergei Golubchik2014-10-161-9/+10
|\ \ \ \
| * \ \ \ Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-9/+10
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | 5.5.39 mergeSergei Golubchik2014-08-071-10/+11
| | |\ \
| | | * \ mysql-5.5.39 mergeSergei Golubchik2014-08-021-9/+10
| | | |\ \
| | | | * | Bug #18978946: BACKPORT TO 5.6: BUGFIX FOR 18017820 "BISON 3 BREAKS MYSQL BUILD"Gleb Shchepa2014-06-231-10/+9
| | | * | | MDEV-6441: memory leakunknown2014-07-311-1/+1
| | | * | | Support 6 digit version numbers in executable comment syntax.Michael Widenius2014-02-111-15/+18
* | | | | | MDEV-334: Backport of UNION ALL optimization from mysql-5.7.Igor Babaev2014-10-141-88/+103
|/ / / / /
* | | | | cleanup: my_init_dynamic_array2 -> init_dynamic_array2Sergei Golubchik2014-10-111-4/+3
* | | | | MDEV-5317 Compound statement / anonymous blocksSergei Golubchik2014-10-101-6/+17
* | | | | cleanup: rename List<> methodsSergei Golubchik2014-10-101-1/+1
* | | | | cleanup: use null_lex_str where appropriateSergei Golubchik2014-10-101-2/+1
* | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-1/+12
| |_|_|/ |/| | |
* | | | Re-commit in git:Sergei Petrunia2014-05-271-2/+3
|/ / /
* | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-13/+16
* | | 10.0-base mergeSergei Golubchik2014-02-031-13/+15
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-011-12/+15
| |\ \ \ | | |/ /
| | * | merge 5.3->5.5unknown2014-01-261-9/+3
| | |\ \
| | | * \ merge of MDEV-5356 5.1->5.3 (with more fixes and test suite).unknown2014-01-231-9/+3
| | | |\ \
| | * | | | Fix for MDEV-5531: double call procedure in one session - hard shutdown the s...Michael Widenius2014-01-241-2/+8
| | * | | | MySQL-5.5.35 mergeSergei Golubchik2014-01-221-0/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#16870783 RECENT REGRESSION: CRASH WITH GROUP_CONCAT AND INVALID SEPARATORTor Didriksen2013-09-091-0/+1
| | * | | | Merge 5.3->5.5unknown2014-01-151-1/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | MDEV-5414: RAND() in a subselect : different behavior in MariaDB and MySQLunknown2013-12-181-1/+3
* | | | | | Merge 10.0-base->10.0Alexander Barkov2013-12-191-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | A post-fix for MDEV-5009 don't look inside /*!50700 ... */ commentsAlexander Barkov2013-12-191-2/+2
* | | | | | Merge 10.0-base->10.0Alexander Barkov2013-12-181-10/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-5009 don't look inside /*!50700 ... */ commentsAlexander Barkov2013-12-181-10/+12
* | | | | | 10.0-base mergeSergei Golubchik2013-12-161-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-11-231-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | mysql-5.5.34 mergeSergei Golubchik2013-11-191-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Bug#16753869:INCORRECT TRUNCATION OF LONG SET EXPRESSION INSujatha Sivakumar2013-06-241-0/+1
| | * | | | 5.3 mergeSergei Golubchik2013-11-151-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fixed bug mdev-5288.Igor Babaev2013-11-141-1/+1
| | * | | | Merge 5.3->5.5Alexander Barkov2013-11-141-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed bug mdev-5091.Igor Babaev2013-11-131-1/+1
* | | | | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-89/+75
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE, Memory leak in binlog.binlog_base64_...Sergey Petrunya2013-10-161-1/+1
| * | | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-89/+75
| |\ \ \ \ \
| | * | | | | Code cleanup.Sergey Petrunya2013-10-151-23/+0