summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* 5.2 mergeSergei Golubchik2010-10-281-0/+17
|\
| * merge with 5.1Sergei Golubchik2010-10-251-0/+17
| |\
| | * 5.1.51 mergeSergei Golubchik2010-10-191-0/+17
| | |\
| | | * WL#5370 Keep forward-compatibility when changingunknown2010-08-181-0/+17
* | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-15/+79
|\ \ \ \ | |/ / /
| * | | merge with 5.1Sergei Golubchik2010-09-111-3/+17
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+17
| | |\ \ | | | |/
| | | * BUG#49124 Security issue with /*!-versioned */ SQL statements on Slaveunknown2010-07-291-3/+17
| * | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-14/+57
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-14/+57
| | |\ \ | | | |/
| | | * Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-4/+44
| | | |\
| | | | * Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-4/+44
| | | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-10/+13
| | | |/
| * | | Fixed bug #603186.Igor Babaev2010-07-151-0/+7
* | | | Subquery cache (MWL#66) added.unknown2010-07-101-0/+6
* | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-0/+9
|\ \ \ \ | |/ / /
| * | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+2
| |\ \ \ | | |/ /
| | * | Changed the fixes for the following bugs:Igor Babaev2010-05-251-2/+0
| | * | Fixes after last merge of MySQL 5.1Michael Widenius2010-05-131-0/+1
| | * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+3
| | |\ \ | | | |/
| | | * Bug #50095 Multi statement including CREATE EVENT causes rotten binlog entryunknown2010-03-281-0/+1
| | | * Bug #45640: optimizer bug produces wrong resultsGleb Shchepa2010-02-061-0/+2
| | | * Revert a patch for Bug#48231, which introduced valgrind warnings.Alexander Nozdrin2010-02-021-25/+0
| | | * Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER;unknown2010-01-301-0/+25
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-0/+5
| * | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-0/+2
* | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-7/+0
|\ \ \ \ | |/ / /
| * | | merge 5.1-> 5.2unknown2009-12-081-7/+0
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1, with following additions:unknown2009-11-161-7/+0
| | |\ \ | | | |/
| | | * Bug#43746: YACC return wrong query string when parse 'load data infile' sql s...Tatiana A. Nurnberg2009-09-281-7/+0
* | | | Subquery optimization backport:Sergey Petrunya2010-02-161-1/+1
* | | | BUG#31480: Incorrect result for nested subquery when executed via semi joinSergey Petrunya2010-02-121-1/+1
* | | | Subquery optimizations: non-semijoin materializationSergey Petrunya2010-01-281-1/+2
* | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-1/+2
|/ / /
* | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+9
|\ \ \
| * | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+9
| |/ /
* | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-0/+2
|/ /
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-1/+1
|\ \ | |/ |/|
| * MWL#17: Table eliminationSergey Petrunia2009-06-221-1/+1
* | Manual merge.Davi Arnaut2009-08-101-4/+4
|\ \
* \ \ merged 5.0-bugteam to 5.1-bugteamGeorgi Kodinov2009-05-271-0/+2
|\ \ \
| * | | Bug #38159: Function parsing problem generates misleading error messageGeorgi Kodinov2009-05-271-0/+2
| |/ /
| * | Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-1/+9
| |\ \
| | * \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-3/+56
| | |\ \
| | * \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-1/+10
| | |\ \ \
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-1/+9
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-10-101-1/+9
| | | |\ \ \ \
| | | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-1/+9
| | | | |\ \ \ \
| | | | | * \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-1/+9
| | | | | |\ \ \ \
* | | | | | \ \ \ \ Merge fix for bug 39559 and bugteam trunk.Chad MILLER2009-04-101-0/+14
|\ \ \ \ \ \ \ \ \ \