summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-1/+5
|\
| * mysql-5.1 mergeSergei Golubchik2013-02-281-1/+5
| |\
| | * Applying patch for Bug#67177 Bug#15967374 from KentHery Ramilison2013-01-081-1/+5
* | | 5.1 mergeSergei Golubchik2012-08-221-2/+14
|\ \ \ | |/ /
| * | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-2/+14
| |\ \ | | |/
| | * Backport 5.5=>5.1 Patch for Bug#13805127: Tor Didriksen2012-04-181-2/+14
* | | Merge with MariaDB 5.1Michael Widenius2011-11-241-13/+31
|\ \ \ | |/ /
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-13/+31
| |\ \ | | |/
| | * 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
| | |\
| | | * 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/+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.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
| |\ \ \ | | |/ /
| | * | Fixed following problems:Sergey Glukhov2010-12-141-8/+9
* | | | 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 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
* | | | 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 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
* | | | 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
|\ \ \ | | |/ | |/|