Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Vladislav Vaintroub | 2009-12-02 | 2 | -197/+0 |
|\ | |||||
| * | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 2 | -197/+0 |
| |\ | |||||
| | * | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 27 | -152/+375 |
| | |\ | |||||
| | * \ | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 2 | -197/+0 |
| | |\ \ | |||||
| | | * | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 2 | -197/+0 |
| | * | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 111 | -2534/+2585 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
* | | | | | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE | Vladislav Vaintroub | 2009-12-01 | 10 | -32/+21 |
* | | | | | merge | Vladislav Vaintroub | 2009-11-25 | 44 | -362/+335 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 41 | -335/+335 |
| * | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 4 | -27/+0 |
* | | | | | merge | Vladislav Vaintroub | 2009-11-20 | 1 | -4/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -4/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | Bug #33544 UDF_INIT member decimals initialized wrong with | Magne Mahre | 2009-11-11 | 1 | -4/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug #33544: UDF_INIT member decimals initialized wrong with | unknown | 2008-03-05 | 1 | -4/+0 |
* | | | | | | | automerge | Vladislav Vaintroub | 2009-11-13 | 23 | -134/+329 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 23 | -133/+325 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 3 | -4/+22 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 18 | -121/+285 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. | Sergey Vojtovich | 2009-11-05 | 18 | -121/+285 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||||
| | | | * | | | | | | Merge of innodb-zip-ss6129 snapshot. | Sergey Vojtovich | 2009-11-03 | 18 | -121/+285 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+2 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -6/+60 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -14/+36 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 5 | -28/+56 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+1 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+1 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -8/+10 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -3/+10 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -2/+0 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -10/+10 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 3 | -30/+41 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+6 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+6 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -16/+26 |
| | | | | * | | | | | | Applying InnoDB plugin snapshot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+17 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -69/+0 |
| | | | | * | | | | | | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -0/+69 |
| | | | * | | | | | | | Merge innodb-5.1-ss6129 to mysql-5.1-bugteam. | Sergey Vojtovich | 2009-11-03 | 3 | -17/+40 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | * | | | | | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| | | | | * | | | | | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| | | | | * | | | | | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+1 |
| | | | | * | | | | | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -0/+1 |
| | | | | * | | | | | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| | | | | * | | | | | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+1 |
| | | | | * | | | | | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -10/+16 |