summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-5.1-bugteam -> mysql-5.5-bugteam (empty)Vasil Dimov2010-10-290-0/+0
|\
| * Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-10-2954-350/+4361
| |\
* | \ Merge mysql-5.5-innodb -> mysql-5.5-bugteamVasil Dimov2010-10-2916-163/+151
|\ \ \
| * | | Merge fix for bug#57616 from mysql-5.5-security to mysql-5.5-innodb.Jimmy Yang2010-10-281-2/+2
| * | | Fix a compilation warning:Vasil Dimov2010-10-281-1/+1
| * | | Null merge mysql-5.1-innodb --> mysql-5.5-innodbCalvin Sun2010-10-280-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-281-6/+22
| | * | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-271-4/+20
| * | | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-281-3/+21
| * | | Fixed a C89 violation when atomic builtins are not defined, causingCalvin Sun2010-10-271-2/+2
| * | | Fix a bogus debug assertion in the fix of Bug #57707.Marko Mäkelä2010-10-271-1/+2
| * | | Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty diff)Vasil Dimov2010-10-270-0/+0
| |\ \ \ | | |/ /
| | * | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-10-2790-250/+876
| | |\ \ | | | |/
| * | | Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-10-27175-643/+4143
| |\ \ \
| * | | | Bug #57707 InnoDB buf_page_t size has doubled on 32-bit systemsMarko Mäkelä2010-10-273-54/+81
| * | | | Bug #57730 Clean up references to InnoDB PluginMarko Mäkelä2010-10-273-43/+6
| * | | | Fix compiler warning introduced by previous commit.Inaam Rana2010-10-263-9/+2
| * | | | Bug #57611 ibdata file and continuous growing undo logsInaam Rana2010-10-261-13/+1
| * | | | Null merge mysql-5.1-innodb to mysql-5.5-innodbInaam Rana2010-10-260-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #57611 ibdata file and continuous growing undo logsInaam Rana2010-10-262-28/+8
| * | | | Bug#57720 - Windows Vista and possibly Windows 7 can return ERROR_TIMEOUT ins...kevin.lewis@oracle.com2010-10-261-6/+19
| * | | | merge from mysql-5.1-innodb to mysql-5.5-innodb.Jimmy Yang2010-10-251-9/+14
| |\ \ \ \ | | |/ / /
| | * | | Fix bug #57700 Latching order violation in row_truncate_table_for_mysql().Jimmy Yang2010-10-242-9/+20
| * | | | Fix Bug #56791 Remove ios_mutex from InnoDB codeJimmy Yang2010-10-213-20/+0
| * | | | Fix an error introduced in a follow-up fix of Bug#57232 by Sunny BainsCalvin Sun2010-10-211-2/+2
* | | | | post merge fixMattias Jonsson2010-10-282-12/+2
* | | | | Merging patch for BUG#52131 with mysql-5.5-bugteam.Mats Kindahl2010-10-273-42/+127
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bug #52131: SET and ENUM stored endian-dependent in binary logMats Kindahl2010-10-063-42/+127
* | | | | Bug #57689: mysql_change_user() breaks user connection on older clientsGeorgi Kodinov2010-10-251-2/+37
* | | | | mergeGeorgi Kodinov2010-10-275-17/+3
|\ \ \ \ \
| * | | | | Follow-up for Bug#55850: update funcs_1 result files.Alexander Nozdrin2010-10-273-12/+0
| * | | | | Up merge revision 3547 from 5.1. Enable sp_sync test since Bug 48157 is fixedAnitha Gopi2010-10-272-5/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed bug numbers in disabled.def filesAnitha Gopi2010-10-273-5/+5
| * | | | | Fixed test resultMarc Alff2010-10-261-2/+2
* | | | | | mergeGeorgi Kodinov2010-10-2720-26/+302
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Raise version number after cloning 5.5.7-rcsmenon2010-10-131-1/+1
| * | | | | Reverting a patch for Bug#45445 (cannot execute procedures with thread_stack ...Alexander Nozdrin2010-10-131-1/+4
| * | | | | Auto-merge from mysql-5.5-bugteam.Alexander Nozdrin2010-10-13140-1602/+2444
| |\ \ \ \ \
| * \ \ \ \ \ Merge from mysql-5.1-security to mysql-5.5-securityJimmy Yang2010-10-063-0/+55
| |\ \ \ \ \ \
| | * | | | | | Fix Bug #57255 Cascade Delete results in "Got error -1 from storage engine".Jimmy Yang2010-10-067-0/+114
| * | | | | | | Manual port Bug #Bug #54582 "stack overflow when opening many tablesJimmy Yang2010-10-069-11/+139
| * | | | | | | Fixed the .spec file to include the new wl1054 shared objectsGeorgi Kodinov2010-10-061-0/+10
| * | | | | | | mergeGeorgi Kodinov2010-10-063-11/+44
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge of 5.1-bugteam into 5.1-securityGeorgi Kodinov2010-10-06148-1803/+3837
| | |\ \ \ \ \ \
| | * | | | | | | result fixSergey Glukhov2010-10-041-8/+8
| | * | | | | | | Bug#54488 crash when using explain and prepared statements with subqueriesSergey Glukhov2010-10-013-11/+44
| * | | | | | | | merge 5.5-bugteam -> 5.5-securityGeorgi Kodinov2010-10-06174-24227/+9239
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Auto-merge from mysql-5.5-bugteam.Alexander Nozdrin2010-10-02301-5290/+9725
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-09-293-1/+34
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug#54494 crash with explain extended and prepared statementsSergey Glukhov2010-09-233-0/+35