mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Reorganization to restore generating charset C files from conf files
This commit is contained in:
@ -95,7 +95,7 @@ function (const char *nptr,char **endptr,int base)
|
||||
s = nptr;
|
||||
|
||||
/* Skip white space. */
|
||||
while (my_isspace (system_charset_info, *s))
|
||||
while (my_isspace (my_charset_latin1, *s))
|
||||
++s;
|
||||
if (*s == '\0')
|
||||
{
|
||||
@ -115,7 +115,7 @@ function (const char *nptr,char **endptr,int base)
|
||||
}
|
||||
|
||||
|
||||
if (base == 16 && s[0] == '0' && my_toupper (system_charset_info, s[1]) == 'X')
|
||||
if (base == 16 && s[0] == '0' && my_toupper (my_charset_latin1, s[1]) == 'X')
|
||||
s += 2;
|
||||
|
||||
/* If BASE is zero, figure it out ourselves. */
|
||||
@ -123,7 +123,7 @@ function (const char *nptr,char **endptr,int base)
|
||||
{
|
||||
if (*s == '0')
|
||||
{
|
||||
if (my_toupper (system_charset_info, s[1]) == 'X')
|
||||
if (my_toupper (my_charset_latin1, s[1]) == 'X')
|
||||
{
|
||||
s += 2;
|
||||
base = 16;
|
||||
@ -145,10 +145,10 @@ function (const char *nptr,char **endptr,int base)
|
||||
i = 0;
|
||||
for (c = *s; c != '\0'; c = *++s)
|
||||
{
|
||||
if (my_isdigit (system_charset_info, c))
|
||||
if (my_isdigit (my_charset_latin1, c))
|
||||
c -= '0';
|
||||
else if (my_isalpha (system_charset_info, c))
|
||||
c = my_toupper (system_charset_info, c) - 'A' + 10;
|
||||
else if (my_isalpha (my_charset_latin1, c))
|
||||
c = my_toupper (my_charset_latin1, c) - 'A' + 10;
|
||||
else
|
||||
break;
|
||||
if (c >= base)
|
||||
|
Reference in New Issue
Block a user