summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Backport of:Konstantin Osipov2009-12-041-1/+1
* Backport of:Konstantin Osipov2009-12-041-4/+3
* Merge next-mr -> next-4284Konstantin Osipov2009-12-034-199/+50
|\
| * Merge next-mr -> next-mr-runtimeKonstantin Osipov2009-12-032-197/+0
| |\
| | * Manual resolving for the following filesAndrei Elkin2009-12-012-197/+0
| | |\
| | | * merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-3027-152/+375
| | | |\
| | | * \ manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-132-197/+0
| | | |\ \
| | | | * | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-042-197/+0
| | | * | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-06111-2534/+2585
| | | |\ \ \ | | | | |/ / | | | |/| |
| * | | | | Addition to BUG#36573 - myisampack --join does not create destination table Magne Mahre2009-11-251-1/+0
| * | | | | Fix for Bug#36573 myisampack --join does not create destination Magne Mahre2009-11-251-2/+47
| * | | | | Bug#40677 Archive tables joined on primary return no resultMagne Mahre2009-11-251-0/+4
| |/ / / /
* | | | | Backport of:Konstantin Osipov2009-12-033-226/+413
* | | | | Backport of:Konstantin Osipov2009-12-011-2/+2
* | | | | Backport of:Konstantin Osipov2009-11-301-2/+2
* | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-0/+6
|/ / / /
* | | | Backport of:Konstantin Osipov2009-11-2441-335/+335
* | | | Backport of:Konstantin Osipov2009-11-234-27/+0
* | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-4/+0
|\ \ \ \
| * \ \ \ Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-111-4/+0
| |\ \ \ \
| | * | | | Bug #33544: UDF_INIT member decimals initialized wrong with unknown2008-03-051-4/+0
* | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1223-133/+325
|\ \ \ \ \ \
| * \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-103-4/+22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0618-121/+285
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.Sergey Vojtovich2009-11-0518-121/+285
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge of innodb-zip-ss6129 snapshot.Sergey Vojtovich2009-11-0318-121/+285
| | | |\ \ \ \ \ \
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+2
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-6/+60
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-14/+36
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-035-28/+56
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+1
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+1
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-8/+10
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-3/+10
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-2/+0
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-10/+10
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-033-30/+41
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+6
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+6
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-16/+26
| | | | * | | | | | Applying InnoDB plugin snapshot Sergey Vojtovich2009-11-031-1/+1
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+17
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-69/+0
| | | | * | | | | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-0/+69
| | | * | | | | | | Merge innodb-5.1-ss6129 to mysql-5.1-bugteam.Sergey Vojtovich2009-11-033-17/+40
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-2/+2