summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Fix typo Vladislav Vaintroub2010-02-241-2/+2
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix for valgrind warning: check whether pointer was initialized.Davi Arnaut2010-02-021-1/+1
| | | * | | | | | | | | | | | | | Applying InnoDB snapshot, fixes BUG#46193.Sergey Vojtovich2010-01-222-103/+131
| | | * | | | | | | | | | | | | | Applying InnoDB snapshot Sergey Vojtovich2010-01-222-5/+5
| | | * | | | | | | | | | | | | | Applying InnoDB snapshot, fixes BUG#49238.Sergey Vojtovich2010-01-221-9/+23
| | * | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-246-19/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-286-19/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Apply patch on behalf of Magnus:Davi Arnaut2010-01-201-1/+1
| | * | | | | | | | | | | | | | Apply patch on behalf of the NDB team:Davi Arnaut2010-01-205-18/+18
| | * | | | | | | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-241-1/+0
| | * | | | | | | | | | | | | | Applying InnoDB snapshot 5.1-ss6344, Fixes BUG#47814Satya B2009-12-237-60/+193
| | * | | | | | | | | | | | | | Applying InnoDB snapshot 5.1-ss6344, part 2. Fixes BUG#41609 but doesSatya B2009-12-214-21/+31
* | | | | | | | | | | | | | | | Cleanup casing in MYSQL_ADD_PLUGIN, patch provided by KentVladislav Vaintroub2010-02-014-4/+4
* | | | | | | | | | | | | | | | - another take on BUILD_CONFIG variable - use OPTION instead of SET for Vladislav Vaintroub2010-01-201-15/+0
* | | | | | | | | | | | | | | | Do not run GCC atomic builtins tests on MSVCVladislav Vaintroub2010-01-181-1/+3
* | | | | | | | | | | | | | | | mergeVladislav Vaintroub2010-01-183-7/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-1464-0/+16877
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |