summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Fixes to tests and their results, to account for differences between InnoDB 1...Guilhem Bichot2009-08-071-2/+5
* | | Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-07387-0/+215967
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-04274-165224/+0
|\ \ \ | | |/ | |/|
| * | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-1415-75/+274
| |\ \ | | |/
| | * Applying InnoDB snapshot 5.1-ss5488,part 4. Fixes BUG#21704Satya B2009-07-101-0/+98
| | * Applying InnoDB snapshot 5.1-ss5488 part3,Fixes BUG#45814Satya B2009-07-101-3/+3
| | * Applying InnoDB snapshot 5.1-ss5488,part 2. Fixes BUG#45749Satya B2009-07-101-0/+34
| | * Applying InnoDB snashot 5.1-ss5488, part 1Satya B2009-07-105-2/+5
| | * merge to 5.1-bugteamSatya B2009-07-011-1/+1
| | |\
| | | * Post-merge fix for Innodb snapshot.Davi Arnaut2009-06-301-1/+1
| | * | Fix build failure after applying Innodb snapshot 5.1-ss5282Satya B2009-07-011-1/+2
| | |/
| | * merge to mysql-5.1-bugteamSatya B2009-06-295-67/+122
| | |\
| | | * Applying InnoDB snashot 5.1-ss5282, Fix for BUG#45097Satya B2009-06-113-7/+31
| | | * Applying InnoDB snashot 5.1-ss5282, PRE-Fix for BUG#45097Satya B2009-06-113-60/+91
| | * | Applying InnoDB snashot 5.1-ss5343, Fixes BUG#45357Satya B2009-06-224-2/+10
| | |/
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-102-10/+102
| |/
| * merge to 5.1-bugteam treeSatya B2009-05-191-1/+1
| |\
| | * 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-05-191-1/+1
| * | Applying InnoDB snashot 5.1-ss5024,part 3. Fixes BUG#42101Satya B2009-05-193-7/+38
| * | Applying InnoDB snashot 5.1-ss5024, part 2. Fix for BUG#44320Satya B2009-05-191-1/+1
| * | Applying InnoDB snashot 5.1-ss5024 part 1, Follow up Fix for BUG#43660Satya B2009-05-191-1/+1
| |/
| * Bug #39802 On Windows, 32-bit time_t should be enforcedAnurag Shekhar2009-05-131-1/+1
* | Fix Bug#44671Kelly Long2009-07-211-0/+21
* | Merged in 5.1.35Mikael Ronstrom2009-07-015-57/+61
|\ \
| * | Preparation for using CMake for more than Windows by only checking for WIN_AT...Mikael Ronstrom2009-07-011-18/+19
| * | Merge from mysql-5.4.1-release (first part only)MySQL Build Team2009-06-241-11/+11
| |\ \
| | * | Some portability fixes.MySQL Build Team2009-06-041-11/+11
| * | | Removed debug comments on Windows CMake fixesMikael Ronstrom2009-06-171-4/+0
| * | | First attempt at fixing Windows issues in 5.4.0Mikael Ronstrom2009-06-164-34/+41
* | | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-1119-251/+307
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Applying InnoDB snashot 5.1-ss3603. Fixes BUG#27276Satya B2009-04-201-7/+10
| * | Applying InnoDB snashot 5.1-ss4699, part 3. Fixes BUG#43660Satya B2009-04-154-2/+94