summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-24160-1562/+19420
|\
| * Fix cmake build on OSX/i386 (many innodb tests failVladislav Vaintroub2010-03-211-2/+0
| * mergeVladislav Vaintroub2010-03-082-3/+34
| |\
| | * local mergeMarc Alff2010-03-071-1/+21
| | |\
| | | * Bug#51738 Unit test pfs_instr-t crashesMarc Alff2010-03-041-1/+21
| | * | Bug#51741 Unit test pfs-t failing in mysql-next-mr-bugfixingMarc Alff2010-03-041-2/+13
| | |/
| * | Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P)Vladislav Vaintroub2010-03-081-1/+1
| |/
| * A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-031-7/+0
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-028-15/+50
| |\
| | * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-012-2/+2
| | |\
| | | * Mergine from mysql-next-meAlexander Barkov2010-02-2720-422/+897
| | | |\
| | | * | After-fix for WL#2649 Number-to-string conversion.Alexander Barkov2010-02-262-2/+2
| | * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-03-011-1/+1
| | |\ \ \
| | * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-245-12/+47
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Bug#51612 Un initialized locker_lost variable in pfs_instr.ccMarc Alff2010-03-011-1/+1
| * | | | | Bug#51447 performance schema evil twin filesMarc Alff2010-02-261-6/+21
| * | | | | merge from mysql-next-mr-bugfixingJon Olav Hauglid2010-02-251-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix typo Vladislav Vaintroub2010-02-241-2/+2
| * | | | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-241-1/+1
| |/ / / /
| * | | | mergeVladislav Vaintroub2010-02-165-291/+595
| |\ \ \ \
| | * | | | A fix and a test case for Bug#47648 "main.merge fails sporadically".Konstantin Osipov2010-02-151-0/+21
| | * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-152-2/+10
| | |\ \ \ \
| | * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-067-20/+20
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-053-7/+21
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-0464-0/+16879
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge next-mr -> next-4284Konstantin Osipov2010-02-031-2/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-038-39/+101
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-027-30/+36
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-027-41/+48
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-0267-347/+1339
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Partial backport of:Jon Olav Hauglid2009-12-171-6/+0
| | * | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-9/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-153-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-1516-11/+155
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-1552-562/+970
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Backport of revid 2617.69.21, 2617.69.22, 2617.29.23:Konstantin Osipov2009-12-082-141/+235
| | * | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-081-5/+3
| | * | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | mergeVladislav Vaintroub2010-02-132-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marcMarc Alff2010-02-057-20/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Bug#44210 Performance schema: pool-of-threads threads instrumentation is missingMarc Alff2010-01-261-0/+8
| | * | | | | | | | | | | | | | | | | Bug#50478 perfschema.tampered_perfschema_table1 fails sporadically onMarc Alff2010-01-221-2/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | mergeVladislav Vaintroub2010-02-067-20/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status