Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Vladislav Vaintroub | 2010-01-18 | 1 | -43/+123 |
|\ | |||||
| * | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -12/+6 |
| |\ | |||||
| * \ | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -48/+23 |
| |\ \ | |||||
| * \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -43/+127 |
| |\ \ \ | |||||
| | * \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -44/+122 |
| | |\ \ \ | |||||
| | | * \ \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -2/+11 |
| | | |\ \ \ | |||||
| | | * \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -2/+58 |
| | | |\ \ \ \ | |||||
| | | * | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -6/+29 |
| | | * | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -21/+7 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-10-14 | 1 | -26/+5 |
| | | * | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -38/+114 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -22/+72 |
| | | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -33/+59 |
| | * | | | | | | | | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | | * | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -0/+6 |
| | * | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -2/+11 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -2/+58 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | / / / | | | |_|_|_|/ / / | | |/| | | | | | | |||||
* | | | | | | | | | merge | Vladislav Vaintroub | 2010-01-11 | 1 | -12/+6 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -12/+6 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | merge | Vladislav Vaintroub | 2009-12-25 | 1 | -41/+20 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -41/+20 |
| |/ / / / / / | |||||
* | | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -8/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Auto-merged. | Evgeny Potemkin | 2009-12-02 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | Bug#48508: Crash on prepared statement re-execution. | Evgeny Potemkin | 2009-12-01 | 1 | -0/+2 |
* | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 1 | -9/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc | Marc Alff | 2009-12-17 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -36/+7 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | * | | | | | | | | | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -11/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | WL#5138, Fixed according to code review comments from Davi | Mikael Ronstrom | 2009-11-24 | 1 | -1/+4 |
| * | | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 1 | -35/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -8/+8 |
* | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-11 | 1 | -35/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-10 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-03 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -11/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Auto merge | He Zhenxing | 2009-11-21 | 1 | -36/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -2/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | merge of Bug#33204 (backport) | Martin Hansson | 2009-11-20 | 1 | -62/+81 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Backport of Bug#33204 from mysql-pe to | Martin Hansson | 2009-11-10 | 1 | -34/+0 |
| * | | | | | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -1/+1 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-10 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -0/+6 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-04 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0. | Alexander Nozdrin | 2009-11-25 | 1 | -1/+0 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-11-25 | 1 | -11/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -10/+0 |