Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge trunk-bugfixing -> trunk-runtime. | Konstantin Osipov | 2010-07-27 | 1 | -4/+0 |
|\ | |||||
| * | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -4/+0 |
* | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -0/+1 |
|/ | |||||
* | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -4/+0 |
|\ | |||||
| * | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -4/+0 |
* | | merge | Mattias Jonsson | 2010-07-09 | 1 | -5/+13 |
|\ \ | |/ |/| | |||||
| * | merge | Mattias Jonsson | 2010-07-09 | 1 | -5/+13 |
| |\ | |||||
| | * | Bug#52517: Regression in ROW level replication performance with partitions | Mattias Jonsson | 2010-07-09 | 1 | -5/+13 |
* | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -1/+1 |
| |/ | |||||
* | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-05-28 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-04-30 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | BUG#39053 - UNISTALL PLUGIN does not allow the storage engine | Sergey Vojtovich | 2010-04-14 | 1 | -1/+1 |
* | | | Merge of bug#51851. | Mattias Jonsson | 2010-05-24 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bug#51851: Server with SBR locks mutex twice on LOAD DATA | Mattias Jonsson | 2010-03-30 | 1 | -2/+2 |
* | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -0/+18 |
|/ / | |||||
* | | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 1 | -0/+1 |
* | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -0/+1 |
|\ \ | |||||
| * | | backported: | Sergey Glukhov | 2010-01-15 | 1 | -0/+1 |
* | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -3/+52 |
|\ \ \ | |/ / | |||||
| * | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -3/+52 |
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -6/+1 |
|\ \ \ | |/ / | |||||
| * | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -6/+1 |
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -3/+67 |
|\ \ \ | |/ / | |||||
| * | | Merge mysql-next-mr to mysql-next-mr-svoj. | Sergey Vojtovich | 2009-12-09 | 1 | -3/+67 |
| |\ \ | |||||
| | * \ | merging with mysql-next-mr-svoj | V Narayanan | 2009-12-08 | 1 | -0/+23 |
| | |\ \ | |||||
| | | * | | WL#4454 change sql_insert.cc::last_uniq_key to match keys in any order | V Narayanan | 2009-12-03 | 1 | -0/+23 |
| | * | | | WL#2511 - Add a new table to the Information Schema for TABLESPACE's | Sergey Vojtovich | 2009-12-07 | 1 | -0/+1 |
| | * | | | WL#4448 Generalize the handlerton::fill_files_table call with handlerton::fil... | V Narayanan | 2009-12-03 | 1 | -3/+43 |
| | |/ / | |||||
* | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -6/+1 |
|/ / / | |||||
* | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -12/+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/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -12/+0 |
| |\ \ \ | |||||
| | * | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -12/+0 |
| * | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -0/+9 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -2/+0 |
| |_|_|/ |/| | | | |||||
* | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Bug#46944 Internal prepared XA transction XIDs are not | Kristofer Pettersson | 2009-10-12 | 1 | -1/+0 |
| | |/ | |/| | |||||
* | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -0/+11 |
|\ \ \ | |||||
| * \ \ | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -0/+11 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Backport BUG#41013 main.bootstrap coredumps in 6.0-rpl | He Zhenxing | 2009-10-02 | 1 | -0/+7 |
| | * | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 1 | -0/+4 |
* | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -0/+9 |
|\ \ \ | |/ / | |||||
| * | | Bug#46760: Fast ALTER TABLE no longer works for InnoDB | Georgi Kodinov | 2009-09-18 | 1 | -0/+9 |
| |/ | |||||
* | | Backport of: | Konstantin Osipov | 2009-10-16 | 1 | -0/+1 |
* | | Backport of: | Konstantin Osipov | 2009-10-16 | 1 | -1/+1 |
* | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -5/+4 |
|/ | |||||
* | automerge | Georgi Kodinov | 2009-08-17 | 1 | -2/+2 |
|\ | |||||
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -2/+2 |
| |\ | |||||
| | * | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -2/+2 |