summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-12-056-15/+33
|\
| * Bug#53696 Performance schema engine violates the PSEA API by calling my_error()Marc Alff2010-12-016-15/+33
* | Cherry pick vasil.dimov@oracle.com-20101201140708-fsc5xlu9bkpov6pvVasil Dimov2010-12-031-1/+16
* | Define MYSQL_(MAJOR|MINOR)_VERSION the way things are defined in CMakeVasil Dimov2010-12-021-4/+0
* | Merge from mysql-5.5-innodb to local.Marko Mäkelä2010-12-021-0/+2
|\ \
| * | Use "rep; nop" in InnoDB if it is available and "pause" is notVasil Dimov2010-12-021-0/+2
* | | Fix UNIV_MEM_DEBUG compilation failure caused by Bug#58226 fix.Marko Mäkelä2010-12-021-6/+6
|/ /
* | Bug#58212 Possible deadlock in change buffer in debug buildsMarko Mäkelä2010-12-013-27/+135
* | Bug#58226 Some InnoDB debug checks consume too much CPU timeMarko Mäkelä2010-12-017-26/+102
* | Fix a compilation error that was introduced in the Bug #55222 fixMarko Mäkelä2010-12-011-2/+2
* | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2010-12-011-1/+1
|\ \
| * | Bug#58623: Bogus debug assertion failure in i_s_locks_row_validate()Marko Mäkelä2010-12-011-1/+1
| * | RB://518 approved by Jimmy Yang and Sunny bainsunknown2010-11-301-93/+89
| * | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-11-293-8/+18
| |\ \
| | * \ mergeGeorgi Kodinov2010-11-263-8/+18
| | |\ \
| | | * \ merge to 5.1-securityGeorgi Kodinov2010-10-2940-355/+936
| | | |\ \
| | | * | | Fix bug #57700 Latching order violation in row_truncate_table_for_mysql().Jimmy Yang2010-10-242-9/+20
| | | * | | Fix bug #57616 Sig 11 in dict_load_table() when failed to load indexJimmy Yang2010-10-203-4/+10
| | | * | | Merge Bug #57345, Bug #56982, Bug#53307 test from mysql-5.1-innodbMarko Makela2010-10-114-3/+37
| | | |\ \ \
| | | * | | | Bug #56947 InnoDB leaks memory when failing to create a tableMarko Mäkelä2010-10-112-9/+18
| | | * | | | Bug #56947 InnoDB leaks memory when failing to create a tableMarko Mäkelä2010-10-111-0/+1
| * | | | | | Bug#47350 Support innodb plugin without separate shared objectVasil Dimov2010-11-251-0/+3
* | | | | | | Fix compiler warning for Bug#55222 patch.unknown2010-11-301-0/+1
* | | | | | | Bug#55222 - RB://517 - Approved by Sunnyunknown2010-11-3010-53/+149
* | | | | | | RB://518 approved by Jimmy Yang and Sunny bainsunknown2010-11-301-91/+87
* | | | | | | Fix Bug# 58459 - assert slot->in_use == FALSE while starting purge thread.Sunny Bains2010-11-301-2/+3
* | | | | | | Make output from innobase_start_or_create_for_mysql() consistentVasil Dimov2010-11-292-131/+248
* | | | | | | Fix pointers to documentationVasil Dimov2010-11-292-8/+15
* | | | | | | Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-11-2929-1524/+47
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | local mergeMarc Alff2010-11-2151-1901/+610
| |\ \ \ \ \ \
| | * | | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-2022-1523/+0
| * | | | | | | Bug#56760 PFS_lock::allocated_to_free() assert failures on osx10.5-x86-64bitMarc Alff2010-11-167-1/+47
* | | | | | | | Fix Bug #58461 InnoDB should show aggregated result for multipleJimmy Yang2010-11-282-79/+337
* | | | | | | | Fix the PAUSE instruction handling in InnoDBVasil Dimov2010-11-262-14/+12
* | | | | | | | Merge from mysql-5.1-innodb to mysql-5.5-innodb. Test was adjusted.Sunny Bains2010-11-241-11/+13
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix bug# 18274 InnoDB auto_increment field reset on OPTIMIZE TABLESunny Bains2010-11-241-11/+13
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-11-1829-374/+661
| |\ \ \ \ \ \
* | | | | | | | Fix Bug#57739 Scary messages in error logVasil Dimov2010-11-221-3/+3
* | | | | | | | Fix Bug#58279 Incorrect enabling of UNIV_DEBUG in debug buildsVasil Dimov2010-11-191-4/+3
| |_|_|/ / / / |/| | | | | |
* | | | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well.Alexander Barkov2010-11-181-6/+3
* | | | | | | Merge mysql-5.5-innodb -> mysql-5.5-bugteamVasil Dimov2010-11-1826-370/+605
|\ \ \ \ \ \ \
| * | | | | | | Fix Bug #16290 Unclear error message when adding foreign key constraintJimmy Yang2010-11-144-2/+37
| * | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2010-11-111-2/+3
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix a debug assertion failure in the Bug#57802 fix.Marko Mäkelä2010-11-111-2/+3
| * | | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2010-11-113-45/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove unused parameter has_dict_mutex of dict_update_statistics_low()Vasil Dimov2010-11-113-44/+7
| * | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2010-11-112-10/+71
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#57802 Empty ASSERTION parameter passed to the HASH_SEARCH macroMarko Mäkelä2010-11-113-12/+77
| | * | | | | | Declarations and code do not mix in C90, not even within UNIV_DEBUG.Marko Mäkelä2010-11-112-4/+7
| * | | | | | | Increment InnoDB version from 1.1.3 to 1.1.4 Vasil Dimov2010-11-111-1/+1