Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-04-27 | 1 | -14/+13 |
|\ | |||||
| * | BUG#53075 SBR: Strange warning around CONNECTION_ID | Alfranio Correia | 2010-04-26 | 1 | -2/+2 |
| * | BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a | Alfranio Correia | 2010-04-20 | 1 | -12/+11 |
| * | Automerge: merged bug bundle from bug report into latest | Luis Soares | 2010-04-16 | 1 | -2/+2 |
| |\ | |||||
| | * | BUG#52202: mysqlbinlog_row* fail in daily-trunk on Sol10 x86_64 | Luis Soares | 2010-03-25 | 1 | -2/+2 |
* | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -2/+14 |
|\ \ \ | |/ / | |||||
| * | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -2/+14 |
* | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -4/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bug #50407 mysqlbinlog --database=X produces bad output for SAVEPOINTs | 2010-03-28 | 1 | -4/+1 | |
* | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -183/+335 |
|\ \ \ | | |/ | |/| | |||||
| * | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-03-02 | 1 | -1/+13 |
| |\ \ | |||||
| | * \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -1/+13 |
| | |\ \ | |||||
| * | | | | Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHE | Jon Olav Hauglid | 2010-02-26 | 1 | -0/+1 |
| * | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-24 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -8/+36 |
| |\ \ \ | |||||
| | * \ \ | Auto-merge from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2010-02-12 | 1 | -4/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with | 2010-02-12 | 1 | -4/+1 | |
| | | |\ \ \ | |||||
| | * | \ \ \ | auto merge from mysql-5.1-rep+3. | Luis Soares | 2010-02-09 | 1 | -5/+35 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Auto Merge from 5.1-rep+2 | 2010-01-20 | 1 | -38/+59 | |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | BUG#49562: SBR out of sync when using numeric data types + user | Luis Soares | 2010-01-18 | 1 | -1/+1 |
| | | * | | | | | | BUG#49562: SBR out of sync when using numeric data types + user | Luis Soares | 2010-01-15 | 1 | -5/+35 |
| | * | | | | | | | Automerge from mysql-next-mr. | Luis Soares | 2010-02-09 | 1 | -8/+50 |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | * | | | | | | | Automerge from bug branch. | Luis Soares | 2010-01-26 | 1 | -3/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | BUG#50474: rpl_slave_load_remove_tmpfile failed on windows debug | Luis Soares | 2010-01-21 | 1 | -3/+1 |
| * | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -8/+50 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -4/+35 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-27 | 1 | -38/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -5/+53 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -61/+185 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -46/+59 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Manual merge from next-mr. | 2010-01-12 | 1 | -39/+31 | |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -61/+185 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -23/+126 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -8/+8 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -47/+70 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -12/+101 |
| | | | * | | | | | | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -38/+73 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -12/+25 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -9/+22 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -9/+22 |
| | | * | | | | | | | | | | | | | | | Merging with mysql-5.1-rpl+2 | Mats Kindahl | 2009-12-16 | 1 | -30/+34 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | WL#5151: Conversion between different types when | Mats Kindahl | 2009-12-16 | 1 | -30/+34 |
| | | * | | | | | | | | | | | | | | | | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -8/+25 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | BUG#49618: Field length stored incorrectly in binary log | Mats Kindahl | 2009-12-15 | 1 | -4/+6 |
| | | | * | | | | | | | | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -4/+19 |
| | | * | | | | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -8/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -47/+69 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | / / / / / / / / / | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | Fix a failure of rpl_cross_version, caused by hand-initalization | Konstantin Osipov | 2010-02-03 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -46/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |