Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merging xxx_unicode_520_ci and xxx_vietnamese_ci from MySQL-5.6. | Alexander Barkov | 2013-11-12 | 1 | -0/+2405 |
* | MDEV-5180 Data type for WEIGHT_STRING is too short in some cases | Alexander Barkov | 2013-10-25 | 1 | -20/+15 |
* | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -51/+154 |
* | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -110/+147 |
* | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -3/+5 |
|\ | |||||
| * | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -3/+5 |
| |\ | |||||
| | * | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -3/+5 |
| | |\ | |||||
| | | * | Bug#14834378 ADDRESSSANITIZER BUG IN FILENAME_TO_TABLENAME | Tor Didriksen | 2013-06-14 | 1 | -1/+3 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -8/+22 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -8/+22 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO | Neeraj Bisht | 2013-01-14 | 1 | -10/+23 |
| | |\ \ | |||||
| | | * | | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO | Neeraj Bisht | 2013-01-14 | 1 | -9/+24 |
| | * | | | merge | Georgi Kodinov | 2012-07-05 | 1 | -0/+4 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ | | Georgi Kodinov | 2012-07-05 | 1 | -0/+4 |
* | | | | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -2/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.3 merge | Sergei Golubchik | 2013-04-12 | 1 | -2/+6 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | 5.1 merge | Sergei Golubchik | 2013-04-11 | 1 | -2/+6 |
| | |\ \ \ | |||||
| | | * | | | MDEV-4244 [PATCH] Buffer overruns and use-after-free errors | Sergei Golubchik | 2013-04-06 | 1 | -2/+6 |
* | | | | | | Performance improvements in "from latin1" and "to utf8" conversion. | Alexander Barkov | 2013-03-12 | 1 | -38/+25 |
|/ / / / / | |||||
* | | | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -3/+212 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -3/+212 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -3/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -2/+1 |
| | |\ \ \ | |||||
* | | \ \ \ | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+210 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merging Bug#11752408 from mysql-5.1 | Alexander Barkov | 2012-01-23 | 1 | -0/+210 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8... | Alexander Barkov | 2012-01-23 | 1 | -0/+210 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+5 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+3 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+5 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | 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 | -12/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | 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 |
| * | | | | | Bug#55980 Character sets: supplementary character _bin ordering is wrong | Alexander Nozdrin | 2010-11-24 | 1 | -11/+0 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -18/+17 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -37/+39 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Automerge mariadb 5.1 -> mariadb 5.2 | unknown | 2010-05-05 | 1 | -0/+4 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Fix missing bounds check in string conversion. | unknown | 2010-04-29 | 1 | -0/+4 |