Skip to content

Commit 0afd292

Browse files
author
Alexander Barkov
committed
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)
1 parent d240a04 commit 0afd292

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/m_ctype.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ size_t my_strxfrm_pad_desc_and_reverse(CHARSET_INFO *cs,
749749

750750
my_bool my_charset_is_ascii_compatible(CHARSET_INFO *cs);
751751

752-
const MY_CONTRACTIONS *my_charset_get_contractions(const CHARSET_INFO *cs,
752+
const MY_CONTRACTIONS *my_charset_get_contractions(CHARSET_INFO *cs,
753753
int level);
754754

755755
extern size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n,

strings/ctype-uca.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19619,7 +19619,7 @@ my_uca_alloc_contractions(MY_CONTRACTIONS *contractions,
1961919619
*/
1962019620

1962119621
const MY_CONTRACTIONS *
19622-
my_charset_get_contractions(const CHARSET_INFO *cs, int level)
19622+
my_charset_get_contractions(CHARSET_INFO *cs, int level)
1962319623
{
1962419624
return (cs->uca != NULL) && (cs->uca->level[level].contractions.nitems > 0) ?
1962519625
&cs->uca->level[level].contractions : NULL;

0 commit comments

Comments
 (0)