From 0afd2920738877f901ec224d0d75ad0205a501ef Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 5 Dec 2013 16:54:50 +0400 Subject: [PATCH] Fixing an MSVC warning about double "const" data type qualifier in the code merged from MySQL-5.6: const CHARSET_INFO* -> CHARSET_INFO* (CHARSET_INFO already has the "const" qualifier in MariaDB, inlike in MySQL) --- include/m_ctype.h | 2 +- strings/ctype-uca.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/m_ctype.h b/include/m_ctype.h index 6357bbed17d..6f372002ebb 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -749,7 +749,7 @@ size_t my_strxfrm_pad_desc_and_reverse(CHARSET_INFO *cs, my_bool my_charset_is_ascii_compatible(CHARSET_INFO *cs); -const MY_CONTRACTIONS *my_charset_get_contractions(const CHARSET_INFO *cs, +const MY_CONTRACTIONS *my_charset_get_contractions(CHARSET_INFO *cs, int level); extern size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n, diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 3ef4d9e8c05..52bc883488a 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -19619,7 +19619,7 @@ my_uca_alloc_contractions(MY_CONTRACTIONS *contractions, */ const MY_CONTRACTIONS * -my_charset_get_contractions(const CHARSET_INFO *cs, int level) +my_charset_get_contractions(CHARSET_INFO *cs, int level) { return (cs->uca != NULL) && (cs->uca->level[level].contractions.nitems > 0) ? &cs->uca->level[level].contractions : NULL;