summaryrefslogtreecommitdiff
path: root/storage/innobase/handler
Commit message (Expand)AuthorAgeFilesLines
* Merge with MySQL 5.1, with following additions:unknown2009-11-162-35/+188
|\
| * Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+1
| * Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-2/+2
| * 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
| * 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-051-0/+23
| * | 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
| |/
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-17/+276
|\ \ | |/
| * Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-0/+95
| |\
| | * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-0/+132
| | |\
| | * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-0/+95
| * | | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-11/+1
| | |/ | |/|
| * | Applying InnoDB snapshot 5.1-ss5488,part 4. Fixes BUG#21704Satya B2009-07-101-0/+98
| * | Applying InnoDB snapshot 5.1-ss5488,part 2. Fixes BUG#45749Satya B2009-07-101-0/+34
| |/
| * Applying InnoDB snashot 5.1-ss5024,part 3. Fixes BUG#42101Satya B2009-05-191-5/+38
| * Bug #39802 On Windows, 32-bit time_t should be enforcedAnurag Shekhar2009-05-131-1/+1
| * Applying InnoDB snashot 5.1-ss4699, part 3. Fixes BUG#43660Satya B2009-04-151-0/+9
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-6/+6
|\ \ | |/
| * auto-mergeIgnacio Galarza2009-03-171-14/+29
| |\
| * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-6/+6
* | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-14/+29
|\ \ \ | | |/ | |/|
| * | Applying InnoDB snashot 5.1-ss4350, part 5. FixesTimothy Smith2009-03-111-5/+7
| * | Applying InnoDB snashot 5.1-ss4350, part 4. FixesTimothy Smith2009-03-111-1/+7
| * | Applying InnoDB snashot 5.1-ss4350, part 3. No functional changes.Timothy Smith2009-03-111-4/+4
| * | Applying InnoDB snashot 5.1-ss4350, part 2. FixesTimothy Smith2009-03-111-2/+10
| * | merging.Alexey Botchkov2009-02-241-2/+1
| |/
* | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-4/+6
|\ \ | |/
| * BUG#42445 Warning messages in innobase/handler/ha_innodb.ccAlfranio Correia2009-02-031-4/+6
* | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-122-255/+419
|\ \ | |/
| * Add another cast to ignore int/ulong difference in error types, silence warni...Timothy Smith2009-01-161-1/+1
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-131-1/+2
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-0/+2
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-1/+1
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-3/+5
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-5/+3
| * Bug#31177: Server variables can't be set to their current valuesTatiana A. Nurnberg2009-01-121-3/+3
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 15. FixesTimothy Smith2008-12-142-183/+122
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 14. FixesTimothy Smith2008-12-142-13/+88
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 13. FixesTimothy Smith2008-12-141-61/+32
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 12.Timothy Smith2008-12-141-6/+15
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 11. White space changes.Timothy Smith2008-12-141-2/+2
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 9. Improve a comment.Timothy Smith2008-12-141-1/+2
| * Apply InnoDB snapshot innodb-5.1-2858, part 7.Timothy Smith2008-12-141-28/+98