summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge with mysql-5.5.21Sergei Golubchik2012-03-09127-1548/+3502
|\
| * Merge with main for BUG#12969301unknown2012-01-30151-685/+3861
| |\
| | * Bug#11836233 MISLEADING SUGGESTION REGARDING LINUX NATIVE AIO IN INNODBInaam Rana2012-01-301-1/+1
| | * Bug#13604121 - LIBMYSQLCIENT.SO MISSING SOME FUNCTIONS PRESENT IN LIBMYSQLCLI...Tor Didriksen2012-01-301-0/+2
| | * Fix for build break introduced at rev 3711Yasufumi Kinoshita2012-01-271-0/+1
| | * BUG 13413535 followup: Fix gcc warningJorgen Loland2012-01-261-2/+2
| | * Bug #13413535 61104: INNODB: FAILING ASSERTION: PAGE_GET_N_RECS(PAGE) > 1Marko Mäkelä2012-01-2615-35/+118
| | * merge from 5.1Guilhem Bichot2012-01-263-2/+195
| | |\
| | | * Fixes for:Guilhem Bichot2012-01-263-2/+195
| | * | Bug#11753187 post-push fix: fix .result fileTor Didriksen2012-01-261-1/+1
| | * | BUG#12403008 RPL_HEARTBEAT_BASIC FAILS SPORADICALLY ON PUSHBUILDNuno Carvalho2012-01-252-0/+7
| | * | Bug#13359121 LARGE NUMBERS, /STRINGS/DTOA.C:662Tor Didriksen2012-01-253-13/+111
| | * | Bug#13463415 followup: compensate for compiler bugTor Didriksen2012-01-251-3/+12
| | * | Bug#13463415 63502: INCORRECT RESULTS OF BIGINT AND DECIMAL COMPARISONTor Didriksen2012-01-254-10/+134
| | * | Fixed bug#11753187 (formerly known as bug 44585): SP_CACHE BEHAVES ASDmitry Shulga2012-01-2511-0/+177
| | * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-01-251-0/+5
| | |\ \ | | | |/
| | | * btr_cur_search_to_nth_level(): Add a debug assertionMarko Mäkelä2012-01-252-0/+10
| | * | Merging from mysql-5.5Alexander Barkov2012-01-240-0/+0
| | |\ \ | | | |/
| | | * Merging from mysql-5.1Alexander Barkov2012-01-246-0/+282
| | | |\
| | * | \ Merging BUG#13458237 from 5.1.Alexander Barkov2012-01-244-3/+276
| | |\ \ \ | | | |/ /
| | | * | BUG#13458237 - INCONSISTENT HANDLING OF INVALIDE DATES WITH ZERO DAY. SIMILAR...Alexander Barkov2012-01-244-3/+246
| | * | | BUG#12364404 - UNDETERMINISTIC WAIT LOOP IN WAIT_FOR_NDB_TO_BINLOG.INCNuno Carvalho2012-01-231-27/+12
| | * | | BUG#11752315 - 43460: STOP SLAVE UNABLE TO COMPLETE WHEN SLAVE THREAD IS TRYI...Manish Kumar2012-01-239-40/+112
| | * | | Merging Bug#11752408 from mysql-5.1Alexander Barkov2012-01-236-0/+282
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8...Alexander Barkov2012-01-236-0/+282
| | | |/
| | * | Bug#13612811 VALGRIND ERROR IN OS_AIO_INITInaam Rana2012-01-201-0/+3
| | * | Bug#13500478 63623: TEST CASE PARTITION_BINLOG_STMTMattias Jonsson2012-01-202-4/+5
| | * | Addendum to the fix for bug #11754014Georgi Kodinov2012-01-205-4/+5
| | * | Patch for bug#13070308 - VALGRIND failure in XA test.Dmitry Shulga2012-01-202-6/+15
| | * | BUG#13050593 - BACKSLASH SWALLOWED BY INCLUDE/SHOW_SLAVE_STATUS.INCNuno Carvalho2012-01-1912-20/+40
| | * | Bug#11765450 58421: INNODB TEMPORARY TABLE CRASH WHEN TMPDIR ON LINUX TMPFSInaam Rana2012-01-191-0/+94
| | * | merging from the 5.5 repo to local branch.Andrei Elkin2012-01-1814-31/+343
| | |\ \
| | | * \ merged bug #11754014Georgi Kodinov2012-01-177-25/+71
| | | |\ \
| | | | * | Bug #11754014: 45549: udf plugin_dir path separator inconsistency Georgi Kodinov2012-01-167-25/+71
| | | * | | Bug #11761530: 54035: MSYQLD_SAFE BEHAVIOUR CONSUMES TOO MUCH CPU IF IT IS UN...Georgi Kodinov2011-11-101-0/+38
| | | * | | Null-merge from mysql-5.1.Nirbhay Choubey2012-01-170-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Bug #11760384 52792: MYSQLDUMP IN XML MODE DOES NOTNirbhay Choubey2012-01-171-1/+1
| | | * | | Add missing sys_vars tests for InnoDB variables.Marko Mäkelä2012-01-166-6/+234
| | * | | | BUG#13593869 - 64035: SEVERAL ERRORS IN COM_BINLOG_DUMP/MYSQL_BINLOG_SEND CRA...Andrei Elkin2012-01-1811-34/+77
| | |/ / /
| | * | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-01-161-2/+10
| | |\ \ \ | | | |/ /
| | | * | Bug#13496818 ASSERTION: REC_PAGE_NO > 4 IN IBUF CONTRACTIONMarko Mäkelä2012-01-163-8/+29
| | * | | Bug#13551687 CMAKE GENERATED PROJECT FILES ALWAYS HAVE THE SAME NAME IN VISUA...Tor Didriksen2012-01-161-1/+12
| | * | | Automerge from mysql-5.1 to mysql-5.5.Nuno Carvalho2012-01-161-0/+4
| | |\ \ \ | | | |/ /
| | | * | BUG#11893288 60542: RPL.RPL_EXTRA_COL_MASTER_* DOESN'T TEST WHAT WAS INTENDEDNuno Carvalho2012-01-165-3503/+9
| | * | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-01-161-1/+1
| | |\ \ \ | | | |/ /
| | | * | buf_page_get_known_nowait(): Relax a bogus debug assertion.Marko Mäkelä2012-01-161-1/+1
| | * | | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-01-161-11/+97
| | |\ \ \ | | | |/ /
| | | * | Bug #11765438 58406: Annamalai Gurusami2012-01-164-22/+244
| | * | | fix compile warning: may be used uninitializedTor Didriksen2012-01-121-1/+1
| | * | | weave merge of mysql-5.1->mysql-5.5Georgi Kodinov2012-01-123-5/+5
| | |\ \ \ | | | |/ /