summaryrefslogtreecommitdiff
path: root/storage/innobase/row
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-6/+6
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-4/+4
| |\
| * \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-233-61/+214
| |\ \
| * | | Backport of:Konstantin Osipov2009-10-141-6/+6
* | | | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys...Satya B2009-12-022-27/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Applying InnoDB snapshot 5.1-ss6242, part 7. Fixes BUG#49032Satya B2009-11-301-3/+22
* | | | Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.Sergey Vojtovich2009-11-052-4/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+1
| * | Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369Satya B2009-10-051-13/+0
* | | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163Satya B2009-10-163-61/+214
| |/ |/|
* | Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-0712-0/+20281
* | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-0410-16928/+0
|\ \ | |/
| * Applying InnoDB snashot 5.1-ss5343, Fixes BUG#45357Satya B2009-06-221-2/+7
* | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-112-44/+72
|\ \ | |/
| * Applying InnoDB snashot 5.1-ss4699, part 1. Fixes BUG#39320 and otherSatya B2009-04-152-44/+72
* | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01...Mikael Ronstrom2009-02-172-79/+45
|\ \ | |/
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-131-3/+4
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-122-49/+7
| * Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-121-1/+1
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 15. FixesTimothy Smith2008-12-141-1/+1
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 13. FixesTimothy Smith2008-12-141-0/+1
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 10.Timothy Smith2008-12-141-2/+3
| * Apply InnoDB snapshot innodb-5.1-2858, part 7.Timothy Smith2008-12-141-1/+7
| * Apply InnoDB snapshot innodb-5.1-ss2858, part 2. FixesTimothy Smith2008-12-141-8/+6
| * Apply InnoDB snapshot innodb-5.1-ss2637, part 1. FixesTimothy Smith2008-12-141-12/+5
| * Completing snapshot innodb-5.1-ss2438, part 2. FixesTimothy Smith2008-12-141-1/+9
| * Completing snapshot innodb-5.1-ss2438, part 1. FixesTimothy Smith2008-12-141-2/+2
* | Google SMP patchMikael Ronstrom2008-10-151-2/+2
|/
* Cherry-pick some changes from innodb-5.1-ss2479 snapshot. Includes fixes forTimothy Smith2008-08-191-31/+2
* revert the following CS on grounds of "right patch, wrong time":unknown2008-05-142-11/+3
* Apply InnoDB snapshot innodb-5.1-ss2438.unknown2008-05-102-3/+11
* apply snapshot innodb-5.1-ss2387unknown2008-03-271-1/+22
* Apply innodb-5.1-ss2360 snapshotunknown2008-03-271-5/+5
* Applied InnoDB snapshot innodb-5.1-ss2298unknown2008-02-191-16/+46
* Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.unknown2008-01-141-0/+73
* Apply snapshot innodb-5.1-ss2034unknown2007-11-061-2/+5
* Apply snapshot innodb-5.1-ss1989unknown2007-11-062-68/+83
* Bug#30907unknown2007-09-081-39/+9
* Fix pushbuild test failures which occur on big-endian systems.unknown2007-08-291-0/+10
* Apply InnoDB snapshot innodb-5.1-ss1726.unknown2007-08-242-0/+170
* Apply snapshot innodb-51-ss1644unknown2007-07-241-22/+0
* Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569.unknown2007-07-105-66/+80
* Applied innodb-5.1-ss1381 snapshotunknown2007-03-281-7/+7
* Apply the following InnoDB snapshots:unknown2007-03-222-8/+6
* Fixed compiler warningsunknown2007-02-232-3/+3
* Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51unknown2007-01-053-3/+11
|\
| * Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.unknown2007-01-043-3/+11
* | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-311-2/+4
|/
* Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-231-2/+1
* Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildunknown2006-12-201-1/+10