Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-09 | 1 | -13/+53 |
|\ | |||||
| * | Merge of fix for Bug#52357 | Martin Hansson | 2010-05-07 | 1 | -2/+1 |
| |\ | |||||
| | * | Bug#53334 Incorrect result for InnoDB in LEFT JOIN with impossible condition | Sergey Glukhov | 2010-05-07 | 1 | -2/+1 |
| * | | Merge of fix for Bug#52357 | Martin Hansson | 2010-05-06 | 1 | -11/+52 |
| |\ \ | | |/ | |/| | |||||
| | * | Bug#52357: Assertion failed: join->best_read in | Martin Hansson | 2010-05-06 | 1 | -11/+45 |
| | * | Backport of the fix for bug #50335 to 5.0. | Alexey Kopytov | 2010-04-27 | 1 | -3/+5 |
* | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-07 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Automerge. | Alexey Kopytov | 2010-04-30 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | Bug #48419: another explain crash.. | Alexey Kopytov | 2010-04-30 | 1 | -2/+1 |
* | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-04-27 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Bug#51980 mysqld service crashes with a simple COUNT(DISTINCT) query over a view | unknown | 2010-04-13 | 1 | -1/+1 |
* | | | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -2/+19 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -2/+19 |
* | | | | | Automerge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-04-11 | 1 | -5/+5 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select... | Sergey Glukhov | 2010-04-05 | 1 | -5/+5 |
| | |/ / | |/| | | |||||
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2010-03-26 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#52177 crash with explain, row comparison, join, text field | Sergey Glukhov | 2010-03-26 | 1 | -1/+1 |
* | | | | Automerge. | Alexey Kopytov | 2010-04-02 | 1 | -1/+12 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2010-03-24 | 1 | -1/+12 |
| |\ \ | | |/ | |||||
| | * | Bug#48483 crash in get_best_combination() | Sergey Glukhov | 2010-03-24 | 1 | -1/+12 |
* | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -96/+197 |
|\ \ \ | |||||
| * \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-03-01 | 1 | -12/+23 |
| |\ \ \ | |||||
| * \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -98/+164 |
| |\ \ \ \ | |||||
| * | | | | | Bug#43201 : Stack overrun when running sp-error test. | Vladislav Vaintroub | 2010-02-23 | 1 | -2/+0 |
| * | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -1/+7 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Auto-merged fix for the bug#50539. | Evgeny Potemkin | 2010-02-12 | 1 | -0/+6 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-05 | 1 | -10/+25 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | fixes for gcc 4.4.1 warnings | Guilhem Bichot | 2010-01-25 | 1 | -1/+1 |
| * | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -10/+25 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-03 | 1 | -9/+9 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-28 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -28/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merging with mysql.5.1-rep+2 | Mats Kindahl | 2009-12-18 | 1 | -109/+89 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -109/+89 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-18 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | WL#5151: Conversion between different types | Mats Kindahl | 2009-12-18 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -0/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch" | Guilhem Bichot | 2010-01-06 | 1 | -2/+4 |
| | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -28/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -28/+20 |
| | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -3/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / |