summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0merge.c
Commit message (Expand)AuthorAgeFilesLines
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-2728/+0
* Fix Bug #64432 Port bug fix #54330 from mysql-5.1 to mysql-5.5Jimmy Yang2012-02-241-31/+62
* Merge from mysql-5.1-innodb.Sunny Bains2012-02-101-6/+25
* Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-021-2/+2
* Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES.Jimmy Yang2011-08-161-2/+3
* Bug 12323643 - CLEAN UP THE INNODB THREAD SHUTDOWN AND ASSERTIONS (WL#5136)Marko Mäkelä2011-04-051-2/+0
* Merge from mysql-5.5.9-releaseJonathan Perkin2011-02-081-2/+2
|\
| * Merge from mysql-5.1-security to mysql-5.5-securityJimmy Yang2011-01-071-2/+2
* | Fix Bug #59390 row_merge_build_indexes() fails to register tmpfd for PFSJimmy Yang2011-01-281-22/+46
|/
* Merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2010-11-101-1/+1
* Manual port Bug #Bug #54582 "stack overflow when opening many tablesJimmy Yang2010-10-061-1/+1
* Merge mysql-trunk-bugfixing -> mysql-trunk-innodbVasil Dimov2010-07-211-4/+6
|\
| * Implemented code review comments.Marc Alff2010-07-141-4/+4
| * Bug#55087 Performance schema: optimization of the instrumentation interfaceMarc Alff2010-07-091-2/+4
* | Merge Bug#54358 fix from mysql-5.1-innodb:Marko Mäkelä2010-06-291-0/+5
* | Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4Marko Mäkelä2010-06-291-1/+1
* | Bug#54728: Replace the dulint struct with a 64-bit integer.Marko Mäkelä2010-06-231-9/+6
* | Merge Bug#47991 fix from mysql-5.1-innodbVasil Dimov2010-06-231-1/+12
|/
* Use the correct len instead of sizeof(void) in posix_fadvise()Vasil Dimov2010-05-211-6/+9
* Move os_file_write() before posix_fadvise(POSIX_FADV_DONTNEED).Vasil Dimov2010-05-211-4/+7
* Fix comment on row_merge_write()Vasil Dimov2010-05-211-1/+1
* Fix a bug reported by PushBuild on OSX 10.6.3. It turned out to be a compilerSunny Bains2010-05-191-3/+4
* Merge from mysql-5.1-innodb:Marko Mäkelä2010-05-121-1/+4
* Merge from mysql-5.1-innodb:Marko Mäkelä2010-05-111-4/+9
* Merge from mysql-5.1-innodb:Marko Makela2010-05-101-1/+1
* Merge from mysql-5.1-innodb:Vasil Dimov2010-05-041-1/+1
* Import branches/innodb+ from SVN on top of storage/innobase.Vasil Dimov2010-04-121-61/+142
* Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-6/+6
|\
| * Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-33/+192
| |\
| * | 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-021-2/+23
| |/ |/|
* | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163Satya B2009-10-161-33/+192
|/
* Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-071-0/+2364
View Lorry Controller Status