Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -2/+2 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -2/+2 |
* | | | MDEV-9711 NO PAD collations | Alexander Barkov | 2016-09-06 | 1 | -4/+12 |
* | | | MDEV-10743 LDML: a new syntax to reuse sort order from another 8bit simple co... | Alexander Barkov | 2016-09-06 | 1 | -22/+106 |
* | | | MDEV-10742 LDML: make conf_to_src reuse common data between collations | Alexander Barkov | 2016-09-05 | 1 | -24/+94 |
* | | | LDML refactoring for "MDEV-9711 NO PAD collations" | Alexander Barkov | 2016-09-03 | 1 | -11/+5 |
* | | | Merge branch '10.2' into 10.2-mdev9864 | Galina Shalygina | 2016-05-08 | 1 | -4/+4 |
|/ / | |||||
* | | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client() | Oleksandr Byelkin | 2015-09-06 | 1 | -1/+1 |
* | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -12/+29 |
|/ | |||||
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+1 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ | |||||
* | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ | |||||
* | | \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+7 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -2/+5 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -2/+5 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -3/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 1 | -3/+2 |
| * | | | | | Removed compiler warning | Michael Widenius | 2010-12-05 | 1 | -1/+1 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merging Copyright update from 5.1 | Alexander Barkov | 2011-01-19 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updating Copyright information | Alexander Barkov | 2011-01-19 | 1 | -2/+2 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -9/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -8/+8 |
| | |/ / | |/| | | |||||
| * | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -2/+3 |
| |/ / | |||||
* | | | Backporting WL#4164 Two-byte collation IDs | Alexander Barkov | 2009-10-15 | 1 | -5/+13 |
* | | | Backporting WL#3759 Optimize identifier conversion in client-server protocol | Alexander Barkov | 2009-09-30 | 1 | -2/+3 |
|/ / | |||||
* | | Changes of copyright output from "--version" and similar. | unknown | 2008-11-14 | 1 | -1/+1 |
|/ | |||||
* | Bug#28875 Conversion between ASCII and LATIN1 charsets does not function | unknown | 2007-08-03 | 1 | -4/+29 |
* | Merge siva.hindu.god:/usr/home/tim/m/bk/g50 | unknown | 2006-12-26 | 1 | -2/+1 |
|\ | |||||
| * | Many files: | unknown | 2006-12-23 | 1 | -2/+1 |
* | | Merge polly.local:/tmp/maint/bug24037/my41-bug24037 | unknown | 2006-12-22 | 1 | -1/+8 |
|\ \ | |/ |/| | |||||
| * | Fix for the bug #24037 "Lossy Hebrew to Unicode conversion". | unknown | 2006-12-22 | 1 | -1/+8 |
| * | conf_to_src.c: | unknown | 2006-04-06 | 1 | -1/+2 |
* | | conf_to_src.c: | unknown | 2006-04-05 | 1 | -1/+2 |
* | | After merge fix for Bug#12076 --with-extra-charsets has no effect | unknown | 2006-04-04 | 1 | -1/+5 |
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 | unknown | 2005-10-27 | 1 | -28/+51 |
|\ \ | |/ | |||||
| * | conf_to_src.c: | unknown | 2005-10-27 | 1 | -2/+11 |
| * | conf_to_src.c: | unknown | 2005-10-27 | 1 | -26/+40 |
* | | Add my_str_malloc and _free function pointers to strings library | unknown | 2005-06-24 | 1 | -0/+2 |
|/ | |||||
* | Added missing SSL library (Should be in source distribution) | unknown | 2003-11-28 | 1 | -8/+2 |
* | conf_to_src.c: | unknown | 2003-05-27 | 1 | -39/+25 |
* | (no commit message) | unknown | 2003-01-30 | 1 | -11/+29 |
* | conf_to_src.c: | unknown | 2003-01-29 | 1 | -143/+91 |
* | conf_to_src.c: | unknown | 2003-01-29 | 1 | -11/+157 |
* | Reorganization to restore generating charset C files from conf files | unknown | 2003-01-29 | 1 | -30/+82 |
* | Charsets related things are prepared by configure in new way. | unknown | 2002-03-06 | 1 | -1/+1 |