Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge. | Davi Arnaut | 2009-12-18 | 10 | -17/+20 |
|\ | |||||
| * | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 12 | -19/+22 |
* | | Backport to 5.1 branch (next-mr revid: 2921) | Magne Mahre | 2009-12-18 | 1 | -1/+1 |
* | | Merge approved bug fix | Jim Winstead | 2009-12-17 | 3 | -3/+15 |
|\ \ | |||||
| * | | The mysql command line client ignored the --skip-column-names option | Jim Winstead | 2009-09-21 | 3 | -4/+15 |
* | | | Merge with mysql-5.1-bugteam latest changes | Jim Winstead | 2009-12-17 | 20 | -13/+207 |
|\ \ \ | |||||
| * \ \ | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2009-12-17 | 2 | -7/+7 |
| |\ \ \ | |||||
| | * | | | BUG#49638 binlog_index fails in mysql-trunk-merge | Alfranio Correia | 2009-12-16 | 2 | -7/+7 |
| * | | | | merge from 5.0 with bug@49740 fixes | Andrei Elkin | 2009-12-17 | 2 | -0/+4 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug #49740 rpl.rpl_temporary fails in PB2 in mysql-trunk-merge | Andrei Elkin | 2009-12-17 | 2 | -0/+4 |
| * | | | | merge to mysql-5.1-bugteam | Satya B | 2009-12-17 | 3 | -1/+77 |
| |\ \ \ \ | |||||
| | * | | | | Bug#47650: using group by with rollup without indexes | Martin Hansson | 2009-12-17 | 3 | -1/+77 |
| * | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 10 | -4/+80 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 10 | -5/+78 |
| * | | | | Auto-merge. | Ramil Kalimullin | 2009-12-17 | 3 | -1/+39 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix for bug#49465: valgrind warnings and incorrect live checksum... | Ramil Kalimullin | 2009-12-17 | 3 | -1/+39 |
* | | | | | Merge approved bug fix | Jim Winstead | 2009-12-16 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix C99 aliasing violation due to mismatched types that were papered over | Jim Winstead | 2009-11-23 | 1 | -2/+2 |
* | | | | | Bug#47017 rpl_timezone fails on PB-2 with mismatch error | Magne Mahre | 2009-12-16 | 1 | -2/+5 |
| |_|/ / |/| | | | |||||
* | | | | merge | Georgi Kodinov | 2009-12-16 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Bug #48709: Assertion failed in sql_select.cc:11782: | Georgi Kodinov | 2009-12-15 | 3 | -0/+56 |
* | | | | Bug #46827 rpl_circular_for_4_hosts failed on PB2 | unknown | 2009-12-16 | 1 | -19/+2 |
* | | | | Postfix | unknown | 2009-12-16 | 1 | -0/+1 |
* | | | | merge | Georgi Kodinov | 2009-12-15 | 3 | -0/+56 |
|\ \ \ \ | |||||
| * | | | | Bug #48709: Assertion failed in sql_select.cc:11782: | Georgi Kodinov | 2009-12-15 | 3 | -0/+56 |
|/ / / / | |||||
* | | | | merge | Mattias Jonsson | 2009-12-15 | 3 | -10/+30 |
|\ \ \ \ | |||||
| * | | | | Recommit of patch for bug#49028 for 5.1. | Mattias Jonsson | 2009-12-14 | 3 | -10/+30 |
* | | | | | Bug#49134 5.1 server segfaults with 2byte collation file | Alexander Barkov | 2009-12-15 | 2 | -1/+9 |
* | | | | | Bug #48995 abort missing DBUG_RETURN or .. in function "check_key_in_view" | Jon Olav Hauglid | 2009-12-15 | 1 | -1/+1 |
* | | | | | bug#49536 - deadlock on rotate_and_purge when using expire_logs_days | He Zhenxing | 2009-12-15 | 1 | -6/+17 |
* | | | | | Bug #34628 LOAD DATA CONCURRENT INFILE drops CONCURRENT in binary log | unknown | 2009-12-15 | 6 | -31/+193 |
* | | | | | Automerge | Alexey Kopytov | 2009-12-14 | 5 | -7/+101 |
|\ \ \ \ \ | |||||
| * | | | | | correction to the earlier merging: s/return/DBUG_RETURN/ | Andrei Elkin | 2009-12-14 | 1 | -1/+1 |
| * | | | | | merging 5.0-bt -> 5.1-bt to local branch with bug@47210 | Andrei Elkin | 2009-12-14 | 5 | -7/+101 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | merging 5.0-bt to local branch with bug@47210 | Andrei Elkin | 2009-12-14 | 97 | -674/+2626 |
| | |\ \ \ | |||||
| | * | | | | Bug #47210 first execution of "start slave until" stops too early | Andrei Elkin | 2009-11-12 | 4 | -8/+101 |
* | | | | | | Post-push fixes for the bug #42849: | Alexey Kopytov | 2009-12-14 | 6 | -454/+54 |
|/ / / / / | |||||
* | | | | | Fix for BUG#49502 - CMake error compiling 5.1 on Windows | Satya B | 2009-12-14 | 1 | -1/+1 |
* | | | | | Post-merge test fix for bug #42849. | Alexey Kopytov | 2009-12-14 | 2 | -9/+9 |
* | | | | | Merging | unknown | 2009-12-14 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | This is a patch for Bug#48500 | unknown | 2009-12-14 | 1 | -2/+2 |
* | | | | | Automerge | Alexey Kopytov | 2009-12-13 | 11 | -25/+743 |
|\ \ \ \ \ | |||||
| * | | | | | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 11 | -25/+743 |
* | | | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 9 | -58/+77 |
* | | | | | | Null merge of change in 5.0 to use -D_WIN32_WINNT=0x0500, Windows 2000 | Kent Boortz | 2009-12-11 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.e | Kent Boortz | 2009-12-11 | 1 | -0/+1 |
* | | | | | | merge | Georgi Kodinov | 2009-12-11 | 3 | -1/+20 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Auto-merged fix for bug#49489. | Evgeny Potemkin | 2009-12-11 | 3 | -1/+20 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bug#49489: Uninitialized cache led to a wrong result. | Evgeny Potemkin | 2009-12-09 | 3 | -1/+20 |
* | | | | | | | | merge | Georgi Kodinov | 2009-12-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | |