summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-5.1.Alexander Nozdrin2009-09-191-1/+2
|\
| * Merge from mysql-5.1.38-releaseclone-5.1.39-buildJonathan Perkin2009-09-033-10/+14
| |\
| | * Apply patch from bug#46834 to install the test suite in RPMs.Jonathan Perkin2009-08-211-1/+2
| | * Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-142-9/+12
| | * Apply build fixJonathan Perkin2009-08-122-2/+2
* | | Revert InnoDB default values as of the InnoDB plugin 1.0.4.Alexander Nozdrin2009-09-181-7/+7
* | | Merge "trunk-build" (including 5.4.2-beta) and "trunk".Joerg Bruehe2009-09-172-9/+12
|\ \ \
| * \ \ 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
* | | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-1621-396/+410
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge 5.1-bugteam -> 5.1-bugteam-local.Sergey Vojtovich2009-09-101-9/+9
| |\ \ \ \
| | * | | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-9/+9
| * | | | | Local merge.Sergey Vojtovich2009-09-101-1/+1
| |\ \ \ \ \
| | * | | | | BUG#46961 - archive engine loses rows during self joining select!Sergey Vojtovich2009-09-041-1/+1
| | |/ / / /
| * | | | | BUG#29203 - archive tables have weird values in show table statusSergey Vojtovich2009-09-091-2/+3
| |/ / / /
| * | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-09-031-3/+3
| | |/ / | |/| |
| * | | Increase thread stack size on HP-UX when built with debug.Davi Arnaut2009-09-021-1/+6
| * | | Bug#45611: Minor code cleanupDavi Arnaut2009-09-012-6/+5
| * | | Merge from 5.0 for 43414Staale Smedseng2009-08-2814-44/+26
| * | | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-282-330/+357
* | | | Merge from mysql-trunk.Alexander Nozdrin2009-08-272-2/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Applying fix from Oracle (Marko) for Bug #46657 "InnoDB plugin: invalid read ...clone-5.4.2-buildGuilhem 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