Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with next-4284. | Konstantin Osipov | 2009-12-10 | 1 | -62/+76 |
|\ | |||||
| * | Backport of revno: 2617.68.13 | Jon Olav Hauglid | 2009-12-09 | 1 | -23/+14 |
| * | Backport of revno: 2617.31.30 | Jon Olav Hauglid | 2009-12-09 | 1 | -39/+56 |
| * | Backport of revno: 2617.76.2 | Jon Olav Hauglid | 2009-12-09 | 1 | -0/+6 |
* | | Backport of: | Konstantin Osipov | 2009-12-10 | 1 | -1/+1 |
|/ | |||||
* | Backport of revno: 2617.69.40 | Jon Olav Hauglid | 2009-12-09 | 1 | -1/+1 |
* | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -3/+8 |
* | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -7/+3 |
* | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5, | Konstantin Osipov | 2009-12-05 | 1 | -19/+66 |
* | Backport of: | Konstantin Osipov | 2009-12-04 | 1 | -3/+3 |
* | Backport of: | Konstantin Osipov | 2009-12-04 | 1 | -5/+5 |
* | ------------------------------------------------------------ | Konstantin Osipov | 2009-12-04 | 1 | -1/+1 |
* | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -465/+47 |
* | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -111/+136 |
* | WL#3726 "DDL locking", post-review fixes. | Konstantin Osipov | 2009-12-03 | 1 | -0/+4 |
* | Merge next-mr -> next-4284 | Konstantin Osipov | 2009-12-03 | 1 | -173/+1 |
|\ | |||||
| * | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -173/+1 |
| |\ | |||||
| | * | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -20/+27 |
| | |\ | |||||
| | * \ | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -174/+2 |
| | |\ \ | |||||
| | | * | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -174/+2 |
| | * | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -20/+53 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
* | | | | | Backport of: | Konstantin Osipov | 2009-12-02 | 1 | -22/+27 |
* | | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -21/+21 |
* | | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -18/+2 |
* | | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -22/+1 |
* | | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -3/+3 |
* | | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -1/+1 |
* | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -34/+84 |
|/ / / / | |||||
* | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -10/+10 |
* | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -5/+0 |
* | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -2/+0 |
* | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -8/+7 |
* | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -63/+63 |
|\ \ \ \ | |||||
| * | | | | Backport of Bug#45767 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -48/+0 |
| * | | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -1/+0 |
| * | | | | Backport of Bug#27525 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -12/+62 |
| * | | | | Backport of Bug#36649 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -1/+0 |
| * | | | | Bug#27145 EXTRA_ACL troubles | Kristofer Pettersson | 2009-11-10 | 1 | -1/+1 |
* | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -9/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'. | Alexander Nozdrin | 2009-11-05 | 1 | -9/+9 |
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+8 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null() | Sergey Vojtovich | 2009-10-28 | 1 | -1/+8 |
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge | Georgi Kodinov | 2009-10-16 | 1 | -2/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug#46019: ERROR 1356 When selecting from within another | Martin Hansson | 2009-10-16 | 1 | -2/+0 |
| | | | |_|/ | | | |/| | | |||||
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -17/+19 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -17/+19 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -17/+19 |
| | |/ / |