summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2009-12-104-12/+25
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-1053-566/+1022
| |\
| * \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-022-197/+0
| |\ \
| * \ \ mergeMattias Jonsson2009-12-011-9/+17
| |\ \ \
| | * | | Bug#44622: Using PARTITIONs with ARCHIVE engine reports 0 bytes in i_s.TABLESMattias Jonsson2009-08-111-8/+15
| * | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-2544-362/+335
| |\ \ \ \
| * \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-4/+0
| |\ \ \ \ \
| * \ \ \ \ \ merging.Alexey Botchkov2009-11-173-3/+8
| |\ \ \ \ \ \
| | * | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ...Alexey Botchkov2009-10-093-3/+8
* | | | | | | | After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock.Sergey Vojtovich2009-12-101-2/+2
* | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj.Sergey Vojtovich2009-12-0917-11/+158
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Bug#40814 CSV engine does not parse \X characters when they occur in unquoted...V Narayanan2009-12-031-8/+65
| * | | | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-11-2516-3/+93
| | |_|/ / / / | |/| | | | |
* | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-082-2/+50
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-mr-runtimeKonstantin Osipov2009-12-032-197/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | WL#2360 Performance schemaMarc Alff2009-12-0452-564/+972
| |/ / / / / |/| | | | |
* | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | 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 gkodinov/kgeorge@magare.gmz2008-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