summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* Merge with MySQL 5.1.42Michael Widenius2010-01-1513-175/+306
|\
| * Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-014-68/+2
| * Applying InnoDB snapshot 5.1-ss6242, part 8. Fixes BUG#47720Satya B2009-11-301-12/+17
| * Applying InnoDB snapshot 5.1-ss6242, part 7. Fixes BUG#49032Satya B2009-11-303-11/+30
| * Applying InnoDB snapshot 5.1-ss6242, part 5. Fixes BUG#45961Satya B2009-11-301-0/+24
| * Applying InnoDB snapshot 5.1-ss6242, part 4. Fixes BUG#48526Satya B2009-11-301-0/+16
| * Applying InnoDB snapshot 5.1-ss6242, part 3. Fixes BUG#48469Satya B2009-11-301-2/+9
| * Applying InnoDB snapshot 5.1-ss6242, part 2. Fixes BUG#3139Satya B2009-11-302-1/+55
| * Applying InnoDB snapshot 5.1-ss6242, part 1. Fixes BUG#32430Satya B2009-11-303-81/+153
* | Merge with MySQL 5.1, with following additions:unknown2009-11-165-50/+191
|\ \ | |/
| * 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
| * 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
| |/
* | Make MariaDB work on windows: Sergey Petrunya2009-09-151-1/+1
* | Merge MySQL->MariaDBSergey Petrunya2009-09-0827-278/+605
|\ \ | |/
| * Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-112-10/+102
| |\
| | * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-1415-75/+274
| | |\
| | * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-102-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
| | |/ | |/|
| * | 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
| |/
| * 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
| |/
View Lorry Controller Status