mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-03 13:45:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.5.39 merge

Browse source
This commit is contained in:
Sergei Golubchik 2014-08-07 18:06:56 +02:00
commit 6fb17a0601
246 changed files with 5932 additions and 4666 deletions
Download patch file Download diff file Expand all files Collapse all files

3
strings/CMakeLists.txt
View file

@ -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()

3
strings/ctype-bin.c
View file

@ -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

5
strings/ctype-eucjpms.c
View file

@ -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

12
strings/ctype-ucs2.c
View file

@ -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;
}

6
strings/ctype-ujis.c
View file

@ -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