Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Misc. typos | luz.paz | 2018-04-05 | 1 | -1/+1 |
* | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -4/+4 |
* | Fix and reenable Windows compiler warning C4800 (size_t conversion). | Vladislav Vaintroub | 2018-01-26 | 1 | -2/+2 |
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-23 | 1 | -1/+1 |
| |\ | |||||
| | * | MDEV-6262 analyze the coverity report on mariadb | Sergei Golubchik | 2017-05-19 | 1 | -1/+1 |
* | | | MDEV-11255 LDML: allow defining 2-level UCA collations | Alexander Barkov | 2016-11-08 | 1 | -0/+2 |
* | | | MDEV-7769 MY_CHARSET_INFO refactoring# On branch 10.2 | Alexander Barkov | 2016-10-10 | 1 | -12/+14 |
* | | | MDEV-9711 NO PAD collations | Alexander Barkov | 2016-09-06 | 1 | -0/+2 |
* | | | MDEV-10743 LDML: a new syntax to reuse sort order from another 8bit simple co... | Alexander Barkov | 2016-09-06 | 1 | -0/+8 |
* | | | LDML refactoring for "MDEV-9711 NO PAD collations" | Alexander Barkov | 2016-09-03 | 1 | -42/+0 |
|/ / | |||||
* | | MDEV-7231 Field ROUTINE_DEFINITION in INFORMATION_SCHEMA.`ROUTINES` | Alexander Barkov | 2016-02-24 | 1 | -12/+16 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client() | Oleksandr Byelkin | 2015-09-06 | 1 | -1/+1 |
* | | Moving the conversion code from String::well_formed_copy() | Alexander Barkov | 2015-03-16 | 1 | -0/+73 |
|/ | |||||
* | MDEV-6752 Trailing incomplete characters are not replaced to question marks o... | Alexander Barkov | 2014-09-18 | 1 | -1/+8 |
* | compilation failure on x86 | Sergei Golubchik | 2014-09-07 | 1 | -1/+1 |
* | - MDEV-6695 Bad column name for UCS2 string literals | Alexander Barkov | 2014-09-04 | 1 | -7/+86 |
* | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -4/+2 |
|\ | |||||
| * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -4/+2 |
| |\ | |||||
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -2/+1 |
* | | | An upstream bug fixed: | Alexander Barkov | 2013-12-11 | 1 | -1/+1 |
* | | | MDEV-4928 Merge collation customization improvements | Alexander Barkov | 2013-10-02 | 1 | -44/+550 |
* | | | Merging my_convert() from 10.0-serg | Alexander Barkov | 2013-08-01 | 1 | -0/+141 |
|/ / | |||||
* | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO | Neeraj Bisht | 2013-01-14 | 1 | -0/+2 |
| |\ | |||||
| | * | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO | Neeraj Bisht | 2013-01-14 | 1 | -0/+2 |
* | | | 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 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -6/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | 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 | -5/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 1 | -5/+1 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -1/+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 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -11/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -11/+12 |
| | |/ / | |/| | | |||||
| * | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 1 | -0/+20 |
| * | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| * | | | | | Fixed problems with ma_test2 and mi_test2 on high-byte-first system | unknown | 2008-02-21 | 1 | -1/+3 |
* | | | | | | Backporting Bug#37129 LDML lacks <i> rule | Alexander Barkov | 2009-11-09 | 1 | -1/+4 |
* | | | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocol | Alexander Barkov | 2009-09-30 | 1 | -0/+20 |
| |_|_|/ / |/| | | | |