| Commit message (Expand) | Author | Age | Files | Lines |
* | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -53/+13 |
* | Merge next-mr -> next-4284 | Konstantin Osipov | 2009-12-03 | 1 | -30/+0 |
|\ |
|
| * | 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-12-01 | 1 | -9/+4 |
* | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -8/+1 |
|/ / / / |
|
* | | | | 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 |
|/ / / / |
|
* | | | | Merge to mysql-next-mr | Mikael Ronstrom | 2009-09-28 | 1 | -12/+47 |
|\ \ \ \ |
|
| * \ \ \ | Merge mysql-next-mr --> mysql-trunk-signal | Marc Alff | 2009-09-17 | 1 | -0/+30 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2009-09-16 | 1 | -0/+30 |
| | |\ \ \
| | | |/ / |
|
| | | * | | BUG#45638 - Create temporary table with engine innodb fails | Sergey Vojtovich | 2009-09-09 | 1 | -0/+30 |
| | | |/ |
|
| * | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -12/+17 |
| |/ / |
|
* | | | WL#4444 Added TRUNCATE partition support, fixes bug#19405 and bug #35111 | Mikael Ronstrom | 2009-09-10 | 1 | -0/+3 |
|/ / |
|
* | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 1 | -5/+28 |
|\ \
| |/ |
|
| * | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,... | Guilhem Bichot | 2009-07-29 | 1 | -1/+3 |
| * | merging with mysql-5.1-bugteam branch | Satya B | 2009-07-27 | 1 | -4/+21 |
| |\ |
|
| | * | Bug#30102: Rename table does corrupt tables with partition files on failure | Anurag Shekhar | 2009-07-24 | 1 | -4/+21 |
| * | | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-07-24 | 1 | -0/+4 |
| |\ \
| | |/
| |/| |
|
| | * | Fix for BUG#18828 - If InnoDB runs out of undo slots, | Satya B | 2009-07-17 | 1 | -0/+4 |
* | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 1 | -26/+35 |
|\ \ \
| |/ / |
|
| * | | Bug#45548: XA transaction without access to InnoDB tables crashes the server | Davi Arnaut | 2009-06-25 | 1 | -2/+3 |
| * | | Bug#44834 strxnmov is expected to behave as you'd expect | Sergey Glukhov | 2009-06-19 | 1 | -4/+4 |
| | | | |
| | \ | |
| *-. \ | Merge from 5.0-bugteam for 43414 | Staale Smedseng | 2009-06-09 | 1 | -2/+2 |
| |\ \ \
| | | |/ |
|
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -2/+2 |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -2/+2 |
| | |/ |
|
| * | | Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null() | Davi Arnaut | 2009-06-05 | 1 | -20/+28 |
* | | | Merge MySQL 5.1.35 into MySQL 5.4 | Mikael Ronstrom | 2009-06-11 | 1 | -18/+35 |
|\ \ \
| |/ / |
|
| * | | Merge | Ramil Kalimullin | 2009-03-27 | 1 | -3/+13 |
| |\ \
| | |/ |
|
| | * | Fix for bug #26288: savepoint not deleted, comit on empty transaction | Ramil Kalimullin | 2009-03-27 | 1 | -3/+13 |