summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.1-release.Michael Widenius2010-12-061-3/+3
|\
| * merge with 5.1Michael Widenius2010-11-301-3/+3
| |\
| | * Fix of LP BUG#675248.unknown2010-11-231-3/+3
* | | Merge 5.2->5.3Sergey Petrunya2010-10-101-41/+41
|\ \ \ | |/ /
| * | merge with 5.1Sergei Golubchik2010-09-111-4/+12
| |\ \ | | |/
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+12
| | |\
| | | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-301-3/+0
| | | * BUG#49124 Security issue with /*!-versioned */ SQL statements on Slaveunknown2010-07-291-4/+15
| * | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-38/+29
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-38/+29
| | |\ \ | | | |/
| | | * Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-28/+20
| | | |\
| | | | * Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-29/+21
| | | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-10/+9
| | | |/
| * | | Fixed bug #603186.Igor Babaev2010-07-151-0/+1
* | | | Subquery cache (MWL#66) added.unknown2010-07-101-0/+51
* | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-0/+1
|\ \ \ \ | |/ / /
| * | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+1
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.47Michael Widenius2010-05-261-0/+1
| | |\ \ | | | |/
| | | * Bug#50755: Crash if stored routine def contains version commentsDavi Arnaut2010-04-011-0/+1
| | * | Changed the fixes for the following bugs:Igor Babaev2010-05-251-1/+0
| | * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+1
| | |\ \ | | | |/
| | | * Bug #45640: optimizer bug produces wrong resultsGleb Shchepa2010-02-061-0/+1
* | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-7/+9
|\ \ \ \ | |/ / /
| * | | mergedSergei Golubchik2010-03-151-4/+7
| |\ \ \ | | |/ /
| | * | Fix some compiler warnings seen in Buildbot.unknown2010-03-101-4/+7
| * | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-061-3/+3
* | | | BUG#31480: Incorrect result for nested subquery when executed via semi joinSergey Petrunya2010-02-121-5/+7
* | | | Subquery optimizations: non-semijoin materializationSergey Petrunya2010-01-281-8/+21
* | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-0/+1
|/ / /
* | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+1
|/ /
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-1/+7
|\ \
| * | MWL#17: Table eliminationSergey Petrunya2009-07-081-1/+5
| * | MWL#17: Table eliminationSergey Petrunia2009-06-221-1/+3
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-26/+87
|\ \ \ | |/ / |/| / | |/
| * Manual merge.Davi Arnaut2009-08-101-3/+6
| |\
| | * Bug#45010: invalid memory reads during parsing some strange statementsDavi Arnaut2009-08-071-7/+9
| | |
| | \
| *-. \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-8/+7
| |\ \ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-6/+6
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-17/+17
| | |/
| * | merged 5.0-bugteam to 5.1-bugteamGeorgi Kodinov2009-05-271-0/+10
| |\ \
| | * | Bug #38159: Function parsing problem generates misleading error messageGeorgi Kodinov2009-05-271-0/+16
| | |/
| | * Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-1/+1
| | |\
| | | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-2/+2
| | | |\
| | | * \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-12/+31
| | | |\ \
| | | * \ \ Merge from mysql-5.0.66-releaseJonathan Perkin2008-07-171-16/+3
| | | |\ \ \
| | | * \ \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-2/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-1/+1
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-1/+1
| | | | |\ \ \ \ \
| * | | | \ \ \ \ \ Merge fix for bug 39559 and bugteam trunk.Chad MILLER2009-04-101-22/+69
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#39559: dump of stored procedures / functions with C-style \Chad MILLER2009-04-091-22/+69