summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-198-42/+49
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-1/+1
| |\
| | * Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-1666-346/+1338
| | |\
| | * \ Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-1119-23/+183
| | |\ \
| | * | | WL#2360 Performance schemaMarc Alff2009-12-091-1/+1
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-173-4/+45
| |\ \ \ \
| | * \ \ \ Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-173-2/+43
| | |\ \ \ \
| | | * | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-173-2/+43
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-164-37/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-6/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix for BUG#49502 - CMake error compiling 5.1 on WindowsSatya B2009-12-141-1/+1
| | * | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-163-23/+0
| | |\ \ \ \
| | * \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-113-31/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | merging with mysql-5.1-bugteamV Narayanan2009-12-111-1/+1
| | | |\ \ \ \
| | | | * | | | Bug#49329 example (and other) engines use wrong collation for open tables hashV Narayanan2009-12-111-1/+1
| | | * | | | | Bug#49521 SHOW CREATE TABLE on IBMDB2I tables has incorrect fk constraint formatV Narayanan2009-12-111-27/+1
| | | |/ / / /
| | | * | | | Bug #38883: thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-032-9/+0
* | | | | | | mergeVladislav Vaintroub2009-12-181-7/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windowsVladislav Vaintroub2009-12-181-7/+0
| | |_|/ / / | |/| | | |
* | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-163-23/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-163-23/+0
| |/ / / /
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-1263-323/+1338
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1126-90/+140
| |\ \ \
| * \ \ \ manual merge mysql-5.1-bugteam --> mysql-trunk-mergeGleb Shchepa2009-12-046-71/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge to mysql-5.1-bugteamSatya B2009-12-0110-139/+4
| | |\ \ \
| | | * | | Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-0110-139/+4
| | * | | | Addition to Innodb Plugin 1.0.6 snapshotSatya B2009-12-011-11/+1
| | |/ / /
| * | | | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys...Satya B2009-12-0258-251/+1312
| |\ \ \ \ | | |/ / /
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, Fixes BUG#48469 Satya B2009-11-305-7/+38
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 9. Fixes BUG#48526, BUG#48317Satya B2009-11-304-3/+54
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 8. Fixes BUG#48782Satya B2009-11-305-38/+31
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 6. Add Testcase for BUG#46676Satya B2009-11-305-7/+52
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 5. Satya B2009-11-303-1/+19
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 4. Fixes BUG#3139 Satya B2009-11-302-1/+54
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 3. Fixes BUG#47167Satya B2009-11-301-27/+45
| | * | | Applying InnoDB Plugin 1.0.6 snapshot, part 2. Fixes BUG#32430 Satya B2009-11-303-7/+25
| | * | | Applying InnoDB Plugin 1.0.6 snapshot,part 1. Fixes BUG#45992 and BUG#46656Satya B2009-11-3048-158/+1002
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 8. Fixes BUG#47720Satya B2009-11-301-12/+17
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 7. Fixes BUG#49032Satya B2009-11-303-11/+30
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 5. Fixes BUG#45961Satya B2009-11-301-0/+24
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 4. Fixes BUG#48526Satya B2009-11-301-0/+16
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 3. Fixes BUG#48469Satya B2009-11-301-2/+9
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 2. Fixes BUG#3139Satya B2009-11-302-1/+55
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 1. Fixes BUG#32430Satya B2009-11-303-81/+153
| * | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-242-5/+29
| |\ \ \ \ | | |/ / /
| | * | | fix for pb2 failure after bug#47012 push.Anurag Shekhar2009-11-171-0/+1
| | * | | MergeChristopher Powers2009-11-112-5/+28
| | |\ \ \
| | | * | | Bug #47012 archive tables are not upgradeable, and server crashes Anurag Shekhar2009-11-112-5/+28
| | * | | | Bug#47382 'mysqladmin debug' crash on 64-bit WindowsChristopher Powers2009-11-102-3/+9
| | |/ / /
| * | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-2/+1
| |\ \ \ \ | | |/ / /