summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable...Michael Widenius2009-12-031-19/+31
|\
| * merge fix for bug monty found in ha_federatedx::close() methodAntony T Curtis2009-11-141-5/+18
| * merge from maria-5.1-mergeAntony T Curtis2009-11-14147-3120/+3542
| |\
| | * Merge with MySQL 5.1, with following additions:Michael Widenius2009-11-11127-2702/+3108
| | |\
| * | | Add missing sources to cmake build.Antony T Curtis2009-11-041-1/+3
| * | | fix federated_server test, possible null ptr derefAntony T Curtis2009-11-041-16/+30
| * | | Added federatedx storage engineMichael Widenius2009-10-3018-0/+5604
* | | | Merge with MySQL 5.1, with following additions:unknown2009-11-16127-2702/+3108
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | 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
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-2/+2
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+1
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-0/+1
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-2/+2
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+1
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-10/+16
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+3
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+4
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-0/+9
| | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+3
| * | | Automerge.Davi Arnaut2009-11-021-1/+1
| |/ /
| * | BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-014-4/+20
| |\ \
| | * | BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-244-4/+20
| * | | A follow-up to fix forSergey Vojtovich2009-10-273-1/+21
| * | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-162-8/+8
| * | | merge to mysql-5.1-bugteamSatya B2009-10-134-20/+18
| |\ \ \
| | * \ \ Merge fix for BUG47073.Sergey Vojtovich2009-10-093-20/+10
| | |\ \ \
View Lorry Controller Status