Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -13/+15 |
|\ | |||||
| * | MDEV-8402 Bug #77473 Truncated data with subquery & UTF8 | Alexander Barkov | 2016-06-10 | 1 | -4/+3 |
| * | MDEV-10181 Illegal mix of collation for a field and an ASCII string as a view... | Alexander Barkov | 2016-06-10 | 1 | -9/+12 |
* | | MDEV-9045 Inconsistent handling of "ALGORITHM=INPLACE" with PERSISTENT genera... | Sergei Golubchik | 2016-02-15 | 1 | -0/+7 |
* | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2015-12-29 | 1 | -5/+5 |
|\ \ | |/ | |||||
| * | Moving Field_blob::store_length() back from protected to public, | Alexander Barkov | 2015-12-29 | 1 | -5/+5 |
* | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2015-12-29 | 1 | -5/+6 |
|\ \ | |/ | |||||
| * | MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much data | Alexander Barkov | 2015-12-29 | 1 | -5/+6 |
| * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-12-09 | 1 | -10/+10 |
| |\ | |||||
| | * | Bug #22123583: MYSQL 5.5: MAIN.SP HAS VALGRIND ISSUES | Sreeharsha Ramanavarapu | 2015-11-03 | 1 | -10/+10 |
* | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-10-09 | 1 | -1/+16 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-10-08 | 1 | -2/+17 |
| |\ \ | | |/ | |||||
| | * | Bug #21143080: UPDATE ON VARCHAR AND TEXT COLUMNS PRODUCE | Sreeharsha Ramanavarapu | 2015-07-16 | 1 | -1/+17 |
| | * | Bug#17632978 SLAVE CRASHES IF ROW EVENT IS CORRUPTED | Venkatesh Duggirala | 2013-12-17 | 1 | -13/+1 |
| | * | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -2/+8 |
| | |\ | |||||
| | | * | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2 | Tor Didriksen | 2012-04-12 | 1 | -1/+7 |
| | |/ | |||||
| | * | Merge BUG#12997905 from 5.1 to 5.5 | Jorgen Loland | 2011-11-18 | 1 | -0/+17 |
| | |\ | |||||
| | | * | Backmerge of BUG#12997905 | Jorgen Loland | 2011-11-18 | 1 | -0/+17 |
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+3 |
| | | |\ | |||||
| | | | * | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 1 | -0/+2 |
| | * | | | Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGE | Tor Didriksen | 2011-07-04 | 1 | -1/+7 |
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-09 | 1 | -1/+1 |
| | * | | | Bug#58190 BETWEEN no longer uses indexes for date or datetime fields | Alexander Barkov | 2010-11-19 | 1 | -0/+22 |
| | * | | | Bug #52131: SET and ENUM stored endian-dependent in binary log | Mats Kindahl | 2010-10-06 | 1 | -30/+76 |
| | * | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -5/+5 |
| | * | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -1/+0 |
| | * | | | Bug#52520 Difference in tinytext utf column metadata | Alexander Barkov | 2010-06-02 | 1 | -1/+2 |
| | * | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -0/+33 |
| | |\ \ \ | |||||
| | | * | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -0/+33 |
| | * | | | | Some post-merge fixes afer a merge from mysql-5.1-bugteam. | Alexey Kopytov | 2010-04-11 | 1 | -0/+4 |
| | |/ / / | |||||
| | * | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -71/+56 |
| | |\ \ \ | |||||
| | | * \ \ | Mergine from mysql-next-me | Alexander Barkov | 2010-02-27 | 1 | -1/+0 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -1/+6 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -23/+25 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -0/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Backport of: | Konstantin Osipov | 2009-12-02 | 1 | -1/+0 |
| | | * | | | | | | | WL#2649 Number-to-string conversions | Alexander Barkov | 2010-02-11 | 1 | -8/+34 |
| | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -23/+25 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | | * | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -0/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -23/+22 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | BUG#49618: Field length stored incorrectly in binary log | Mats Kindahl | 2009-12-15 | 1 | -4/+4 |
| | | | | * | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -23/+22 |
| | | | * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -15/+16 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -1/+7 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | | | |||||
| | | * | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -42/+0 |
| | | |\ \ \ \ \ \ \ \ \ |