summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with next-4284.Konstantin Osipov2009-12-101-62/+76
|\
| * Backport of revno: 2617.68.13Jon Olav Hauglid2009-12-091-23/+14
| * Backport of revno: 2617.31.30Jon Olav Hauglid2009-12-091-39/+56
| * Backport of revno: 2617.76.2Jon Olav Hauglid2009-12-091-0/+6
* | Backport of:Konstantin Osipov2009-12-101-1/+1
|/
* Backport of revno: 2617.69.40Jon Olav Hauglid2009-12-091-1/+1
* Backport of:Konstantin Osipov2009-12-081-3/+8
* Backport of:Konstantin Osipov2009-12-081-7/+3
* Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,Konstantin Osipov2009-12-051-19/+66
* Backport of:Konstantin Osipov2009-12-041-3/+3
* Backport of:Konstantin Osipov2009-12-041-5/+5
* ------------------------------------------------------------Konstantin Osipov2009-12-041-1/+1
* Backport of:Konstantin Osipov2009-12-031-465/+47
* Backport of:Konstantin Osipov2009-12-031-111/+136
* WL#3726 "DDL locking", post-review fixes.Konstantin Osipov2009-12-031-0/+4
* Merge next-mr -> next-4284Konstantin Osipov2009-12-031-173/+1
|\
| * Manual resolving for the following filesAndrei Elkin2009-12-011-173/+1
| |\
| | * merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-20/+27
| | |\
| | * \ manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-174/+2
| | |\ \
| | | * | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-174/+2
| | * | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-20/+53
| | |\ \ \ | | | |/ / | | |/| |
* | | | | Backport of:Konstantin Osipov2009-12-021-22/+27
* | | | | Backport of:Konstantin Osipov2009-12-011-21/+21
* | | | | Backport of:Konstantin Osipov2009-12-011-18/+2
* | | | | Backport of:Konstantin Osipov2009-12-011-22/+1
* | | | | Backport of:Konstantin Osipov2009-12-011-3/+3
* | | | | Backport of:Konstantin Osipov2009-12-011-1/+1
* | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-34/+84
|/ / / /
* | | | Backport of:Konstantin Osipov2009-11-241-10/+10
* | | | Backport of:Konstantin Osipov2009-11-231-5/+0
* | | | Backport of:Konstantin Osipov2009-11-231-2/+0
* | | | Backport of:Konstantin Osipov2009-11-231-8/+7
* | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-63/+63
|\ \ \ \
| * | | | Backport of Bug#45767 to mysql-next-mrDavi Arnaut2009-11-101-48/+0
| * | | | Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-1/+0
| * | | | Backport of Bug#27525 to mysql-next-mrDavi Arnaut2009-11-101-12/+62
| * | | | Backport of Bug#36649 to mysql-next-mrDavi Arnaut2009-11-101-1/+0
| * | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-11-101-1/+1
* | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-9/+9
|\ \ \ \ \
| * | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-051-9/+9
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-1/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null()Sergey Vojtovich2009-10-281-1/+8
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-2/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-2/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | mergeGeorgi Kodinov2009-10-161-2/+0
| | |\ \ \ \
| | | * | | | Bug#46019: ERROR 1356 When selecting from within anotherMartin Hansson2009-10-161-2/+0
| | | | |_|/ | | | |/| |
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-17/+19
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-17/+19
| |\ \ \ \ | | |/ / /
| | * | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-17/+19
| | |/ /