diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 23:07:18 +0200 |
| commit | a3073ecd96a829aaff87c6386e0766fc1440922b (patch) | |
| tree | d91e26efc46ab64ee6cb8de880eac060cded0213 /include | |
| parent | 1a48919036a7746a15ff6bd19cb52c25fc6a57c1 (diff) | |
| parent | cbd52a42ee9b93675e5cdaa043df878c423b6571 (diff) | |
| download | mariadb-git-a3073ecd96a829aaff87c6386e0766fc1440922b.tar.gz | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/decimal.h | 2 | ||||
| -rw-r--r-- | include/m_ctype.h | 5 | ||||
| -rw-r--r-- | include/m_string.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/decimal.h b/include/decimal.h index f9baf4c7382..5e3fea9f912 100644 --- a/include/decimal.h +++ b/include/decimal.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 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_ctype.h b/include/m_ctype.h index 95e0ad16fb9..8badfb53c15 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 @@ -57,6 +57,7 @@ struct unicase_info_st extern MY_UNICASE_INFO *const my_unicase_default[256]; extern MY_UNICASE_INFO *const my_unicase_turkish[256]; +extern MY_UNICASE_INFO *const my_unicase_mysql500[256]; #define MY_UCA_MAX_CONTRACTION 4 #define MY_UCA_MAX_WEIGHT_SIZE 8 @@ -339,11 +340,13 @@ extern struct charset_info_st my_charset_tis620_bin; extern struct charset_info_st my_charset_ucs2_general_ci; extern struct charset_info_st my_charset_ucs2_bin; extern struct charset_info_st my_charset_ucs2_unicode_ci; +extern struct charset_info_st my_charset_ucs2_general_mysql500_ci; extern struct charset_info_st my_charset_ujis_japanese_ci; extern struct charset_info_st my_charset_ujis_bin; extern struct charset_info_st my_charset_utf8_general_ci; extern struct charset_info_st my_charset_utf8_unicode_ci; extern struct charset_info_st my_charset_utf8_bin; +extern struct charset_info_st my_charset_utf8_general_mysql500_ci; extern struct charset_info_st my_charset_cp1250_czech_ci; /* declarations for simple charsets */ diff --git a/include/m_string.h b/include/m_string.h index e818d339fcb..6c2028fd480 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 |