Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -1/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -2/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -109/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -109/+89 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-16 | 1 | -0/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Bug#33546: Slowdown on re-evaluation of constant expressions. | Evgeny Potemkin | 2009-12-02 | 1 | -0/+39 |
| | * | | | | | | | | | | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -5/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -51/+103 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 1 | -88/+246 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | Bug#41371 Select returns 1 row with condition "col is not null and col i... | Alexey Botchkov | 2009-11-03 | 1 | -51/+103 |
| * | | | | | | | | | | | | | | | | | | | Bug#46374 crash, INSERT INTO t1 uses function, function modifies t1 | Magne Mahre | 2009-12-10 | 1 | -0/+7 |
| * | | | | | | | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -2/+2 |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -5/+5 |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -5/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -5/+3 |
* | | | | | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-20 | 1 | -7/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Bug#51242 HAVING clause on table join produce incorrect results | Sergey Glukhov | 2010-03-19 | 1 | -0/+25 |
| * | | | | | | | | | | | | | | | | | | Bug#51494 crash with join, explain and 'sounds like' operator | Sergey Glukhov | 2010-03-19 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -6/+6 |
* | | | | | | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-12 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |