diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
| commit | 6fb17a06016506498f4de75ff754f500f9f674f1 (patch) | |
| tree | d03c86959f150edc0f6f27ca2c06ccbc0e6e5bf0 /strings | |
| parent | 2023fac28130d7d3f7d6776332239c62c3890195 (diff) | |
| parent | a4ab2431a20f6e2198d980f8e84fa7118515ca3b (diff) | |
| download | mariadb-git-6fb17a06016506498f4de75ff754f500f9f674f1.tar.gz | |
5.5.39 merge
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | strings/ctype-bin.c | 3 | ||||
| -rw-r--r-- | strings/ctype-eucjpms.c | 5 | ||||
| -rw-r--r-- | strings/ctype-ucs2.c | 12 | ||||
| -rw-r--r-- | strings/ctype-ujis.c | 6 |
5 files changed, 15 insertions, 14 deletions
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index e1cee8d9824..6291d107d90 100644 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2013, Oracle and/or its affiliates +# Copyright (c) 2006, 2014, Oracle and/or its affiliates # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,7 +36,6 @@ ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES}) ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c) TARGET_LINK_LIBRARIES(conf_to_src strings) -INSTALL_DEBUG_SYMBOLS(strings) IF(MSVC) INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 6e861f38ae4..4beb7047d00 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -1,5 +1,6 @@ /* Copyright (c) 2002-2007 MySQL AB & tommy@valley.ne.jp - Copyright (c) 2009-2011, Monty Program Ab + Copyright (c) 2002, 2014, 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 diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c index d9033a234c4..20972fbe136 100644 --- a/strings/ctype-eucjpms.c +++ b/strings/ctype-eucjpms.c @@ -1,5 +1,6 @@ -/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. - Copyright (c) 2009-2011, Monty Program Ab +/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp + Copyright (c) 2002, 2014, 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 diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index a7f948ebe3a..d2f7d34f0aa 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -2202,10 +2202,10 @@ my_strnncollsp_utf32(CHARSET_INFO *cs, static uint my_ismbchar_utf32(CHARSET_INFO *cs __attribute__((unused)), - const char *b __attribute__((unused)), - const char *e __attribute__((unused))) + const char *b, + const char *e) { - return 4; + return b + 4 > e ? 0 : 4; } @@ -3159,10 +3159,10 @@ static int my_strnncollsp_ucs2(CHARSET_INFO *cs __attribute__((unused)), static uint my_ismbchar_ucs2(CHARSET_INFO *cs __attribute__((unused)), - const char *b __attribute__((unused)), - const char *e __attribute__((unused))) + const char *b, + const char *e) { - return 2; + return b + 2 > e ? 0 : 2; } diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index 9a69995b278..a6d9fb96fb1 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -1,6 +1,6 @@ -/* Copyright tommy@valley.ne.jp. - Copyright (c) 2002, 2011, Oracle and/or its affiliates. - Copyright (c) 2009-2011, Monty Program Ab +/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp + Copyright (c) 2002, 2014, 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 |