| Commit message (Expand) | Author | Age | Files | Lines |
* | Clean-up, give better names, add comments to | Konstantin Osipov | 2010-05-06 | 1 | -3/+22 |
* | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-04-20 | 1 | -1/+12 |
|\ |
|
| * | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+12 |
* | | Fix assorted compiler warnings. | Davi Arnaut | 2010-03-16 | 1 | -1/+2 |
|/ |
|
* | merge | Vladislav Vaintroub | 2010-02-16 | 1 | -72/+20 |
|\ |
|
| * | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -6/+30 |
| |\ |
|
| * \ | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -16/+22 |
| |\ \ |
|
| * \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -12/+1 |
| |\ \ \ |
|
| * | | | | Implement new type-of-operation-aware metadata locks. | Dmitry Lenev | 2010-02-01 | 1 | -2/+2 |
| * | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -53/+13 |
| * | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2009-12-03 | 1 | -30/+0 |
| |\ \ \ \ |
|
| * | | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -9/+4 |
| * | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -8/+1 |
* | | | | | | In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windows | Vladislav Vaintroub | 2010-01-18 | 1 | -5/+5 |
| |_|_|_|/
|/| | | | |
|
* | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -16/+22 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -16/+22 |
| | |_|/
| |/| | |
|
* | | | | Manual merge from next-mr. | unknown | 2010-01-12 | 1 | -12/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -12/+1 |
| | |/
| |/| |
|
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -6/+30 |
|\ \ \
| |/ /
|/| | |
|
| * | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -31/+2 |
| |\ \ |
|
| * \ \ | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade... | Andrei Elkin | 2009-11-10 | 1 | -8/+34 |
| |\ \ \ |
|
| * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -4/+28 |
| * | | | | Manual merge 5.1-rep+2 to 5.1-rep+3 | He Zhenxing | 2009-10-18 | 1 | -1/+29 |
| |\ \ \ \ |
|
| * \ \ \ \ | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -2/+2 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -2/+2 |
| | |\ \ \ \ \ |
|
| | | * | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -2/+2 |
* | | | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -30/+0 |
|\ \ \ \ \ \ \ \
| | |_|_|_|_|/ /
| |/| | | | | /
| |_|_|_|_|_|/
|/| | | | | | |
|
| * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -1/+2 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -30/+0 |
| |\ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| | * | | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -30/+0 |
| | | |_|_|_|/
| | |/| | | | |
|
| * | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -8/+34 |
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -3/+3 |
* | | | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -12/+9 |
* | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+2 |
|\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+2 |
| |\ \ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | | |
|
| | * | | | | | | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null() | Sergey Vojtovich | 2009-10-28 | 1 | -1/+2 |
| | | |/ / / /
| | |/| | | | |
|
* | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -1/+29 |
|\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -1/+29 |
| |\ \ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | | |
|
| | * | | | | | | Manual merge semi-sync to 5.1-rep+2 | He Zhenxing | 2009-10-03 | 1 | -0/+12 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Backporting WL#4398 WL#1720 | He Zhenxing | 2009-09-26 | 1 | -0/+12 |
| | | | |_|/ / /
| | | |/| | | | |
|
| | * | | | | | | Backport BUG#41013 main.bootstrap coredumps in 6.0-rpl | He Zhenxing | 2009-10-02 | 1 | -1/+8 |
| | * | | | | | | Bug #47645: Segmentation fault when out of memory during handlerton initializ... | Mats Kindahl | 2009-09-25 | 1 | -0/+9 |
| | |/ / / / / |
|
* | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -37/+42 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 1 | -29/+38 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -29/+38 |
| * | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -8/+4 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | / / / /
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 1 | -8/+4 |
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -8/+4 |
* | | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -2/+2 |
* | | | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -4/+4 |
|/ / / / / / |
|