summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
Commit message (Expand)AuthorAgeFilesLines
* Backport of revno: 2617.71.1Jon Olav Hauglid2009-12-101-248/+88
* Merge with next-4284.Konstantin Osipov2009-12-101-7/+17
|\
| * Backport of revno: 2617.68.13Jon Olav Hauglid2009-12-091-5/+4
| * Backport of revno: 3702Jon Olav Hauglid2009-12-091-2/+13
* | Backport of:Konstantin Osipov2009-12-101-4/+6
|/
* Backport of revno: 2617.69.40Jon Olav Hauglid2009-12-091-4/+4
* Backport of revno: 2599.169.2Jon Olav Hauglid2009-12-091-0/+3
* Backport of:Konstantin Osipov2009-12-081-6/+28
* Backport of:Konstantin Osipov2009-12-081-117/+87
* Backport of:Konstantin Osipov2009-12-081-2/+2
* Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,Konstantin Osipov2009-12-051-3/+16
* Backport of:Konstantin Osipov2009-12-041-59/+58
* Backport of:Konstantin Osipov2009-12-041-65/+59
* Backport of:Konstantin Osipov2009-12-031-19/+20
* Backport of:Konstantin Osipov2009-12-031-2/+0
* Merge next-mr -> next-4284Konstantin Osipov2009-12-031-103/+36
|\
| * Merge next-mr -> next-mr-runtimeKonstantin Osipov2009-12-031-90/+0
| |\
| | * Manual resolving for the following filesAndrei Elkin2009-12-011-90/+0
| | |\
| | | * merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-10/+10
| | | |\
| | | * \ manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-90/+0
| | | |\ \
| | | | * | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-90/+0
| * | | | | Bug#39277 - symlink.test fails on DebianMagne Mahre2009-11-261-8/+36
| |/ / / /
* | | | | Backport of:Konstantin Osipov2009-12-031-3/+5
* | | | | Backport of:Konstantin Osipov2009-12-021-6/+43
* | | | | Backport of:Konstantin Osipov2009-12-021-76/+85
* | | | | Backport of:Konstantin Osipov2009-12-011-2/+2
* | | | | Backport of:Konstantin Osipov2009-12-011-2/+3
* | | | | Backport of:Konstantin Osipov2009-12-011-13/+13
* | | | | Backport of:Konstantin Osipov2009-12-011-7/+14
* | | | | Backport of:Konstantin Osipov2009-12-011-32/+31
* | | | | Backport of:Konstantin Osipov2009-12-011-7/+5
* | | | | Backport of:Konstantin Osipov2009-12-011-79/+0
* | | | | Backport of:Konstantin Osipov2009-12-011-13/+13
* | | | | Backport of:Konstantin Osipov2009-12-011-28/+74
* | | | | Backport of:Konstantin Osipov2009-12-011-33/+34
* | | | | Backport of:Konstantin Osipov2009-12-011-1/+2
* | | | | Backport of:Konstantin Osipov2009-12-011-3/+2
* | | | | Backport of:Konstantin Osipov2009-12-011-17/+12
* | | | | Backport of:Konstantin Osipov2009-11-301-1/+1
* | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-225/+283
|/ / / /
* | | | Backport of:Konstantin Osipov2009-11-241-55/+53
* | | | Backport of:Konstantin Osipov2009-11-201-9/+6
* | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-1/+1
|\ \ \ \
| * \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-72/+115
| |\ \ \ \
| * | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-1/+1
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-10/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-10/+10
| | |/ / | |/| |
* | | | MergeMikael Ronstrom2009-11-031-42/+55
|\ \ \ \
| * \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-37/+58
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Automerge from mysql-next-mr-runtime.Alexander Nozdrin2009-10-221-2/+2
| |\ \ \ \