summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
Commit message (Expand)AuthorAgeFilesLines
* Bug#49165 Remove unused/confusing code/comments in setup_conds()Tor Didriksen2009-11-271-1/+0
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-30/+38
|\
| * MergeMikael Ronstrom2009-11-031-29/+37
| |\
| | * Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-0/+2
| | * Backport of:Konstantin Osipov2009-10-141-2/+2
| | * Backport of:Konstantin Osipov2009-10-141-27/+27
| | * This patch is prerequisite for the 2nd milestone of WL#148 "Foreign keys"Dmitry Lenev2009-10-091-0/+6
| * | Removed GLOBAL INDEX syntax, need to develop GLOBAL indexes before adding syn...Mikael Ronstrom2009-10-161-1/+0
| * | Changed all no_ to num_ to avoid strange names like no_list_values which is n...Mikael Ronstrom2009-10-011-1/+1
| * | WL#3352, Introducing Column list partitioning, makes it possible to partition...Mikael Ronstrom2009-09-151-0/+1
| |/
* | Bug#9801 Views: imperfect error messageMarc Alff2009-11-021-0/+58
|/
* 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
* | | | | | | | | | Merge Bug#43230 into mysql-5.1-bugteamDavi Arnaut2009-04-031-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Bug#43230: SELECT ... FOR UPDATE can hang with FLUSH TABLES WITH READ LOCK in...Davi Arnaut2009-04-031-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | auto-mergeIgnacio Galarza2009-03-171-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Bug#39843 DELETE requires write access to table in subquery in where clauseKristofer Pettersson2009-03-051-0/+1
* | | | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-051-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge from mysql-5.1.30-releaseunknown2008-11-271-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
* | | | | | | | | Fix warnings and bug spotted by gcc-4.3.Davi Arnaut2008-12-161-1/+1
|/ / / / / / / /
* | | | | | | | Merge mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2008-10-151-3/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Bug#37075: offset of limit clause might be truncated on 32-bits server w/o bi...Davi Arnaut2008-10-151-4/+18
* | | | | | | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rcGleb Shchepa2008-10-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug #38691: segfault/abort in ``UPDATE ...JOIN'' whileGleb Shchepa2008-10-081-0/+1
* | | | | | | Bug#26020: User-Defined Variables are not consistent withGleb Shchepa2008-09-181-0/+1
* | | | | | | Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteamMarc Alff2008-07-141-9/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending onMarc Alff2008-07-141-8/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Manual merge of bug#26030 in mysql-5.1-bugteamMarc Alff2008-07-071-18/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug#26030 (Parsing fails for stored routine w/multi-statement executionMarc Alff2008-07-071-16/+3
| | |_|_|/ | |/| | |
* | | | | Merge moonbone.local:/work/27219-5.0-opt-mysqlunknown2008-03-281-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Bug#27219: Aggregate functions in ORDER BY.unknown2008-03-271-2/+1
| |/ / /
| * | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-08-301-7/+30
| |\ \ \
| | * | | Bug#28779 (mysql_query() allows execution of statements with unbalancedunknown2007-08-291-7/+30