1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing an MSVC warning about double "const" data type qualifier

Browse Source 
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)
This commit is contained in:
Alexander Barkov 2013-12-05 16:54:50 +04:00
parent d240a0418c
commit 0afd292073
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/m_ctype.h
View File

@ -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); 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); int level);
extern size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n, extern size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n,

2
strings/ctype-uca.c
View File

@ -19619,7 +19619,7 @@ my_uca_alloc_contractions(MY_CONTRACTIONS *contractions,
*/ */
const MY_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) ? return (cs->uca != NULL) && (cs->uca->level[level].contractions.nitems > 0) ?
&cs->uca->level[level].contractions : NULL; &cs->uca->level[level].contractions : NULL;