summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated/added copyright headersKent Boortz2011-06-30629-1190/+2975
|\
| * Updated/added copyright headersKent Boortz2011-06-30286-559/+833
* | null weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-02-100-0/+0
|\ \ | |/
| * merge 5.0->5.0-securityGeorgi Kodinov2011-02-102-4/+5
| |\
* | \ merge 5.1->5.1-securityGeorgi Kodinov2011-02-102-10/+50
|\ \ \
| * \ \ Merge bugfix 56581 into main.Joerg Bruehe2011-02-091-10/+48
| |\ \ \
| | * | | Fix Bug #56581 RPM scripts use hardcoded datadir locationJoerg Bruehe2011-02-031-10/+48
| * | | | Follow up fix for bug#57450.Dmitry Shulga2011-02-091-0/+2
| * | | | Null merge from mysql-5.0John H. Embretsen2011-02-090-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Backport to 5.0: Fix for Bug#52060 - test udf fails on Snow Leopard.John H. Embretsen2011-02-092-4/+5
* | | | | empty weave merge of 5.0-security->5.1-securityGeorgi Kodinov2011-02-090-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge 5.0->5.0-securityGeorgi Kodinov2011-02-0910-16/+83
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | weave merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-02-09144-726/+2743
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Follow up fix for bug#57450.Dmitry Shulga2011-02-092-0/+10
| * | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-02-0815-175/+316
| |\ \ \ \
| | * | | | Backport the fix for Bug#59875 Valgrind warning in buf0buddy.c from 5.5Vasil Dimov2011-02-071-0/+13
| | * | | | Use fun:* instead of obj:*/libz.so* because when the bundled zlib isVasil Dimov2011-02-071-4/+4
| | * | | | Fix Bug#59874 Valgrind warning in InnoDB compression codeVasil Dimov2011-02-041-0/+34
| | * | | | Bug #55284 diagnostics: Introduce UNIV_BLOB_LIGHT_DEBUG, enabled by UNIV_DEBUGMarko Mäkelä2011-02-025-54/+144
| | * | | | Non-functional changes (cleanup) made while narrowing down Bug #55284:Marko Mäkelä2011-02-022-58/+19
| | * | | | Bug #55284 diagnostics: When UNIV_DEBUG, do not tolerate garbage inMarko Mäkelä2011-02-021-0/+2
| | * | | | Bug #55284 diagnostics: Enable UNIV_DEBUG_FILE_ACCESSES by UNIV_DEBUGMarko Mäkelä2011-02-025-29/+30
| | * | | | Bug#59230 assert 0 row_upd_changes_ord_field_binary() in post-crashMarko Mäkelä2011-01-317-34/+74
| | * | | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-3031-40/+302
| | |\ \ \ \
| * | \ \ \ \ weave merge of mysql-5.0 to mysql-5.1.Georgi Kodinov2011-02-080-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge from mysql-5.0.92-releaseJonathan Perkin2011-02-0824-312/+776
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge from mysql-5.1.55-releaseunknown2011-02-0841-85/+581
| |\ \ \ \ \ \ \
| | * | | | | | | Updating header copyright/README in source for 2011Karen Langford2011-01-2515-15/+15
| * | | | | | | | Fix for Bug#59837 - mysqlhotcopy fails with wrong error (11) on specific plat...John H. Embretsen2011-02-081-1/+1
| * | | | | | | | Removed the collections for mysql-5.1-bugteam. Removed 1st from weekly. This ...Anitha Gopi2011-02-083-10/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Removed the collections for mysql-5.1-bugteam. Removed 1st from weekly. This ...Anitha Gopi2011-02-083-10/+0
| * | | | | | | | | merge 47141,59979Bjorn Munch2011-02-081-4/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #59979 Add mtr option to run debug server, but without turning on debugBjorn Munch2011-02-071-3/+10
| | * | | | | | | | | merge from 5.1 mainBjorn Munch2011-02-0492-383/+1952
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #47141 "mysqltest" breaks because it tries to act on a debug option which...Bjorn Munch2011-02-041-1/+4
| | * | | | | | | | | | merge from 5.1 mainBjorn Munch2011-01-2930-37/+295
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix for bug#59308: Incorrect result for SELECT DISTINCT <col>... ORDER BY <co...Ole John Aske2011-02-073-88/+177
| * | | | | | | | | | | | Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanupVinay Fisrekar2011-02-072-1/+1
| * | | | | | | | | | | | Fixed bug#57450 - mysql client enter in an infinite loopDmitry Shulga2011-02-054-20/+39
| * | | | | | | | | | | | BUG#59147: Automerged bzr bundle form bug report into mysql-5.1 .Luis Soares2011-02-043-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | BUG#59147: rpl_circular_for_4_hosts fails sporadicallyLuis Soares2011-02-033-5/+5
| * | | | | | | | | | | | Fixed bug#58026 - massive recursion and crash in regular expressionDmitry Shulga2011-02-046-5/+53
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | mergeGeorgi Kodinov2011-02-022-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Bug #52315 part 2 addendum : reset back the timestampGeorgi Kodinov2011-02-022-0/+4
| * | | | | | | | | | | merge to 5.1.Georgi Kodinov2011-02-0210-15/+79
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Fixes for Bug #55755 and Bug #52315 part 2Georgi Kodinov2011-02-0210-16/+79
| * | | | | | | | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 ||Dmitry Lenev2011-02-025-0/+53
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix for bug#57030: ('BETWEEN' evaluation is incorrect')Ole John Aske2011-02-013-38/+228
| * | | | | | | | | | Post-fix for BUG#59338.Alfranio Correia2011-01-312-3/+3
| * | | | | | | | | | merge mysql-5.1 (local) --> mysql-5.1Alfranio Correia2011-01-312-2/+8
| |\ \ \ \ \ \ \ \ \ \