| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+1 |
| |\ | |||||
| | * | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -0/+14 |
| | |\ | |||||
| | | * | merge | Mattias Jonsson | 2010-02-16 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | Manual merge (moved the check for log_table before name lock) | Mattias Jonsson | 2010-02-12 | 1 | -0/+1 |
| | | | |\ | |||||
| | | | | * | Bug#42438: Crash ha_partition::change_table_ptr | Mattias Jonsson | 2010-02-01 | 1 | -0/+1 |
| | | * | | | Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing... | Davi Arnaut | 2010-01-27 | 1 | -0/+13 |
| | | |/ / | |||||
| | * | | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -5/+13 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -5/+13 |
| * | | | | Bug #48315 Metadata lock is not taken for merged views that use | Jon Olav Hauglid | 2010-02-18 | 1 | -3/+12 |
| * | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -4/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Manual merge from mysql-next-mr bug branch. | Luis Soares | 2010-02-10 | 1 | -3/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mr | Luis Soares | 2010-02-10 | 1 | -3/+0 |
| | * | | | | | Bug #50192 Strange effect in replication test, trigger, auto_increment | Andrei Elkin | 2010-01-29 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Bug #45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-11 | 1 | -8/+35 |
| * | | | | | Fix for bug #50913 "Deadlock between open_and_lock_tables_derived | Dmitry Lenev | 2010-02-08 | 1 | -2/+2 |
| * | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -170/+8 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-21 | 1 | -170/+8 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -34/+34 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -9/+9 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -167/+8 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -167/+8 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -3/+3 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -32/+25 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -2/+2 |
| | | | | * | | | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -157/+6 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | Post-push fix for BUG#39934 | Sven Sandberg | 2009-07-22 | 1 | -298/+0 |
| | | | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -16/+43 |
| | | | | | * | | | | | | | | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -82/+202 |
| | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -82/+202 |
| | | | * | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -1/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | / | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -5/+13 |
| * | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | backported: | Sergey Glukhov | 2010-01-15 | 1 | -5/+1 |
| | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Bug #50786 Assertion `thd->mdl_context.trans_sentinel() == __null' | Jon Olav Hauglid | 2010-02-03 | 1 | -4/+0 |
| * | | | | | | | | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -22/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -35/+38 |
| | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -11/+11 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -78/+78 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 1 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Auto-merged. | Evgeny Potemkin | 2009-12-02 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | |||||
| | | | | * | | | | | | | | Bug#48508: Crash on prepared statement re-execution. | Evgeny Potemkin | 2009-12-01 | 1 | -1/+2 |
| * | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -77/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc | Marc Alff | 2009-12-17 | 1 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-12-16 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -17/+14 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge WL#5137 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -2/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |