summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Simplifications of server interface to schedulerMikael Ronström2011-02-103-6/+30
* Remove no longer needed things for DBUG handling in thread pool pluginsMikael Ronström2011-02-101-5/+0
* Simplify interface to connect methods in serverMikael Ronström2011-02-103-14/+33
* mergeMikael Ronström2011-02-10287-1287/+4612
|\
| * Bug#31384 DATE_ADD() and DATE_SUB() return binary dataAlexander Barkov2011-02-101-0/+3
| * bug#59085 recommitMattias Jonsson2011-02-101-4/+3
| * Bug #59017: Auth plugin socket_peercred fails to load in 5.5.8Georgi Kodinov2011-01-111-1/+1
| * Bug #59884: setting charset to 2048 crashesGeorgi Kodinov2011-02-103-7/+61
| * Bug#31384 DATE_ADD() and DATE_SUB() return binary dataAlexander Barkov2011-02-1010-14/+272
| * Merging with mysql-5.5Mats Kindahl2011-02-098-25/+72
| |\
| | * Combine test-bt and test-bt-debug into a single default.releaseJonathan Perkin2011-02-095-13/+11
| | * Silly mistake in 59148, forgot .exe on WindowsBjorn Munch2011-02-091-1/+1
| | * Empty upmerge.Joerg Bruehe2011-02-090-0/+0
| | |\
| | | * Merge bugfix 56581 into main.Joerg Bruehe2011-02-091-10/+48
| | | |\
| | * | \ Merge bugfix 56581 into main.Joerg Bruehe2011-02-091-11/+58
| | |\ \ \
| | | * \ \ Upmerge the fix for bug#56581 from 5.1 to 5.5.Joerg Bruehe2011-02-091-11/+58
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Fix Bug #56581 RPM scripts use hardcoded datadir locationJoerg Bruehe2011-02-031-10/+48
| | * | | | Automerge from mysql-5.1 for follow-up bug#57450.Dmitry Shulga2011-02-091-0/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Follow up fix for bug#57450.Dmitry Shulga2011-02-091-0/+2
| | * | | | Null merge from mysql-5.1John H. Embretsen2011-02-090-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | 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
| * | | | | | Merging with mysql-5.5.Mats Kindahl2011-02-0963-294/+958
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Automerge from mysql-5.1 for follow-up bug#57450.Dmitry Shulga2011-02-092-0/+10
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Follow up fix for bug#57450.Dmitry Shulga2011-02-092-0/+10
| | * | | | | Merge mysql-5.1 -> mysql-5.5 (empty)Vasil Dimov2011-02-080-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-02-0815-175/+316
| | | |\ \ \ \
| | * | \ \ \ \ Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-02-0817-187/+321
| | |\ \ \ \ \ \
| | | * | | | | | Adjust a suppression to cover more codepaths.Vasil Dimov2011-02-081-4/+0
| | | * | | | | | Bug #59472 increase AIO requests per IO thread limit to 256 from 32Inaam Rana2011-02-071-5/+8
| | | * | | | | | Add one more Valgrind suppression to cover a different codepathVasil Dimov2011-02-071-10/+9
| | | * | | | | | Null merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-02-070-0/+0
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Backport the fix for Bug#59875 Valgrind warning in buf0buddy.c from 5.5Vasil Dimov2011-02-071-0/+13
| | | * | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-02-071-4/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Use fun:* instead of obj:*/libz.so* because when the bundled zlib isVasil Dimov2011-02-071-4/+4
| | | * | | | | | Fix Bug#59875 Valgrind warning in buf0buddy.cVasil Dimov2011-02-041-0/+14
| | | * | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-02-041-0/+33
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Fix Bug#59874 Valgrind warning in InnoDB compression codeVasil Dimov2011-02-041-0/+34
| | | * | | | | | Bug#59699 - Hidden bug would cause a crash for unknown tablespace flags.unknown2011-02-041-1/+1
| | | * | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-02-0211-141/+195
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | 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
| | | * | | | | | Replay a lost change (fix for Bug#56947 InnoDB leaks memory... in 5.5)Vasil Dimov2011-02-011-6/+8
| | | * | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-316-34/+67
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Bug#59230 assert 0 row_upd_changes_ord_field_binary() in post-crashMarko Mäkelä2011-01-317-34/+74
| | | * | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty)Vasil Dimov2011-01-300-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-3031-40/+302
| | | | |\ \ \ \ \
| | | * | \ \ \ \ \ Merge mysql-5.5 -> mysql-5.5-innodbVasil Dimov2011-01-3031-121/+606
| | | |\ \ \ \ \ \ \