summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.1Michael Widenius2010-08-068-20/+77
|\
| * Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar...Michael Widenius2010-08-068-20/+77
* | Merge with 5.1Michael Widenius2010-08-066-21/+23
|\ \ | |/
| * Fixed wrong AC_INITMichael Widenius2010-08-061-1/+1
| * Fixed timing issue in test suiteMichael Widenius2010-08-063-18/+15
| * Merge of 5.1-releaseMichael Widenius2010-08-06806-19114/+37001
| |\
| | * Fixed test case and compiler warningsMichael Widenius2010-08-062-1/+6
* | | Fixed compiler warnings and test failuresMichael Widenius2010-08-068-15/+23
* | | Merge with MariaDB 5.1.49Michael Widenius2010-08-05820-19196/+37150
|\ \ \ | | |/ | |/|
| * | Automatic mergeMichael Widenius2010-08-057-75/+146
| |\ \
| | * | Remove not used filesMichael Widenius2010-08-057-75/+146
| * | | Fixed test failuresMichael Widenius2010-08-054-5/+8
| * | | Merge with 5.1-merge (new XTRADB code updated up to MySQL 5.1.47)Michael Widenius2010-08-05207-3849/+9692
| |\ \ \
| | * | | Fixed test failures (bugs in test suite)Michael Widenius2010-08-0517-22/+28
| | * | | Fixed compiler warningsMichael Widenius2010-08-0418-59/+58
| | * | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ...Michael Widenius2010-08-048-16/+64
| | * | | Fix mysql-test/suite/percona missing from `make dist`.unknown2010-08-041-0/+1
| | * | | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-04168-1716/+9534
| | |\ \ \
| | | * | | updated with changes from Percona-Server-5.1.47-11.2unknown2010-08-03152-2297/+10142
| * | | | | Fixed some test failures after last push (failing tests and valgrind warnings)Michael Widenius2010-08-046-11/+63
| * | | | | Fixes to allow one to compile and test innodb_pluginMichael Widenius2010-08-0431-81/+488
| |/ / / /
| * | | | Fixed warnings and build failures after last pushMichael Widenius2010-08-0220-103/+133
| * | | | Merge with MariaDB mainMichael Widenius2010-08-02713-16154/+29298
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Disable some tests that is waiting for next merge with xtradbMichael Widenius2010-08-024-0/+18
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-02610-15561/+27019
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix bug #55039 Failing assertion: space_id > 0 in fil0fil.c.unknown2010-07-092-5/+25
| | | * | rko Mdkeld change, revision 3351.14.134 add innodb_plugin to mysql-test-run d...sunanda2010-07-071-0/+1
| | | * | Merge mysql-5.1-innodb -> mysql-5.1-securityVasil Dimov2010-07-04111-693/+7586
| | | |\ \
| | | | * | Fix bug#54583. This change reverses rsvn:1350 by getting rid of a bogus asser...Sunny Bains2010-06-256-18/+14
| | | | * | Merge a lost changeset inaam.rana@oracle.com-20100624124843-m7ouqwe5zqcqapn1Vasil Dimov2010-06-250-0/+0
| | | | |\ \
| | | | | * \ mergeInaam Rana2010-06-2413-127/+432
| | | | | |\ \
| | | | * | \ \ Merge a lost changeset inaam.rana@oracle.com-20100624124450-2m3mg1238ewvakgxVasil Dimov2010-06-251-0/+7
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Add ChangeLog for bug#39168Inaam Rana2010-06-241-0/+7
| | | | * | | | Merge a lost changeset marko.makela@oracle.com-20100624104820-p4ojmxcmq8qeos6dVasil Dimov2010-06-251-0/+6
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Add ChangeLog entry for Bug#54679Marko Mäkelä2010-06-241-0/+6
| | | | * | | | Merge a lost changeset marko.makela@oracle.com-20100624104620-pklunowaigv7quu9Vasil Dimov2010-06-253-79/+268
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Bug#54679: alter table causes compressed row_format to revert to compactMarko Mäkelä2010-06-243-79/+268
| | | | * | | | Merge a lost changeset jimmy.yang@oracle.com-20100624021010-oh2hnp8e1xbaax6uVasil Dimov2010-06-257-77/+4
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Move the fix for bug #54044 to security branch, and revert commit -r3520:3521.Jimmy Yang2010-06-237-77/+4
| | | | |/ / /
| | | | * | | Port fix for "bug #54044 Create temporary tables and using innodb crashes"Jimmy Yang2010-06-224-2/+41
| | | | * | | Fix bug #54044, Create temporary tables and using innodb crashes. ScreenJimmy Yang2010-06-223-2/+36
| | | | * | | Merge mysql-5.1-innodb from bk-internal to my local treeVasil Dimov2010-06-222-0/+13
| | | | |\ \ \
| | | | | * | | ChangeLog for Bug#54686 "field->col->mtype == type" assertion error at row/ro...Marko Mäkelä2010-06-221-0/+6
| | | | | * | | Bug#54686 "field->col->mtype == type" assertion error at row/row0sel.cMarko Mäkelä2010-06-221-0/+7
| | | | * | | | Add ChangeLog entry for the fix of Bug#47991Vasil Dimov2010-06-221-0/+7
| | | | * | | | Fix Bug#47991 InnoDB Dictionary Cache memory usage increases indefinitelyVasil Dimov2010-06-226-11/+49
| | | | |/ / /
| | | | * | | Bug#54658: Add ChangeLog entryMarko Mäkelä2010-06-211-0/+6
| | | | * | | Bug #54658: InnoDB: Warning: allocated tablespace %lu, old maximum was 0Marko Mäkelä2010-06-212-2/+7
| | | | * | | Merge mysql-5.1-innodb from bk-internal to my local repoVasil Dimov2010-06-182-4/+15
| | | | |\ \ \
| | | | | * | | Check in fix for Bug #52814 InnoDB: Use the new ha_data interfacesJimmy Yang2010-06-171-3/+9