summaryrefslogtreecommitdiff
path: root/mysys/charset.c
Commit message (Expand)AuthorAgeFilesLines
* MDEV-5241: Collation incompatibilities with MySQL-5.6Michael Widenius2013-11-091-7/+7
* MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6Alexander Barkov2013-10-231-1/+3
* MDEV-4928 Merge collation customization improvements Alexander Barkov2013-10-021-31/+117
* Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+11
* 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\
| * Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\
* | | | \ mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \
| * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \
* | | \ \ \ \ merge with 5.3Sergei Golubchik2011-10-191-0/+5
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Rewritten patch of percona - switching query cache on and off, removing comme...unknown2011-05-181-0/+3
| | |_|_|/ / | |/| | | |
| * | | | | merge with 5.1Michael Widenius2010-11-301-0/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed some compiler warningsMichael Widenius2010-11-301-0/+2
* | | | | | 5.5-mergeSergei Golubchik2011-07-021-7/+13
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Bug #59884: setting charset to 2048 crashesGeorgi Kodinov2011-02-101-7/+13
* | | | | | merge.Sergei Golubchik2010-11-251-39/+36
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-2/+2
| * | | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+8
| | |\ \ \ | | | |/ /
| * | | | mergedSergei Golubchik2010-03-151-54/+28
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-53/+27
| | |\ \ \
| * | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-061-38/+35
| |/ / / /
| * | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-16/+27
| |\ \ \ \
| * | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l...Michael Widenius2009-07-021-0/+3
* | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
* | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-12/+74
|\ \ \ \ \ \
| * | | | | | Backporting WL#1213Alexander Barkov2010-02-241-4/+65
| * | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-8/+8
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-0/+3
| | |\ \ \ \ \ \
| | * | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-8/+8
| * | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-53/+27
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Bug#47756 Setting 2byte collation ID with 'set names' crashes the serverAlexander Barkov2009-12-071-0/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-221-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Bug #51976 LDML collations issue Alexander Barkov2010-03-221-0/+2
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Workaround the pthread_once_t static initialization. Per theDavi Arnaut2010-02-261-1/+2
| * | | | | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-261-0/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-191-53/+27
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-53/+27
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | |
| | * | | | Bug#49134 5.1 server segfaults with 2byte collation fileAlexander Barkov2009-12-151-1/+2
| | * | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-121-52/+25
| | | |/ / | | |/| |
* | | | | Backporting patch for Bug#47756Alexander Nozdrin2009-12-151-0/+3
|/ / / /
* | | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-151-5/+5
* | | | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-301-0/+3
|/ / /
* | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-1/+1
* | | Bug#42649 THR_LOCK_charset global mutex abused by InnoDBAlexander Barkov2009-04-071-15/+26
|/ /
* | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
|\ \ | |/
| * Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-enginesunknown2007-10-241-0/+40
| |\
View Lorry Controller Status