Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2009-12-10 | 4 | -12/+25 |
|\ | |||||
| * | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-10 | 53 | -566/+1022 |
| |\ | |||||
| * \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 2 | -197/+0 |
| |\ \ | |||||
| * \ \ | merge | Mattias Jonsson | 2009-12-01 | 1 | -9/+17 |
| |\ \ \ | |||||
| | * | | | Bug#44622: Using PARTITIONs with ARCHIVE engine reports 0 bytes in i_s.TABLES | Mattias Jonsson | 2009-08-11 | 1 | -8/+15 |
| * | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 44 | -362/+335 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -4/+0 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merging. | Alexey Botchkov | 2009-11-17 | 3 | -3/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ... | Alexey Botchkov | 2009-10-09 | 3 | -3/+8 |
* | | | | | | | | After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock. | Sergey Vojtovich | 2009-12-10 | 1 | -2/+2 |
* | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj. | Sergey Vojtovich | 2009-12-09 | 17 | -11/+158 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Bug#40814 CSV engine does not parse \X characters when they occur in unquoted... | V Narayanan | 2009-12-03 | 1 | -8/+65 |
| * | | | | | | | Backport from 6.0-codebase. | Sergey Vojtovich | 2009-11-25 | 16 | -3/+93 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-08 | 2 | -2/+50 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge next-mr -> next-mr-runtime | Konstantin Osipov | 2009-12-03 | 2 | -197/+0 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Addition to BUG#36573 - myisampack --join does not create destination table | Magne Mahre | 2009-11-25 | 1 | -1/+0 |
| * | | | | | | | Fix for Bug#36573 myisampack --join does not create destination | Magne Mahre | 2009-11-25 | 1 | -2/+47 |
| * | | | | | | | Bug#40677 Archive tables joined on primary return no result | Magne Mahre | 2009-11-25 | 1 | -0/+4 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 52 | -564/+972 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | 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 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 41 | -335/+335 |
* | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 4 | -27/+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 | gkodinov/kgeorge@magare.gmz | 2008-03-05 | 1 | -4/+0 |
* | | | | | | | | 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 |