summaryrefslogtreecommitdiff
path: root/storage/innobase/include
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-1223-44/+145
|\
| * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-113-4/+4
| |\
| * \ manual merge mysql-5.1-bugteam --> mysql-trunk-mergeGleb Shchepa2009-12-042-25/+1
| |\ \
| | * | Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-011-3/+1
| * | | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys...Satya B2009-12-0221-19/+144
| |\ \ \ | | |/ /
| | * | Applying InnoDB snapshot 5.1-ss6242, part 7. Fixes BUG#49032Satya B2009-11-302-8/+8
| | * | Applying InnoDB snapshot 5.1-ss6242, part 2. Fixes BUG#3139Satya B2009-11-301-0/+2
| | * | Applying InnoDB snapshot 5.1-ss6242, part 1. Fixes BUG#32430Satya B2009-11-301-11/+14
* | | | Backport of:Konstantin Osipov2009-11-231-3/+0
| |_|/ |/| |
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-065-11/+17
|\ \ \ | |/ /
| * | Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.Sergey Vojtovich2009-11-055-11/+17
| |\ \ | | |/
* | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-2333-250/+385
|\ \ \ | |/ /
| * | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163Satya B2009-10-1633-250/+385
* | | Backport of:Konstantin Osipov2009-10-143-4/+4
|/ /
* | Merge the changes done for 5.4.2-beta into "trunk".Joerg Bruehe2009-09-091-1/+2
|\ \
| * | Some fixes to make 5.4.2-beta compile on the less commonJoerg Bruehe2009-09-083-3/+4
* | | Merge from mysql-5.1-bugteamAlexander Nozdrin2009-08-262-2/+2
|\ \ \ | |/ / |/| / | |/
* | Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-07193-0/+50974
* | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-04179-41066/+0
|\ \ | |/
| * Applying InnoDB snashot 5.1-ss5488, part 1Satya B2009-07-101-0/+1
| * merge to mysql-5.1-bugteamSatya B2009-06-294-60/+117
| |\
| | * Applying InnoDB snashot 5.1-ss5282, Fix for BUG#45097Satya B2009-06-112-0/+26
| | * 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-221-0/+1
| |/
| * Applying InnoDB snashot 5.1-ss5024,part 3. Fixes BUG#42101Satya B2009-05-191-1/+0
* | Merged in 5.1.35Mikael Ronstrom2009-07-011-2/+2
|\ \
| * | First attempt at fixing Windows issues in 5.4.0Mikael Ronstrom2009-06-161-2/+2
* | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-118-119/+48
|\ \ \ | |/ / |/| / | |/
| * Applying InnoDB snashot 5.1-ss4699, part 3. Fixes BUG#43660Satya B2009-04-151-0/+6
| * Applying InnoDB snashot 5.1-ss4699, part 1. Fixes BUG#39320 and otherSatya B2009-04-153-100/+15
| * auto-mergeIgnacio Galarza2009-03-173-18/+26
| |\
| | * Applying InnoDB snashot 5.1-ss4007, part 1. FixesTimothy Smith2009-03-022-17/+13
| | * Applying InnoDB snashot 5.1-ss3931, part 1. FixesTimothy Smith2009-03-021-1/+13
| * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
| |/
* | Fix for BUG#45131Mikael Ronstrom2009-06-101-14/+0
* | Add support for Atomic instructions for WindowsMikael Ronstrom2009-03-062-1/+30
* | Workaround for bug with gcc on Solaris using pthread_setschedprioMikael Ronstrom2009-02-231-1/+8
* | Fix build issue on 32-bit Solaris using gccMikael Ronstrom2009-02-201-0/+7
* | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01...Mikael Ronstrom2009-02-1711-27/+68
|\ \ | |/
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-0/+2
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-1/+2
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-1/+1
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-2/+0
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 15. FixesTimothy Smith2008-12-142-10/+5
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 13. FixesTimothy Smith2008-12-141-0/+5
| * Apply InnoDB snapshot innodb-5.1-2858, part 7.Timothy Smith2008-12-142-6/+11
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 3.Timothy Smith2008-12-141-1/+1
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 2. FixesTimothy Smith2008-12-141-5/+12
| * Apply InnoDB snapshot innodb-5.1-ss2637, part 1. FixesTimothy Smith2008-12-141-0/+9
| * Complete application of InnoDB snapshot innodb-5.1-ss2545.Timothy Smith2008-12-141-0/+15