summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P)Vladislav Vaintroub2010-03-081-1/+1
* Fix typo Vladislav Vaintroub2010-02-241-2/+2
* Cleanup casing in MYSQL_ADD_PLUGIN, patch provided by KentVladislav Vaintroub2010-02-011-1/+1
* - 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-181-2/+10
|\
| * merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-2/+10
| |\
| | * merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-16/+16
| | |\
| | | * mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-304-18/+50
| | | |\
| | | * \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-103-33/+143
| | | |\ \
| | | * \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-15/+14
| | | |\ \ \
| | | | * | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-4/+3
| | | | * | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-15/+15
| | | | |\ \ \
| | | | | * | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-15/+15
| * | | | | | | Bug#49834 - fixed a bug introduced by mismerge.Vladislav Vaintroub2009-12-221-1/+6
| * | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-192-9/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-181-7/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windowsVladislav Vaintroub2009-12-181-7/+0
* | | | | | | | | | just in case old linux is used, add _GNU_SOURCE preprocessor constant to be a...Vladislav Vaintroub2010-01-181-1/+1
* | | | | | | | | | storage/innobase/CMakeLists.txt:Vladislav Vaintroub2010-01-161-47/+123
* | | | | | | | | | mergeVladislav Vaintroub2009-12-191-3/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-162-9/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-6/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-3/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Bug #38883: thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-031-6/+0
| | | |/ / / / / /
* | | | | | | | | 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