summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* MergeMikael Ronstrom2009-11-031-13/+20
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-1/+1
| |\
| * \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-3/+9
| |\ \
| * \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-7/+0
| |\ \ \
| * | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-1/+6
| * | | | Backport of:Konstantin Osipov2009-10-141-12/+12
| * | | | This patch is prerequisite for the 2nd milestone of WL#148 "Foreign keys"Dmitry Lenev2009-10-091-0/+2
* | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-11-021-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-3/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to BetonySergey Glukhov2009-10-231-1/+1
| | |_|/ | |/| |
* | | | Merged WL#3352 into mysql-next-mrMikael Ronstrom2009-10-281-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed GLOBAL INDEX syntax, need to develop GLOBAL indexes before adding syn...Mikael Ronstrom2009-10-161-3/+0
| * | | Changed all no_ to num_ to avoid strange names like no_list_values which is n...Mikael Ronstrom2009-10-011-3/+3
| * | | WL#3352, Introducing Column list partitioning, makes it possible to partition...Mikael Ronstrom2009-09-151-0/+3
* | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-3/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixesAndrei Elkin2009-10-011-1/+1
| |\ \ \
| | * | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-291-1/+1
| * | | | backporting bug@27808 fixesAndrei Elkin2009-10-011-1/+2
| * | | | WL#342 heartbeatAndrei Elkin2009-09-291-2/+3
| |/ / /
| * | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+4
| |/ /
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-7/+0
|\ \ \ | |_|/ |/| |
| * | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s...Tatiana A. Nurnberg2009-09-281-7/+0
| |/
* | WL#2110 (SIGNAL)Marc Alff2009-09-101-1/+97
|/
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug#39559: dump of stored procedures / functions with C-style \Chad MILLER2009-04-091-0/+14
* | | | | | | | | | Merge Bug#43230 into mysql-5.1-bugteamDavi Arnaut2009-04-031-0/+16
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Bug#43230: SELECT ... FOR UPDATE can hang with FLUSH TABLES WITH READ LOCK in...Davi Arnaut2009-04-031-0/+16
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | auto-mergeIgnacio Galarza2009-03-171-0/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Bug#39843 DELETE requires write access to table in subquery in where clauseKristofer Pettersson2009-03-051-0/+9
* | | | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
* | | | | | | | BUG#41924: high-level replication functions are not commentedSven Sandberg2009-01-091-0/+9
* | | | | | | | 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
* | | | | | | | | mergeMattias Jonsson2008-11-041-6/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Bug#39434: ALTER TABLE CHECK/OPTIMIZE/ANALYZE PARTITION workMattias Jonsson2008-10-101-6/+3
* | | | | | | | | 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
* | | | | | | | Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteamMarc Alff2008-08-111-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug#38296 (low memory crash with many conditions in a query)Marc Alff2008-08-111-2/+2