Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -5/+5 |
|\ | |||||
| * | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -5/+5 |
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
| * | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2010-06-17 | 1 | -10/+0 |
| |\ | |||||
| | * | BUG#53560 CREATE TEMP./DROP TEMP. are not binglogged correctly after a failed... | Alfranio Correia | 2010-05-19 | 1 | -10/+0 |
* | | | BUG 53893: Automerged from mysql-5.1-bugteam-gca into mysql-trunk-merge. | Luis Soares | 2010-06-04 | 1 | -6/+3 |
|\ \ \ | |/ / | |||||
| * | | BUG#53893: RBR: nullable unique key can lead to out-of-sync slave | Luis Soares | 2010-06-04 | 1 | -6/+3 |
* | | | BUG 53893: automerged from mysql-5.1-bugteam into mysql-trunk-merge. | Luis Soares | 2010-06-03 | 1 | -2/+32 |
|\ \ \ | |/ / | |||||
| * | | BUG#53893: RBR: nullable unique key can lead to out-of-sync slave | Luis Soares | 2010-06-02 | 1 | -2/+32 |
* | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-24 | 1 | -8/+28 |
|\ \ \ | |/ / | |||||
| * | | BUG#52868: Wrong handling of NULL value during update, replication out | Luis Soares | 2010-04-21 | 1 | -8/+28 |
| |/ | |||||
* | | BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a | Alfranio Correia | 2010-04-20 | 1 | -10/+0 |
* | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+11 |
* | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -131/+70 |
|\ \ | |||||
| * | | A review comment for the fix for Bug#46672. | Konstantin Osipov | 2010-03-13 | 1 | -71/+20 |
| * | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-03-02 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -1/+1 |
| | |\ \ | |||||
| * | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-24 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -21/+29 |
| |\ \ \ | |||||
| | * \ \ | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -14/+14 |
| | |\ \ \ | |||||
| | * \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -21/+32 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -17/+14 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -53/+77 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -5/+4 |
| | | | * | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -57/+2 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -12/+9 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -8/+5 |
| | | | |/ / / / / / | |||||
| | | * | | | | | | | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -4/+18 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -4/+18 |
| | | * | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -54/+77 |
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | / / / / | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| * | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -3/+12 |
| * | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -15/+15 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -15/+15 |
| | |/ / / / / / / | |||||
| | * | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -3/+12 |
| * | | | | | | | | Implementation of simple deadlock detection for metadata locks. | Dmitry Lenev | 2009-12-30 | 1 | -1/+1 |
| * | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -1/+1 |
| * | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -1/+2 |
| * | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-30 | 1 | -1/+2 |
| * | | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -28/+8 |
| |/ / / / / / / | |||||
* | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-20 | 1 | -36/+36 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -37/+37 |
* | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Bug #43414 Parenthesis (and other) warnings compiling | Staale Smedseng | 2010-02-22 | 1 | -1/+1 |
* | | | | | | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -3/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -3/+12 |
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -38/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix for BUG#49481 and BUG#49482 reverted. | Luis Soares | 2010-01-19 | 1 | -38/+1 |
* | | | | | | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-15 | 1 | -1/+38 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | |