Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-02-03 | 1 | -127/+0 |
| | |\ | |||||
| | | * | Revert a patch for Bug#48231, which introduced valgrind warnings. | Alexander Nozdrin | 2010-02-02 | 1 | -127/+0 |
| | * | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 2 | -0/+213 |
| | |\ \ | | | |/ | |||||
| * | | | 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 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; | unknown | 2010-01-30 | 1 | -0/+127 |
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -0/+86 |
| |\ \ \ | | |/ / | |||||
| | * | | automerge: mysql-5.1-bugteam branch --> mysql-5.1-bugteam latest | Luis Soares | 2010-01-26 | 1 | -0/+86 |
| | |\ \ | |||||
| | | * | | BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: | Luis Soares | 2010-01-21 | 1 | -0/+86 |
| * | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+159 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Auto-merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+159 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #49132 Replication failure on temporary table + DDL | unknown | 2010-01-22 | 1 | -0/+159 |
| | * | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -0/+554 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | BUG#46364 MyISAM transbuffer problems (NTM problem) | Alfranio Correia | 2010-01-20 | 1 | -0/+554 |
| | | |/ | |||||
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 2 | -0/+20 |
| |\ \ \ | | |/ / | |||||
| | * | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-15 | 2 | -0/+20 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#49222: Mark RAND() as unsafe | Sven Sandberg | 2010-01-13 | 1 | -0/+6 |
| | | * | merge: 5.1-bugteam bug branch --> 5.1 bugteam latest. | Luis Soares | 2010-01-07 | 1 | -0/+14 |
| | | |\ | |||||
| | | | * | BUG#49479: Slave stops with syntax error: LOAD DATA event without | Luis Soares | 2009-12-06 | 1 | -0/+14 |
* | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 22 | -495/+5017 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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 | 22 | -495/+4808 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | 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 | 19 | -478/+3974 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | 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 | 9 | -45/+91 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | * | | | | | | | 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 | 2 | -15/+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 | 7 | -24/+290 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 14 | -472/+3109 |
| | | * | | | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 8 | -44/+549 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | 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 |