Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Vladislav Vaintroub | 2009-12-21 | 6 | -35/+140 |
|\ | |||||
| * | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-19 | 55 | -966/+1573 |
| |\ | |||||
| * \ | merge | Vladislav Vaintroub | 2009-12-18 | 5 | -1/+56 |
| |\ \ | |||||
| | * | | BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column... | Mikael Ronstrom | 2009-12-17 | 5 | -1/+56 |
| | * | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 48 | -846/+1581 |
| | |\ \ | |||||
| | * \ \ | merge (and including the fix for bug#48939 since that was not included in mys... | Mattias Jonsson | 2009-12-15 | 1 | -2/+2 |
| | |\ \ \ | |||||
| * | | | | | Backport of fix for bug#35020 | Martin Hansson | 2009-12-17 | 1 | -34/+84 |
* | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 34 | -402/+801 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 25 | -505/+629 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 5 | -3/+40 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Manual merge from mysql-5.1-bugteam. Re-enabled binlog.binlog_index. | Alexey Kopytov | 2009-12-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2009-12-17 | 1 | -6/+6 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | BUG#49638 binlog_index fails in mysql-trunk-merge | Alfranio Correia | 2009-12-16 | 1 | -6/+6 |
| | * | | | | | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 4 | -2/+39 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | merge to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+13 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Bug#47650: using group by with rollup without indexes | Martin Hansson | 2009-12-17 | 1 | -1/+13 |
| | | * | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 2 | -0/+16 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 2 | -1/+18 |
| | | * | | | | | | | | Auto-merge. | Ramil Kalimullin | 2009-12-17 | 1 | -1/+10 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | / / / / / / | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | | * | | | | | | Fix for bug#49465: valgrind warnings and incorrect live checksum... | Ramil Kalimullin | 2009-12-17 | 1 | -1/+10 |
| | | | * | | | | | | Bug #48709: Assertion failed in sql_select.cc:11782: | Georgi Kodinov | 2009-12-15 | 1 | -0/+5 |
| * | | | | | | | | | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 12 | -59/+143 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-12-16 | 2 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fix for bug#49517: Inconsistent behavior while using | Ramil Kalimullin | 2009-12-15 | 2 | -3/+3 |
| | | * | | | | | | | | | Bug #48985: show create table crashes if previous access to the table | Georgi Kodinov | 2009-12-15 | 1 | -1/+1 |
| | | * | | | | | | | | | Bug#49489: Uninitialized cache led to a wrong result. | Georgi Kodinov | 2009-12-15 | 1 | -1/+1 |
| | | * | | | | | | | | | Bug #49480: WHERE using YEAR columns returns unexpected results | Georgi Kodinov | 2009-12-15 | 2 | -102/+51 |
| * | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 32 | -398/+760 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 18 | -101/+239 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Bug #48709: Assertion failed in sql_select.cc:11782: | Georgi Kodinov | 2009-12-15 | 1 | -0/+5 |
| | | * | | | | | | | | 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 | 2009-12-15 | 2 | -1/+5 | |
| | | * | | | | | | | | 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 | 3 | -7/+9 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | |||||
| | | | * | | | | | | | merging 5.0-bt to local branch with bug@47210 | Andrei Elkin | 2009-12-14 | 20 | -247/+602 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Bug #47210 first execution of "start slave until" stops too early | Andrei Elkin | 2009-11-12 | 2 | -7/+9 |
| | | * | | | | | | | | | Merging | lars-erik.bjork@sun.com | 2009-12-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | This is a patch for Bug#48500 | lars-erik.bjork@sun.com | 2009-12-14 | 1 | -2/+2 |
| | | | * | | | | | | | | merge | Georgi Kodinov | 2009-12-11 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | * | \ \ \ \ \ \ \ \ | Automerge | Alexey Kopytov | 2009-12-13 | 7 | -12/+78 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 7 | -12/+78 |
| | | * | | | | | | | | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 1 | -1/+0 |
| | | * | | | | | | | | | | | merge | Georgi Kodinov | 2009-12-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | merge | Georgi Kodinov | 2009-12-11 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | merge of bug #49250 to 5.1-bugteam | Georgi Kodinov | 2009-12-11 | 1 | -72/+125 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | Bug #49250 : spatial btree index corruption and crash | Georgi Kodinov | 2009-12-10 | 1 | -41/+65 |
| | * | | | | | | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 2 | -14/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 19 | -297/+522 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |