summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 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-263-4/+10
|\ \ | |/ |/|
| * Bug#46639: 1030 (HY000): Got error 124 from storage engine onMattias Jonsson2009-08-211-2/+8
| * Fix 5.1 build error.Alexander Nozdrin2009-08-122-2/+2
* | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-125-11/+29
|\ \ | |/
| * Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-11399-91/+216122
| |\
| * | Remove the 'single' space character after include/lock0iter.h in fileSatya B2009-08-031-1/+1
| * | Auto-mergeIgnacio Galarza2009-07-311-1/+1
| * | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-303-2/+25
| * | merging with mysql-5.1-bugteam branchSatya B2009-07-271-8/+3
| |\ \
| | * | Merge from 5.0Gleb Shchepa2009-07-241-8/+3
| * | | 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-18/+18
* | | InnoDB plugin is built-in: remove test code which depended on the plugin prop...Guilhem Bichot2009-08-051-0/+1
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-04574-67130/+118288
|\ \ \ | | |/ | |/|
| * | Fixed build failure on Win.Sergey Vojtovich2009-08-041-0/+1
| * | Added fsp0types.h to source distribution.Sergey Vojtovich2009-07-311-0/+1
| * | Update to innoplug-1.0.4.Sergey Vojtovich2009-07-30101-1168/+5256
| * | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-1431-293/+857
| |\ \ | | |/
| | * Automerge.Alexey Kopytov2009-07-122-7/+16
| | |\
| | | * Bug #45796: invalid memory reads and writes when altering merge Alexey Kopytov2009-07-102-7/+16
| | * | 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
| | * | merging with mysql-5.1-bugteamV Narayanan2009-07-092-65/+141
| | |\ \
| | | * | Bug#45983 ibmdb2i_create_index_option=1 not working for primary keyV Narayanan2009-07-082-65/+141
| | * | | Bug#35111 - Truncate a MyISAM partitioned table does not resetSatya B2009-07-084-0/+16
| | |/ /
| | * | Bug#45803 Inaccurate estimates for partial key values with IBMDB2IV Narayanan2009-07-064-110/+346
| | |/
| | * Bug#45793 macce charset causes error with IBMDB2IV Narayanan2009-07-021-0/+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 from 5.0Staale Smedseng2009-06-291-1/+1
| | * 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
| | * | Bug#45196 Some collations do not sort correctly with IBMDB2IV Narayanan2009-06-291-9/+5
| | * | Applying InnoDB snashot 5.1-ss5343, Fixes BUG#45357Satya B2009-06-224-2/+10
| | * | Merge from 5.0-bugteamStaale Smedseng2009-06-171-22/+20
| | |/
| | * auto-mergeTatiana A. Nurnberg2009-06-061-1/+1
| | |\
| | | * Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-051-1/+1
| | * | auto-mergeTatiana A. Nurnberg2009-06-051-0/+3
| | |/