Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing.merge | Alfranio Correia | 2010-06-01 | 1 | -2/+2 |
|\ | |||||
| * | BUG#53437 @@session.sql_bin_log support in substatements is incorrect | Alfranio Correia | 2010-05-27 | 1 | -2/+2 |
* | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-05-28 | 1 | -6/+63 |
|\ \ | |/ |/| | |||||
| * | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-11 | 1 | -6/+63 |
| |\ | |||||
| | * | merge | Mattias Jonsson | 2010-05-10 | 1 | -11/+28 |
| | |\ | |||||
| | | * | Additional fix for DEBUG_SYNC which failed for some rpl-tests, | Mattias Jonsson | 2010-03-18 | 1 | -1/+6 |
| | | * | Bug#50561: ALTER PARTITIONS does not have adequate lock, breaks with | Mattias Jonsson | 2010-03-17 | 1 | -11/+23 |
| | * | | BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in... | Alfranio Correia | 2010-05-09 | 1 | -0/+10 |
| | |/ | |||||
* | | | Follow-up for the fix for bug #46947 "Embedded SELECT without | Dmitry Lenev | 2010-05-21 | 1 | -20/+47 |
* | | | Clean-up, give better names, add comments to | Konstantin Osipov | 2010-05-06 | 1 | -2/+2 |
* | | | Committing on behalf or Dmitry Lenev: | Konstantin Osipov | 2010-04-28 | 1 | -10/+22 |
|/ / | |||||
* | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-04-20 | 1 | -1/+27 |
|\ \ | |||||
| * | | WL#5030: Splitting mysql_priv.h | Mats Kindahl | 2010-04-07 | 1 | -0/+1 |
| * | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+23 |
| * | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -3166/+3038 |
| |\ \ | |||||
| * \ \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-12 | 1 | -0/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Automerge BUG 51226 bzr bundle from bug report --> myqsl-5.1-bugteam. | Luis Soares | 2010-03-08 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * | | BUG#51226: mysqlbinlog replay: ERROR 1146 when using temp tables | Luis Soares | 2010-03-03 | 1 | -0/+3 |
* | | | | | Fix assorted compiler warnings. | Davi Arnaut | 2010-03-16 | 1 | -0/+2 |
| |_|_|/ |/| | | | |||||
* | | | | A post-review fix for type-aware metadata locks. | Konstantin Osipov | 2010-03-16 | 1 | -80/+67 |
|\ \ \ \ | |||||
| * | | | | A review comment for the fix for Bug#46672. | Konstantin Osipov | 2010-03-13 | 1 | -62/+59 |
|/ / / / | |||||
* | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-03-02 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | manual merge fix of bug#42438 in mysql-next-mr-merge | Mattias Jonsson | 2010-03-02 | 1 | -0/+2 |
| * | | | | 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 #51240 ALTER TABLE of a locked MERGE table fails | Jon Olav Hauglid | 2010-02-26 | 1 | -24/+84 |
* | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-24 | 1 | -34/+31 |
|/ / / / | |||||
* | | | | 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. | 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 |
| | | | |\ \ \ \ \ \ \ \ |