summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-12-1660-316/+1308
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-1260-316/+1308
| |\
| | * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-115-11/+33
| | |\
| | * \ manual merge mysql-5.1-bugteam --> mysql-trunk-mergeGleb Shchepa2009-12-046-71/+2
| | |\ \
| | | * | Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-014-68/+2
| | * | | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys...Satya B2009-12-0258-251/+1312
| | |\ \ \ | | | |/ /
| | | * | 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
* | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined...Vladislav Vaintroub2009-12-121-2/+1
* | | | | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINEVladislav Vaintroub2009-12-011-13/+7
* | | | | mergeVladislav Vaintroub2009-11-254-29/+2
|\ \ \ \ \ | |/ / / /
| * | | | Backport of:Konstantin Osipov2009-11-241-2/+2
| * | | | Backport of:Konstantin Osipov2009-11-234-27/+0
| | |_|/ | |/| |
* | | | automergeVladislav Vaintroub2009-11-1317-122/+294
|\ \ \ \ | |/ / /
| * | | 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
| | |\ \ | | | |/
| | | * 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
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-2/+10
| |\ \ \ | | |/ /
| | * | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-052-2/+10
| | |\ \ | | | |/
| | | * BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-012-2/+10
| | | |\
| | | | * BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-242-2/+10
| | | * | Applying InnoDB snapshot 5.1-ss5921, part 3. Fixes BUG#46256Satya B2009-10-051-1/+16
| | | * | Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369Satya B2009-10-053-14/+24
| | | * | Applying InnoDB snapshot 5.1-ss5921, Part 1. Fixes BUG#46000Satya B2009-10-051-12/+82
| | | * | Applying InnoDB snapshot 5.1-ss5282, Fixes BUG#44030Satya B2009-09-171-6/+21
| | | |/
* | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-092-30/+139
|/ / /
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-6/+6
|\ \ \
| * | | Bug #48317 cannot build innodb as static library.Vladislav Vaintroub2009-10-261-6/+6
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-2396-2438/+2406
|\ \ \ \ | |/ / /
| * | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-211-1/+0
| |\ \ \ | | |/ /
| | * | Fix the windows Build failure due to the changes to CMakelists by r2910.Satya B2009-10-201-1/+0
| * | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-201-0/+16
| |\ \ \ | | |/ /
| | * | Merge a CMakeLists.txt change from Innodb plugin 1.0.5Satya B2009-10-201-0/+16
| * | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-1996-2438/+2391
| |\ \ \ | | |/ /
| | * | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163Satya B2009-10-1696-2438/+2387