Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a | Alfranio Correia | 2010-04-20 | 4 | -31/+28 |
* | auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing | Alfranio Correia | 2010-04-19 | 1 | -1/+1 |
|\ | |||||
| * | auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing | Alfranio Correia | 2010-03-31 | 1 | -1/+1 |
| |\ | |||||
| | * | BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_... | Alfranio Correia | 2010-03-31 | 1 | -1/+1 |
* | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 31 | -849/+4528 |
|\ \ \ | |/ / | |||||
| * | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+13 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 7 | -51/+298 |
| |\ \ | |||||
| | * \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-03 | 1 | -127/+0 |
| | |\ \ | |||||
| | * | | | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2010-02-02 | 3 | -51/+33 |
| | * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -0/+127 |
| | |\ \ \ | |||||
| | * \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -0/+86 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+159 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 2 | -0/+20 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 25 | -806/+5032 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -3/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -1/+145 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | BUG#49836: Replication of geometric fields is broken after WL#5151 | Luis Soares | 2009-12-24 | 1 | -1/+138 |
| | | * | | | | | | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-23 | 1 | -0/+7 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-21 | 1 | -0/+7 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-21 | 1 | -0/+7 |
| | * | | | | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 25 | -806/+4823 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-21 | 1 | -0/+28 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | Merging with mysql.5.1-rep+2 | Mats Kindahl | 2009-12-18 | 1 | -17/+16 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-18 | 1 | -0/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | | | |||||
| | | | | * | | | | | | | | | WL#5151: Conversion between different types | Mats Kindahl | 2009-12-18 | 1 | -0/+28 |
| | | * | | | | | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 21 | -789/+3987 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Post-push fixes after wrong merge from 5.1->rep+2->rep+3. | Sven Sandberg | 2009-12-14 | 1 | -11/+11 |
| | | | * | | | | | | | | | | merging 5.1->rep+2->rep+3 | Andrei Elkin | 2009-12-02 | 1 | -0/+8 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 10 | -45/+101 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | Post-fix for WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-13 | 2 | -10/+299 |
| | | | * | | | | | | | | | | | Post-fix after mysql-5.1-rep+2 --> mysql-5.1-rep+3. | Alfranio Correia | 2009-11-11 | 3 | -315/+178 |
| | | | * | | | | | | | | | | | Post-fix for merge mysql-5.1-rep+2 --> mysql-5.1-rep+3 | Alfranio Correia | 2009-11-11 | 1 | -14/+8 |
| | | | * | | | | | | | | | | | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 10 | -35/+675 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 15 | -483/+3122 |
| | | | * | | | | | | | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 11 | -48/+581 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 4 | -5/+412 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 2 | -18/+54 |
| | | | | * | | | | | | | | | | | | | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 4 | -9/+380 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 4 | -9/+380 |
| | | * | | | | | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -17/+16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 4 | -11/+797 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | / / / / / / / / | | | | | |_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 4 | -11/+797 |
| * | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -3/+1 |
| | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -21/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -21/+39 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -17/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -17/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 7 | -40/+27 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / |