Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | 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 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for BUG#49481 and BUG#49482. | Luis Soares | 2010-01-14 | 1 | -1/+38 |
* | | | | 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. | 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 from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Bug#46640: output from mysqlbinlog command in 5.1 breaks replication | 2009-10-23 | 1 | -1/+1 | |
| | |/ / | |/| | | |||||
* | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -30/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | backporting fixes of bug@45940 to 5.1-rpl+2 to cover failures rpl_heartbeat_*... | Andrei Elkin | 2009-10-09 | 1 | -57/+2 |
| | |/ | |/| | |||||
* | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 1 | -54/+50 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bug#46640: output from mysqlbinlog command in 5.1 breaks replication | 2009-10-14 | 1 | -54/+50 | |
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -3/+3 |
| |/ | |||||
* | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -6/+6 |
|/ | |||||
* | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -2/+2 |
* | Bug #40004 Replication failure with no PK + no indexes | Mats Kindahl | 2008-10-20 | 1 | -7/+40 |
* | BUG#36197: flush tables (or little table cache) can cause crash on slave | mats@mats-laptop.(none) | 2008-05-12 | 1 | -67/+32 |
* | Bug#34655 Compile error | davi@mysql.com/endora.local | 2008-02-28 | 1 | -11/+11 |
* | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl | mkindahl@dl145h.mysql.com | 2008-02-05 | 1 | -2/+2 |
|\ | |||||
| * | Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAU... | aelkin/elkin@koti.dsl.inet.fi | 2008-01-31 | 1 | -2/+2 |
* | | Post-merge fixes to make tests pass. | mats@capulet.kindahl.net | 2008-01-09 | 1 | -16/+17 |
* | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl | mkindahl@dl145h.mysql.com | 2007-12-19 | 1 | -11/+1700 |
|\ \ | |/ |