summaryrefslogtreecommitdiff
path: root/sql/lex.h
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+3
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-1/+3
| |\
| | * MDEV-6916 REPAIR VIEW / mysql migrationOleksandr Byelkin2015-04-121-0/+1
* | | MDEV-60 Support for Spatial Reference systems for the GIS data.Alexey Botchkov2014-12-041-0/+1
* | | cleanup: s/(OLD_)?PASSWORD/&_SYM/gSergei Golubchik2014-12-041-2/+2
* | | MDEV-6593 : domain_id based replication filtersNirbhay Choubey2014-12-031-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-7/+3
| |\ \ \
| * | | | MDEV-6109: EXPLAIN JSON10.1-explain-jsonSergei Petrunia2014-05-271-0/+1
| | |/ / | |/| |
* | | | MDEV-5231: Per query variables from Percona Server (rewritten)Oleksandr Byelkin2014-11-111-0/+1
| |/ / |/| |
* | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-2/+0
* | | SHOW and FLUSH for I_S tables.Sergei Golubchik2014-10-111-4/+0
* | | MDEV-5317 Compound statement / anonymous blocksSergei Golubchik2014-10-101-0/+1
* | | cleanup sql_yacc.yy: s/IF/IF_SYM/Sergei Golubchik2014-10-101-1/+1
* | | MDEV 4427: query timeoutsMonty2014-10-071-0/+1
|/ /
* | Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-0/+1
* | 10.0-base merge (roles)Sergei Golubchik2013-10-291-0/+3
|\ \
| * | New syntax:Sergei Golubchik2013-10-181-0/+1
| * | Implemented SHOW GRANTS functionalityVicențiu Ciorbaru2013-10-181-0/+1
| * | Added the SET ROLE command to the grammarVicențiu Ciorbaru2013-10-171-0/+1
* | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6Alexander Barkov2013-10-231-0/+2
* | | 10.0-base merge.Sergei Golubchik2013-09-211-0/+2
|\ \ \ | |/ /
| * | MDEV-4911 - add KILL query id, and add query id information to processlistSergey Vojtovich2013-09-131-0/+1
| * | MergeIgor Babaev2013-08-061-0/+1
| |\ \
| | * | MWL#205 DELETE with result set (mdev-3814)Igor Babaev2013-08-061-0/+1
* | | | 10.0-monty mergeSergei Golubchik2013-07-211-0/+10
|\ \ \ \
| * | | | Fixed some merge issues:Michael Widenius2013-06-181-0/+3
| * | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-0/+7
* | | | | Merge 10.0-base -> 10.0unknown2013-05-281-1/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | MDEV-26: Global transaction ID.unknown2013-05-221-0/+2
| * | | | MDEV-26: Global transaction ID.unknown2013-05-151-1/+2
* | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-0/+2
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | MDEV-26: Global transaction ID.unknown2013-04-051-1/+1
| * | | MDEV-26. Intermediate commit.unknown2013-01-221-0/+2
* | | | 10.0-base mergeSergei Golubchik2013-01-311-2/+1
|\ \ \ \ | |/ / /
| * | | pre-mergeunknown2012-12-231-2/+1
| |\ \ \ | | |/ / | |/| |
| | * | backport to 5.5 dyncol changes and names supportunknown2012-12-231-3/+0
| | * | MDEV-377 Name support for dynamic columnsunknown2012-09-281-0/+2
* | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-0/+2
|\ \ \ \ | |/ / /
| * | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-0/+1
| | |/ | |/|
| * | Added function last_value() which returns the last value but evalutes all arg...Michael Widenius2012-09-051-0/+1
| |/
* | more fixes for test casesSergei Golubchik2012-10-011-1/+0
* | SQL syntax extended with START TRANSACTION READ ONLY|READ WRITEAlexey Botchkov2012-08-251-0/+1
* | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+2
|/
* Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-0/+1
|\
| * Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-0/+1
| * Merge with 5.2.Michael Widenius2011-12-111-2/+5
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+5
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+5
| | | |\
* | | | \ 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+2
|\ \ \ \ \ | |/ / / /