| Commit message (Expand) | Author | Age | Files | Lines |
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 23 | -44/+145 |
|\ |
|
| * | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 3 | -4/+4 |
| |\ |
|
| * \ | manual merge mysql-5.1-bugteam --> mysql-trunk-merge | Gleb Shchepa | 2009-12-04 | 2 | -25/+1 |
| |\ \ |
|
| | * | | Bug #38883 (reopened): thd_security_context is not thread safe, crashes? | Gleb Shchepa | 2009-12-01 | 1 | -3/+1 |
| * | | | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys... | Satya B | 2009-12-02 | 21 | -19/+144 |
| |\ \ \
| | |/ / |
|
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 7. Fixes BUG#49032 | Satya B | 2009-11-30 | 2 | -8/+8 |
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 2. Fixes BUG#3139 | Satya B | 2009-11-30 | 1 | -0/+2 |
| | * | | Applying InnoDB snapshot 5.1-ss6242, part 1. Fixes BUG#32430 | Satya B | 2009-11-30 | 1 | -11/+14 |
* | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -3/+0 |
| |_|/
|/| | |
|
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 5 | -11/+17 |
|\ \ \
| |/ / |
|
| * | | Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. | Sergey Vojtovich | 2009-11-05 | 5 | -11/+17 |
| |\ \
| | |/ |
|
* | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 33 | -250/+385 |
|\ \ \
| |/ / |
|
| * | | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163 | Satya B | 2009-10-16 | 33 | -250/+385 |
* | | | Backport of: | Konstantin Osipov | 2009-10-14 | 3 | -4/+4 |
|/ / |
|
* | | Merge the changes done for 5.4.2-beta into "trunk". | Joerg Bruehe | 2009-09-09 | 1 | -1/+2 |
|\ \ |
|
| * | | Some fixes to make 5.4.2-beta compile on the less common | Joerg Bruehe | 2009-09-08 | 3 | -3/+4 |
* | | | Merge from mysql-5.1-bugteam | Alexander Nozdrin | 2009-08-26 | 2 | -2/+2 |
|\ \ \
| |/ /
|/| /
| |/ |
|
* | | Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same | Guilhem Bichot | 2009-08-07 | 193 | -0/+50974 |
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 179 | -41066/+0 |
|\ \
| |/ |
|
| * | Applying InnoDB snashot 5.1-ss5488, part 1 | Satya B | 2009-07-10 | 1 | -0/+1 |
| * | merge to mysql-5.1-bugteam | Satya B | 2009-06-29 | 4 | -60/+117 |
| |\ |
|
| | * | Applying InnoDB snashot 5.1-ss5282, Fix for BUG#45097 | Satya B | 2009-06-11 | 2 | -0/+26 |
| | * | Applying InnoDB snashot 5.1-ss5282, PRE-Fix for BUG#45097 | Satya B | 2009-06-11 | 3 | -60/+91 |
| * | | Applying InnoDB snashot 5.1-ss5343, Fixes BUG#45357 | Satya B | 2009-06-22 | 1 | -0/+1 |
| |/ |
|
| * | Applying InnoDB snashot 5.1-ss5024,part 3. Fixes BUG#42101 | Satya B | 2009-05-19 | 1 | -1/+0 |
* | | Merged in 5.1.35 | Mikael Ronstrom | 2009-07-01 | 1 | -2/+2 |
|\ \ |
|
| * | | First attempt at fixing Windows issues in 5.4.0 | Mikael Ronstrom | 2009-06-16 | 1 | -2/+2 |
* | | | Merge MySQL 5.1.35 into MySQL 5.4 | Mikael Ronstrom | 2009-06-11 | 8 | -119/+48 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Applying InnoDB snashot 5.1-ss4699, part 3. Fixes BUG#43660 | Satya B | 2009-04-15 | 1 | -0/+6 |
| * | Applying InnoDB snashot 5.1-ss4699, part 1. Fixes BUG#39320 and other | Satya B | 2009-04-15 | 3 | -100/+15 |
| * | auto-merge | Ignacio Galarza | 2009-03-17 | 3 | -18/+26 |
| |\ |
|
| | * | Applying InnoDB snashot 5.1-ss4007, part 1. Fixes | Timothy Smith | 2009-03-02 | 2 | -17/+13 |
| | * | Applying InnoDB snashot 5.1-ss3931, part 1. Fixes | Timothy Smith | 2009-03-02 | 1 | -1/+13 |
| * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -1/+1 |
| |/ |
|
* | | Fix for BUG#45131 | Mikael Ronstrom | 2009-06-10 | 1 | -14/+0 |
* | | Add support for Atomic instructions for Windows | Mikael Ronstrom | 2009-03-06 | 2 | -1/+30 |
* | | Workaround for bug with gcc on Solaris using pthread_setschedprio | Mikael Ronstrom | 2009-02-23 | 1 | -1/+8 |
* | | Fix build issue on 32-bit Solaris using gcc | Mikael Ronstrom | 2009-02-20 | 1 | -0/+7 |
* | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01... | Mikael Ronstrom | 2009-02-17 | 11 | -27/+68 |
|\ \
| |/ |
|
| * | 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/+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 | -2/+0 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 15. Fixes | Timothy Smith | 2008-12-14 | 2 | -10/+5 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 13. Fixes | Timothy Smith | 2008-12-14 | 1 | -0/+5 |
| * | Apply InnoDB snapshot innodb-5.1-2858, part 7. | Timothy Smith | 2008-12-14 | 2 | -6/+11 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 3. | Timothy Smith | 2008-12-14 | 1 | -1/+1 |
| * | Apply InnoDB snapshot innodb-5.1-ss2858, part 2. Fixes | Timothy Smith | 2008-12-14 | 1 | -5/+12 |
| * | Apply InnoDB snapshot innodb-5.1-ss2637, part 1. Fixes | Timothy Smith | 2008-12-14 | 1 | -0/+9 |
| * | Complete application of InnoDB snapshot innodb-5.1-ss2545. | Timothy Smith | 2008-12-14 | 1 | -0/+15 |