summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* Backport of:Konstantin Osipov2009-11-241-2/+2
* Backport of:Konstantin Osipov2009-11-234-27/+0
* 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
| | |/
* | | 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
* | | | Backport of:Konstantin Osipov2009-10-145-11/+11
|/ / /
* | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-5/+1
* | | mergeVladislav Vaintroub2009-09-233-16/+19
|\ \ \ | |/ /
| * | Revert InnoDB default values as of the InnoDB plugin 1.0.4.Alexander Nozdrin2009-09-181-7/+7
| * | Merge the changes done for 5.4.2-beta into "trunk".Joerg Bruehe2009-09-092-9/+12
| |\ \
| | * | Some fixes to make 5.4.2-beta compile on the less commonJoerg Bruehe2009-09-084-11/+14
* | | | This is the downport ofVladislav Vaintroub2009-09-111-0/+22
|/ / /
* | | Merge from mysql-trunk.Alexander Nozdrin2009-08-272-2/+6
|\ \ \ | |/ /
| * | Applying fix from Oracle (Marko) for Bug #46657 "InnoDB plugin: invalid read ...Guilhem Bichot2009-08-251-0/+1
| * | Backporting patch for Bug#46650 (Innodb assertion autoinc_lock == lockAlexander Nozdrin2009-08-241-2/+5
* | | Merge from mysql-5.1-bugteamAlexander Nozdrin2009-08-262-2/+2
|\ \ \ | |/ / |/| / | |/
| * Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-112-10/+102
| |\
| * | Remove the 'single' space character after include/lock0iter.h in fileSatya B2009-08-031-1/+1
| * | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-11/+1
* | | importing Vlad's fix which should eliminate many Windows test failures.Guilhem Bichot2009-08-111-7/+7
* | | temporarily remove Summit defaults of InnoDB options, to see if it influences...Guilhem Bichot2009-08-111-7/+7
* | | small cmake fix for Windows buildGuilhem Bichot2009-08-071-5/+2
* | | Using same defaults for InnoDB options as the Summit release does.Guilhem Bichot2009-08-071-7/+7