summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from next-mr.unknown2010-01-121-3/+11
|\
| * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-3/+11
* | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-17/+169
|\ \ | |/ |/|
| * mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-3/+3
| |\
| * \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-7/+0
| |\ \
| * | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-0/+7
| * | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-3/+9
| |\ \ \
| * | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-10-141-0/+5
| * | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-17/+158
| |\ \ \ \
| | * | | | post-push fixes for BUG#39934Sven Sandberg2009-08-191-1/+1
| | * | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-42/+136
| | * | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-10/+57
* | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-3/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Manual resolving for the following filesAndrei Elkin2009-12-011-3/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-3/+3
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-3/+3
| | | | |_|/ | | | |/| |
| | * | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-7/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Bug#49165 Remove unused/confusing code/comments in setup_conds()Tor Didriksen2009-11-271-5/+0
* | | | | | backport of:Tor Didriksen2009-11-301-1/+22
* | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-16/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | 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
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Bug#9801 Views: imperfect error messageMarc Alff2009-11-021-0/+11
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-3/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| | |/ / / /
* | | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to BetonySergey Glukhov2009-10-231-1/+1
|/ / / / /
* | | | | 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
| | |\ \
View Lorry Controller Status