Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanup: s/const CHARSET_INFO/CHARSET_INFO/ | Sergei Golubchik | 2014-12-04 | 1 | -3/+3 |
* | MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and ... | Michael Widenius | 2014-09-11 | 1 | -29/+27 |
* | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -6/+6 |
|\ | |||||
| * | MDEV-5745 analyze MySQL fix for bug#12368495 | Alexander Barkov | 2014-07-28 | 1 | -6/+6 |
* | | minor cleanup | Sergei Golubchik | 2014-03-01 | 1 | -7/+5 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -2/+2 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -3/+3 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | | * | Bug#16691598 - ORDER BY LOWER(COLUMN) PRODUCES OUT-OF-ORDER RESULTS | Neeraj Bisht | 2013-11-07 | 1 | -1/+1 |
* | | | | MDEV-5180 Data type for WEIGHT_STRING is too short in some cases | Alexander Barkov | 2013-10-25 | 1 | -11/+4 |
* | | | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -0/+9 |
* | | | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -90/+79 |
* | | | | MDEV-4786 merge 10.0-monty > 10.0 | Alexander Barkov | 2013-08-02 | 1 | -0/+12 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -5/+5 |
| | |/ / | |/| | | |||||
* | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -5/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -5/+5 |
| |/ / | |||||
* | | | Merging utf16le from MySQL-5.6 | Alexander Barkov | 2013-03-28 | 1 | -130/+391 |
|/ / | |||||
* | | Fixed compiler warning | Michael Widenius | 2013-01-17 | 1 | -1/+2 |
* | | Fixed compiler errors | Michael Widenius | 2012-08-14 | 1 | -2/+7 |
* | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| | |\ | |||||
* | | \ | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+34 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merging Bug#11752408 from mysql-5.1 | Alexander Barkov | 2012-01-23 | 1 | -0/+34 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8... | Alexander Barkov | 2012-01-23 | 1 | -0/+34 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+4 |
| |\ \ \ \ | |||||
| | * \ \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+4 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -4/+4 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+3 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+4 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+4 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+4 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -4/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 1 | -4/+2 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -347/+21 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merging Copyright update from 5.1 | Alexander Barkov | 2011-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updating Copyright information | Alexander Barkov | 2011-01-19 | 1 | -1/+1 |
| * | | | | | merge mysql-5.5->mysql-5.5-bugteam | Georgi Kodinov | 2010-12-16 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug#55980 Character sets: supplementary character _bin ordering is wrong | Alexander Nozdrin | 2010-11-24 | 1 | -2/+2 |
| * | | | | | | Bug#58321 No warning when characters outside BMP0 is converted to UCS2 | Alexander Barkov | 2010-12-15 | 1 | -1/+4 |
| * | | | | | | Bug#57737 Character sets: search fails with like, contraction, index | Alexander Barkov | 2010-11-26 | 1 | -320/+8 |
| |/ / / / / | |||||
| * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-10-20 | 1 | -14/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
| * | | | | | Bug#55980 Character sets: supplementary character _bin ordering is wrong | Alexander Nozdrin | 2010-08-31 | 1 | -6/+6 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -10/+10 |