Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 5 | -6358/+155 |
|\ | |||||
| * | Manual merge. | Alexey Kopytov | 2010-03-19 | 1 | -0/+3 |
| |\ | |||||
| | * | Bug #8433: Overflow must be an error | Alexey Kopytov | 2010-03-18 | 1 | -0/+3 |
| * | | A review comment for the fix for Bug#46672. | Konstantin Osipov | 2010-03-13 | 1 | -0/+3 |
| * | | A follow-up on WL#5154 and WL#5182: remove forgotten options. | Alexander Nozdrin | 2010-03-03 | 1 | -24/+24 |
| * | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-03-01 | 1 | -5/+5 |
| |\ \ | |||||
| * | | | Some CMake packaging fixes: | Jonathan Perkin | 2010-02-24 | 1 | -1/+3 |
| * | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-22 | 2 | -2/+55 |
| |\ \ \ | |||||
| | * \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-21 | 1 | -0/+2 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | merge | Vladislav Vaintroub | 2010-02-16 | 1 | -0/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | merge | Vladislav Vaintroub | 2010-02-13 | 1 | -2/+5 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merge | Vladislav Vaintroub | 2010-02-06 | 3 | -6372/+9 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Handle different installation layouts. | Vladislav Vaintroub | 2010-01-24 | 1 | -3/+3 |
| | * | | | | | | merge | Vladislav Vaintroub | 2010-01-22 | 1 | -2/+0 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-18 | 2 | -4/+85 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-13 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-11 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-25 | 2 | -7/+19 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-19 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-16 | 1 | -2/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-02 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-11-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | WL#5161 : Cross-platform build with CMake | Vladislav Vaintroub | 2009-11-09 | 2 | -2/+55 |
| * | | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 1 | -0/+2 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-20 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -2/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 3 | -6374/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | next-mr -> next-4284 merge: | Konstantin Osipov | 2010-02-05 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 2 | -4/+83 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 2 | -8/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -2/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-09 | 2 | -2/+5 |
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-02-17 | 1 | -3/+1 |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | merge from mysql-trunk-bugfixing | Magne Mahre | 2010-02-11 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-05 | 2 | -6373/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Remove errmsg.txt and errmsg-cnv.sh. Use errmsg-utf8.txt instead. | Alexander Nozdrin | 2010-02-05 | 2 | -6373/+0 |
| * | | | | | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-05 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2010-02-02 | 2 | -0/+9 |
| | * | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 2 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Bug #50192 Strange effect in replication test, trigger, auto_increment | Andrei Elkin | 2010-01-29 | 2 | -4/+4 |
| * | | | | | | | | | | | | | | Backport from mysql-6.0-codebase of: | Jon Olav Hauglid | 2010-01-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | BUG#46364 MyISAM transbuffer problems (NTM problem) | Alfranio Correia | 2010-01-21 | 2 | -0/+9 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDS | Luis Soares | 2010-01-20 | 1 | -2/+0 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix for perfschema.binlog_stmt failure: | unknown | 2010-01-15 | 2 | -2/+2 |
| * | | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-11 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |