summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manual merge.Davi Arnaut2009-12-1810-17/+20
|\
| * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-1712-19/+22
* | Backport to 5.1 branch (next-mr revid: 2921)Magne Mahre2009-12-181-1/+1
* | Merge approved bug fixJim Winstead2009-12-173-3/+15
|\ \
| * | The mysql command line client ignored the --skip-column-names optionJim Winstead2009-09-213-4/+15
* | | Merge with mysql-5.1-bugteam latest changesJim Winstead2009-12-1720-13/+207
|\ \ \
| * \ \ merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-12-172-7/+7
| |\ \ \
| | * | | BUG#49638 binlog_index fails in mysql-trunk-mergeAlfranio Correia2009-12-162-7/+7
| * | | | merge from 5.0 with bug@49740 fixesAndrei Elkin2009-12-172-0/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug #49740 rpl.rpl_temporary fails in PB2 in mysql-trunk-mergeAndrei Elkin2009-12-172-0/+4
| * | | | merge to mysql-5.1-bugteamSatya B2009-12-173-1/+77
| |\ \ \ \
| | * | | | Bug#47650: using group by with rollup without indexesMartin Hansson2009-12-173-1/+77
| * | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-1710-4/+80
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-1710-5/+78
| * | | | Auto-merge.Ramil Kalimullin2009-12-173-1/+39
| |\ \ \ \ | | |/ / /
| | * | | Fix for bug#49465: valgrind warnings and incorrect live checksum...Ramil Kalimullin2009-12-173-1/+39
* | | | | Merge approved bug fixJim Winstead2009-12-161-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix C99 aliasing violation due to mismatched types that were papered overJim Winstead2009-11-231-2/+2
* | | | | Bug#47017 rpl_timezone fails on PB-2 with mismatch errorMagne Mahre2009-12-161-2/+5
| |_|/ / |/| | |
* | | | mergeGeorgi Kodinov2009-12-160-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Bug #48709: Assertion failed in sql_select.cc:11782:Georgi Kodinov2009-12-153-0/+56
* | | | Bug #46827 rpl_circular_for_4_hosts failed on PB2unknown2009-12-161-19/+2
* | | | Postfixunknown2009-12-161-0/+1
* | | | mergeGeorgi Kodinov2009-12-153-0/+56
|\ \ \ \
| * | | | Bug #48709: Assertion failed in sql_select.cc:11782:Georgi Kodinov2009-12-153-0/+56
|/ / / /
* | | | mergeMattias Jonsson2009-12-153-10/+30
|\ \ \ \
| * | | | Recommit of patch for bug#49028 for 5.1.Mattias Jonsson2009-12-143-10/+30
* | | | | Bug#49134 5.1 server segfaults with 2byte collation fileAlexander Barkov2009-12-152-1/+9
* | | | | Bug #48995 abort missing DBUG_RETURN or .. in function "check_key_in_view"Jon Olav Hauglid2009-12-151-1/+1
* | | | | bug#49536 - deadlock on rotate_and_purge when using expire_logs_daysHe Zhenxing2009-12-151-6/+17
* | | | | Bug #34628 LOAD DATA CONCURRENT INFILE drops CONCURRENT in binary logunknown2009-12-156-31/+193
* | | | | AutomergeAlexey Kopytov2009-12-145-7/+101
|\ \ \ \ \
| * | | | | correction to the earlier merging: s/return/DBUG_RETURN/Andrei Elkin2009-12-141-1/+1
| * | | | | merging 5.0-bt -> 5.1-bt to local branch with bug@47210Andrei Elkin2009-12-145-7/+101
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | merging 5.0-bt to local branch with bug@47210Andrei Elkin2009-12-1497-674/+2626
| | |\ \ \
| | * | | | Bug #47210 first execution of "start slave until" stops too early Andrei Elkin2009-11-124-8/+101
* | | | | | Post-push fixes for the bug #42849:Alexey Kopytov2009-12-146-454/+54
|/ / / / /
* | | | | Fix for BUG#49502 - CMake error compiling 5.1 on WindowsSatya B2009-12-141-1/+1
* | | | | Post-merge test fix for bug #42849.Alexey Kopytov2009-12-142-9/+9
* | | | | Mergingunknown2009-12-141-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | This is a patch for Bug#48500unknown2009-12-141-2/+2
* | | | | AutomergeAlexey Kopytov2009-12-1311-25/+743
|\ \ \ \ \
| * | | | | Bug #42849: innodb crash with varying time_zone on partitioned Alexey Kopytov2009-12-1311-25/+743
* | | | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-129-58/+77
* | | | | | Null merge of change in 5.0 to use -D_WIN32_WINNT=0x0500, Windows 2000Kent Boortz2009-12-110-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.eKent Boortz2009-12-111-0/+1
* | | | | | mergeGeorgi Kodinov2009-12-113-1/+20
|\ \ \ \ \ \
| * \ \ \ \ \ Auto-merged fix for bug#49489.Evgeny Potemkin2009-12-113-1/+20
| |\ \ \ \ \ \
| | * | | | | | Bug#49489: Uninitialized cache led to a wrong result.Evgeny Potemkin2009-12-093-1/+20
* | | | | | | | mergeGeorgi Kodinov2009-12-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |