Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | MDEV-9711 NO PAD collations | Alexander Barkov | 2016-09-06 | 1 | -183/+1839 |
* | | | MDEV-10742 LDML: make conf_to_src reuse common data between collations | Alexander Barkov | 2016-09-05 | 1 | -3201/+133 |
|/ / | |||||
* | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -0/+62 |
* | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -186/+124 |
|/ | |||||
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+2 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+2 |
| | |\ | |||||
* | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ | |||||
| | | * \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint | unknown | 2007-08-07 | 1 | -3/+3 |
| | | |\ \ | |||||
| | | * \ \ | Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 | unknown | 2007-08-03 | 1 | -2/+2 |
| | | |\ \ \ | |||||
| * | | \ \ \ | Merging Copyright update from 5.1 | Alexander Barkov | 2011-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Merging from mysql-5.1-bugteam | Alexander Barkov | 2010-11-26 | 1 | -5/+5 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocol | Alexander Barkov | 2009-09-30 | 1 | -69/+3 |
* | | | | | | | | Fixed typo that caused compiler warning | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
* | | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Updating Copyright information | Alexander Barkov | 2011-01-19 | 1 | -1/+1 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -5/+5 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8 | Alexander Barkov | 2010-11-26 | 1 | -5/+5 |
| | |/ / / / | |||||
| * | | | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 1 | -1/+1 |
* | | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -284/+284 |
|/ / / / / | |||||
* | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -68/+2 |
|/ / / / | |||||
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my51-bug27562 | unknown | 2007-08-07 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my50-bug27562 | unknown | 2007-08-07 | 1 | -3/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#27562: ascii.xml invalid? | unknown | 2007-08-07 | 1 | -3/+3 |
| | |/ / | |||||
* | | | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 | unknown | 2007-08-03 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Bug#28875 Conversion between ASCII and LATIN1 charsets does not function | unknown | 2007-08-03 | 1 | -3/+4 |
* | | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl | unknown | 2007-07-05 | 1 | -0/+15 |
|\ \ \ | | |/ | |/| | |||||
| * | | Printing copyright into ctype-extra.c | unknown | 2007-07-05 | 1 | -1/+2 |
* | | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b29499 | unknown | 2007-07-04 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark' | unknown | 2007-07-04 | 1 | -2/+2 |
| |/ | |||||
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-01-11 | 1 | -0/+14 |
| |\ | |||||
| | * | my_strtoll10-x86.s: | unknown | 2006-12-31 | 1 | -0/+15 |
* | | | Merge polly.local:/tmp/maint/bug24037/my50-bug24037 | unknown | 2006-12-22 | 1 | -4/+12 |
|\ \ \ | |/ / | |||||
| * | | Merge polly.local:/tmp/maint/bug24037/my41-bug24037 | unknown | 2006-12-22 | 1 | -4/+12 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix for the bug #24037 "Lossy Hebrew to Unicode conversion". | unknown | 2006-12-22 | 1 | -4/+12 |
| * | | ctype-extra.c: | unknown | 2006-04-06 | 1 | -0/+244 |
| |/ | |||||
| * | conf_to_src.c: | unknown | 2006-04-06 | 1 | -54/+592 |
* | | Merge mysql.com:/usr/home/bar/mysql-5.0 | unknown | 2006-04-05 | 1 | -0/+66 |
|\ \ | |||||
| * | | conf_to_src.c: | unknown | 2006-04-05 | 1 | -0/+554 |
* | | | ctype-extra.c: | unknown | 2006-04-05 | 1 | -0/+702 |
|/ / | |||||
* | | After merge fix for Bug#12076 --with-extra-charsets has no effect | unknown | 2006-04-04 | 1 | -54/+282 |
|/ | |||||
* | latin1.xml: | unknown | 2005-11-07 | 1 | -40/+7689 |
* | BUG#11338 (logging of prepared statement w/ blob type) | unknown | 2005-08-17 | 1 | -0/+1 |