diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 2 | ||||
| -rw-r--r-- | include/m_string.h | 4 | ||||
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/myisam.h | 4 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 4 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 8e0344356d5..37e15894432 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. + Copyright (c) 2000, 2012, 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 diff --git a/include/m_string.h b/include/m_string.h index 7c95c7319dc..9fc6cda4764 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -66,7 +66,9 @@ # define bcmp(A,B,C) memcmp((A),(B),(C)) #endif -#if !defined(bzero) && (!defined(HAVE_BZERO) || !defined(HAVE_DECL_BZERO)) +#if !defined(bzero) && (!defined(HAVE_BZERO) || !HAVE_DECL_BZERO || defined(_AIX)) +/* See autoconf doku: "HAVE_DECL_symbol" will be defined after configure, to 0 or 1 */ +/* AIX has bzero() as a function, but the declaration prototype is strangely hidden */ # define bzero(A,B) memset((A),0,(B)) #endif diff --git a/include/my_global.h b/include/my_global.h index c6120cd7bf3..8170ce381af 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2011, Oracle and/or its affiliates. + Copyright (c) 2001, 2012, 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 diff --git a/include/myisam.h b/include/myisam.h index 3d4eecb7cbe..eaa6b2dbd1f 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2000, 2012, 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 @@ -421,7 +421,7 @@ int flush_pending_blocks(MI_SORT_PARAM *param); int sort_ft_buf_flush(MI_SORT_PARAM *sort_param); int thr_write_keys(MI_SORT_PARAM *sort_param); int sort_write_record(MI_SORT_PARAM *sort_param); -int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ulong); +int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ulonglong); #ifdef __cplusplus } diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 614bb028a0d..8fb0ef77eef 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2005, 2010, Oracle and/or its affiliates - Copyright (C) 2009-2011 Monty Program Ab +/* Copyright (c) 2005, 2011, Oracle and/or its affiliates + Copyright (C) 2009, 2011, Monty Program Ab 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 diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 9e40c17efca..739aeb4ede8 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. +/* Copyright (c) 2010, 2011, 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 |