diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
| commit | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (patch) | |
| tree | 5c67457ff8abbb89b203a7f55cda776b738c385b /strings/ctype-ucs2.c | |
| parent | 6324c36bd703a0f55dcd49dd721af262f73cf7aa (diff) | |
| parent | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (diff) | |
| download | mariadb-git-0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2.tar.gz | |
5.5 merge
Diffstat (limited to 'strings/ctype-ucs2.c')
| -rw-r--r-- | strings/ctype-ucs2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 89df4ae0bc4..fee272e5d35 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2003, 2012, Oracle and/or its affiliates - Copyright (c) 2009, 2013, Monty Program Ab. +/* Copyright (c) 2003, 2013, Oracle and/or its affiliates + Copyright (c) 2009, 2014, SkySQL Ab. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -1664,7 +1664,7 @@ struct charset_info_st my_charset_utf16_general_ci= struct charset_info_st my_charset_utf16_bin= { 55,0,0, /* number */ - MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_NONASCII, + MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, "utf16", /* cs name */ "utf16_bin", /* name */ "UTF-16 Unicode", /* comment */ |