summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeGeorgi Kodinov2011-02-0210-15/+81
|\
| * merge to 5.1.Georgi Kodinov2011-02-0210-15/+79
| |\
| | * Fixes for Bug #55755 and Bug #52315 part 2Georgi Kodinov2011-02-0210-16/+79
* | | Merged fix for bug #58650 "Failing assertion:Dmitry Lenev2011-02-0210-24/+80
|\ \ \
| * | | Bug #36022 please log more information about "Sort aborted" queriesTor Didriksen2011-02-0210-24/+80
* | | | Merged fix for bug #58650 "Failing assertion:Dmitry Lenev2011-02-024-0/+41
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix for bug #58650 "Failing assertion: primary_key_no == -1 ||Dmitry Lenev2011-02-025-0/+53
* | | Backport of fix for Bug#52123Tor Didriksen2011-02-024-16/+38
* | | Fix for bug#58490, 'Incorrect result in multi level OUTER JOIN Ole John Aske2011-02-013-2/+291
* | | MergeOle John Aske2011-02-013-38/+228
|\ \ \ | |/ /
| * | Fix for bug#57030: ('BETWEEN' evaluation is incorrect')Ole John Aske2011-02-013-38/+228
* | | Bug #59657: Move the client authentication_pam plugin into the server repositoryGeorgi Kodinov2011-01-315-1/+115
* | | null-mergeAlfranio Correia2011-01-310-0/+0
|\ \ \ | |/ /
| * | Post-fix for BUG#59338.Alfranio Correia2011-01-312-3/+3
* | | merge mysql-5.1 --> mysql-5.5Alfranio Correia2011-01-3112-87/+192
|\ \ \ | |/ /
| * | merge mysql-5.1 (local) --> mysql-5.1Alfranio Correia2011-01-312-2/+8
| |\ \
| | * | BUG#55675 rpl.rpl_log_pos fails sporadically with error binlog truncated in t...Alfranio Correia2011-01-282-2/+8
| * | | merge mysql-5.1 (local) --> mysql-5.1Alfranio Correia2011-01-319-83/+194
| |\ \ \
| | * | | BUG#59338 Inconsistency in binlog for statements that don't change any rows S...Alfranio Correia2011-01-289-83/+194
| | |/ /
* | | | (no commit message)Sandeep Doddaballapur2011-01-312-10/+22
* | | | upmerge for changes in mysql-5.1 - #33971Sandeep Doddaballapur2011-01-312-4/+5
|\ \ \ \ | |/ / /
| * | | automergeSandeep Doddaballapur2011-01-3180-271/+1557
| |\ \ \
| * \ \ \ (no commit message)Sandeep Doddaballapur2011-01-278-5/+74
| |\ \ \ \
| * | | | | (no commit message)Sandeep Doddaballapur2011-01-252-4/+5
* | | | | | Merge mysql-5.1 -> mysql-5.5 (empty)Vasil Dimov2011-01-300-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-01-3056-237/+1329
| |\ \ \ \ \
* | \ \ \ \ \ Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-01-3037-350/+909
|\ \ \ \ \ \ \
| * | | | | | | 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 Yang2011-01-281-5/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix Bug #59465 btr_estimate_number_of_different_key_vals use incorrect offsetJimmy Yang2011-01-283-10/+17
| * | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-272-16/+13
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#59440 Race condition in XA ROLLBACK and XA COMMIT after server restartMarko Mäkelä2011-01-275-32/+34
| * | | | | | | ibuf_contract_ext(): Remove an #if 0 section of codeMarko Mäkelä2011-01-271-18/+1
| * | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-261-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#59585 Fix 58912 introduces compiler warningMarko Mäkelä2011-01-252-0/+10
| * | | | | | | In sync_close() fix a bug introduced by the fix for Bug #59683 where we iterateSunny Bains2011-01-261-1/+3
| * | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-252-4/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#59486 Incorrect usage of UNIV_UNLIKELY() in mlog_parse_string()Marko Mäkelä2011-01-252-1/+6
| | * | | | | | Bug#59464 Race condition in row_vers_build_for_semi_consistent_readMarko Mäkelä2011-01-253-6/+19
| * | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-2510-70/+31
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#59707 Unused compression-related parameters in buffer pool functionsMarko Mäkelä2011-01-2512-70/+40
| * | | | | | | Fix Bug #59683 :InnoDB latch deadlock detector/violation debug code is very slowSunny Bains2011-01-251-157/+198
| * | | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-01-240-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-24173-4465/+2730
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | Merge mysql-5.5 -> mysql-5.5-innodbVasil Dimov2011-01-24285-6134/+4612
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-183-12/+14
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Bug#59579 rw_lock_debug_print outputs to stderrMarko Mäkelä2011-01-187-24/+34
| * | | | | | | | Merge from mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-172-8/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Non-functional changes.Marko Mäkelä2011-01-174-16/+2
| * | | | | | | | Merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2011-01-1413-37/+580
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /