| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -35/+181 |
|\ |
|
| * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+1 |
| * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -10/+16 |
| * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+3 |
| * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+4 |
| * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -0/+9 |
| * | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+3 |
| * | BUG#42829: manually merged approved bzr bundle from bug report. | Luis Soares | 2009-11-01 | 1 | -2/+3 |
| |\ |
|
| | * | BUG#42829: binlogging enabled for all schemas regardless of | Luis Soares | 2009-09-24 | 1 | -2/+3 |
| * | | Applying InnoDB snapshot 5.1-ss5921, part 3. Fixes BUG#46256 | Satya B | 2009-10-05 | 1 | -1/+16 |
| * | | Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369 | Satya B | 2009-10-05 | 1 | -0/+23 |
| * | | Applying InnoDB snapshot 5.1-ss5921, Part 1. Fixes BUG#46000 | Satya B | 2009-10-05 | 1 | -12/+82 |
| * | | Applying InnoDB snapshot 5.1-ss5282, Fixes BUG#44030 | Satya B | 2009-09-17 | 1 | -6/+21 |
| |/ |
|
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -17/+276 |
|\ \
| |/ |
|
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -0/+95 |
| |\ |
|
| | * | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 1 | -0/+132 |
| | |\ |
|
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -0/+95 |
| * | | | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-07-24 | 1 | -11/+1 |
| | |/
| |/| |
|
| * | | Applying InnoDB snapshot 5.1-ss5488,part 4. Fixes BUG#21704 | Satya B | 2009-07-10 | 1 | -0/+98 |
| * | | Applying InnoDB snapshot 5.1-ss5488,part 2. Fixes BUG#45749 | Satya B | 2009-07-10 | 1 | -0/+34 |
| |/ |
|
| * | Applying InnoDB snashot 5.1-ss5024,part 3. Fixes BUG#42101 | Satya B | 2009-05-19 | 1 | -5/+38 |
| * | Bug #39802 On Windows, 32-bit time_t should be enforced | Anurag Shekhar | 2009-05-13 | 1 | -1/+1 |
| * | Applying InnoDB snashot 5.1-ss4699, part 3. Fixes BUG#43660 | Satya B | 2009-04-15 | 1 | -0/+9 |
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -6/+6 |
|\ \
| |/ |
|
| * | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -14/+29 |
| |\ |
|
| * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -6/+6 |
* | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -14/+29 |
|\ \ \
| | |/
| |/| |
|
| * | | Applying InnoDB snashot 5.1-ss4350, part 5. Fixes | Timothy Smith | 2009-03-11 | 1 | -5/+7 |
| * | | Applying InnoDB snashot 5.1-ss4350, part 4. Fixes | Timothy Smith | 2009-03-11 | 1 | -1/+7 |
| * | | Applying InnoDB snashot 5.1-ss4350, part 3. No functional changes. | Timothy Smith | 2009-03-11 | 1 | -4/+4 |
| * | | Applying InnoDB snashot 5.1-ss4350, part 2. Fixes | Timothy Smith | 2009-03-11 | 1 | -2/+10 |
| * | | merging. | Alexey Botchkov | 2009-02-24 | 1 | -2/+1 |
| |/ |
|
* | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -4/+6 |
|\ \
| |/ |
|
| * | BUG#42445 Warning messages in innobase/handler/ha_innodb.cc | Alfranio Correia | 2009-02-03 | 1 | -4/+6 |
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -252/+413 |
|\ \
| |/ |
|
| * | Add another cast to ignore int/ulong difference in error types, silence warni... | Timothy Smith | 2009-01-16 | 1 | -1/+1 |
| * | Applying InnoDB snapshot innodb-5.1-ss3603 | Timothy Smith | 2009-01-13 | 1 | -1/+2 |
| * | Applying InnoDB snapshot innodb-5.1-ss3603 | Timothy Smith | 2009-01-12 | 1 | -0/+2 |
| * | Applying InnoDB snapshot innodb-5.1-ss3603 | Timothy Smith | 2009-01-12 | 1 | -1/+1 |
| * | Applying InnoDB snapshot innodb-5.1-ss3603 | Timothy Smith | 2009-01-12 | 1 | -3/+5 |
| * | Applying InnoDB snapshot innodb-5.1-ss3603 | Timothy Smith | 2009-01-12 | 1 | -5/+3 |
| * | Bug#31177: Server variables can't be set to their current values | Tatiana A. Nurnberg | 2009-01-12 | 1 | -3/+3 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 15. Fixes | Timothy Smith | 2008-12-14 | 1 | -179/+116 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 14. Fixes | Timothy Smith | 2008-12-14 | 1 | -13/+87 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 13. Fixes | Timothy Smith | 2008-12-14 | 1 | -61/+32 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 12. | Timothy Smith | 2008-12-14 | 1 | -6/+15 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 11. White space changes. | Timothy Smith | 2008-12-14 | 1 | -2/+2 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 9. Improve a comment. | Timothy Smith | 2008-12-14 | 1 | -1/+2 |
| * | Apply InnoDB snapshot innodb-5.1-2858, part 7. | Timothy Smith | 2008-12-14 | 1 | -28/+98 |