diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-05 16:54:50 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-05 16:54:50 +0400 |
| commit | 0afd2920738877f901ec224d0d75ad0205a501ef (patch) | |
| tree | 11b034ff6181d13275728a8c85c29ec97f7b1f53 /strings | |
| parent | d240a0418cf6d59fba711f0677f164d9ee881b7e (diff) | |
| download | mariadb-git-0afd2920738877f901ec224d0d75ad0205a501ef.tar.gz | |
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)
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-uca.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |