| Commit message (Expand) | Author | Age | Files | Lines |
* | merge | Vladislav Vaintroub | 2009-12-16 | 60 | -316/+1308 |
|\ |
|
| * | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 60 | -316/+1308 |
| |\ |
|
| | * | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 5 | -11/+33 |
| | |\ |
|
| | * \ | manual merge mysql-5.1-bugteam --> mysql-trunk-merge | Gleb Shchepa | 2009-12-04 | 6 | -71/+2 |
| | |\ \ |
|
| | | * | | Bug #38883 (reopened): thd_security_context is not thread safe, crashes? | Gleb Shchepa | 2009-12-01 | 4 | -68/+2 |
| | * | | | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys... | Satya B | 2009-12-02 | 58 | -251/+1312 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Applying InnoDB snapshot 5.1-ss6242, part 8. Fixes BUG#47720 | Satya B | 2009-11-30 | 1 | -12/+17 |
| | | * | | Applying InnoDB snapshot 5.1-ss6242, part 7. Fixes BUG#49032 | Satya B | 2009-11-30 | 3 | -11/+30 |
| | | * | | Applying InnoDB snapshot 5.1-ss6242, part 5. Fixes BUG#45961 | Satya B | 2009-11-30 | 1 | -0/+24 |
| | | * | | Applying InnoDB snapshot 5.1-ss6242, part 4. Fixes BUG#48526 | Satya B | 2009-11-30 | 1 | -0/+16 |
| | | * | | Applying InnoDB snapshot 5.1-ss6242, part 3. Fixes BUG#48469 | Satya B | 2009-11-30 | 1 | -2/+9 |
| | | * | | Applying InnoDB snapshot 5.1-ss6242, part 2. Fixes BUG#3139 | Satya B | 2009-11-30 | 2 | -1/+55 |
| | | * | | Applying InnoDB snapshot 5.1-ss6242, part 1. Fixes BUG#32430 | Satya B | 2009-11-30 | 3 | -81/+153 |
* | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined... | Vladislav Vaintroub | 2009-12-12 | 1 | -2/+1 |
* | | | | | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE | Vladislav Vaintroub | 2009-12-01 | 1 | -13/+7 |
* | | | | | merge | Vladislav Vaintroub | 2009-11-25 | 4 | -29/+2 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -2/+2 |
| * | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 4 | -27/+0 |
| | |_|/
| |/| | |
|
* | | | | automerge | Vladislav Vaintroub | 2009-11-13 | 17 | -122/+294 |
|\ \ \ \
| |/ / / |
|
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 18 | -121/+285 |
| |\ \ \
| | |/ / |
|
| | * | | Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. | Sergey Vojtovich | 2009-11-05 | 18 | -121/+285 |
| | |\ \
| | | |/ |
|
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+1 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -0/+1 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+1 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -10/+16 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+3 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+4 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -0/+9 |
| | | * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+3 |
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 2 | -2/+10 |
| |\ \ \
| | |/ / |
|
| | * | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 2 | -2/+10 |
| | |\ \
| | | |/ |
|
| | | * | BUG#42829: manually merged approved bzr bundle from bug report. | Luis Soares | 2009-11-01 | 2 | -2/+10 |
| | | |\ |
|
| | | | * | BUG#42829: binlogging enabled for all schemas regardless of | Luis Soares | 2009-09-24 | 2 | -2/+10 |
| | | * | | Applying InnoDB snapshot 5.1-ss5921, part 3. Fixes BUG#46256 | Satya B | 2009-10-05 | 1 | -1/+16 |
| | | * | | Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369 | Satya B | 2009-10-05 | 3 | -14/+24 |
| | | * | | Applying InnoDB snapshot 5.1-ss5921, Part 1. Fixes BUG#46000 | Satya B | 2009-10-05 | 1 | -12/+82 |
| | | * | | Applying InnoDB snapshot 5.1-ss5282, Fixes BUG#44030 | Satya B | 2009-09-17 | 1 | -6/+21 |
| | | |/ |
|
* | | | | WL#5161 : Cross-platform build with CMake | Vladislav Vaintroub | 2009-11-09 | 2 | -30/+139 |
|/ / / |
|
* | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -6/+6 |
|\ \ \ |
|
| * | | | Bug #48317 cannot build innodb as static library. | Vladislav Vaintroub | 2009-10-26 | 1 | -6/+6 |
* | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 96 | -2438/+2406 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-21 | 1 | -1/+0 |
| |\ \ \
| | |/ / |
|
| | * | | Fix the windows Build failure due to the changes to CMakelists by r2910. | Satya B | 2009-10-20 | 1 | -1/+0 |
| * | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-20 | 1 | -0/+16 |
| |\ \ \
| | |/ / |
|
| | * | | Merge a CMakeLists.txt change from Innodb plugin 1.0.5 | Satya B | 2009-10-20 | 1 | -0/+16 |
| * | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 96 | -2438/+2391 |
| |\ \ \
| | |/ / |
|
| | * | | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163 | Satya B | 2009-10-16 | 96 | -2438/+2387 |