Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
36d5d147
Commit
36d5d147
authored
22 years ago
by
bar@bar.mysql.r18.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
parents
f2a19352
2a41e291
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
104 additions
and
33 deletions
+104
-33
include/m_ctype.h
include/m_ctype.h
+7
-0
mysys/charset.c
mysys/charset.c
+1
-0
strings/ctype-big5.c
strings/ctype-big5.c
+2
-1
strings/ctype-bin.c
strings/ctype-bin.c
+1
-0
strings/ctype-czech.c
strings/ctype-czech.c
+2
-1
strings/ctype-euc_kr.c
strings/ctype-euc_kr.c
+2
-1
strings/ctype-gb2312.c
strings/ctype-gb2312.c
+2
-1
strings/ctype-gbk.c
strings/ctype-gbk.c
+1
-0
strings/ctype-latin1_de.c
strings/ctype-latin1_de.c
+2
-1
strings/ctype-simple.c
strings/ctype-simple.c
+26
-0
strings/ctype-sjis.c
strings/ctype-sjis.c
+2
-1
strings/ctype-tis620.c
strings/ctype-tis620.c
+2
-1
strings/ctype-ujis.c
strings/ctype-ujis.c
+2
-1
strings/ctype-utf8.c
strings/ctype-utf8.c
+3
-1
strings/ctype-win1250ch.c
strings/ctype-win1250ch.c
+2
-1
strings/ctype.c
strings/ctype.c
+47
-23
No files found.
include/m_ctype.h
View file @
36d5d147
...
...
@@ -49,6 +49,9 @@ typedef struct unicase_info_st {
#define MY_CS_TOOSMALL -1
#define MY_CS_TOOFEW(n) (-1-(n))
#define MY_SEQ_INTTAIL 1
#define MY_SEQ_SPACES 2
/* My charsets_list flags */
#define MY_NO_SETS 0
#define MY_CS_COMPILED 1
/* compiled-in sets */
...
...
@@ -144,6 +147,8 @@ typedef struct charset_info_st
ulonglong
(
*
strntoull
)(
struct
charset_info_st
*
,
const
char
*
s
,
uint
l
,
int
base
,
char
**
e
,
int
*
err
);
double
(
*
strntod
)(
struct
charset_info_st
*
,
char
*
s
,
uint
l
,
char
**
e
,
int
*
err
);
ulong
(
*
scan
)(
struct
charset_info_st
*
,
const
char
*
b
,
const
char
*
e
,
int
sq
);
}
CHARSET_INFO
;
...
...
@@ -181,6 +186,8 @@ extern int my_strncasecmp_8bit(CHARSET_INFO * cs, const char *, const char *, ui
int
my_mb_wc_8bit
(
CHARSET_INFO
*
cs
,
my_wc_t
*
wc
,
const
uchar
*
s
,
const
uchar
*
e
);
int
my_wc_mb_8bit
(
CHARSET_INFO
*
cs
,
my_wc_t
wc
,
uchar
*
s
,
uchar
*
e
);
ulong
my_scan_8bit
(
CHARSET_INFO
*
cs
,
const
char
*
b
,
const
char
*
e
,
int
sq
);
int
my_snprintf_8bit
(
struct
charset_info_st
*
,
char
*
to
,
uint
n
,
const
char
*
fmt
,
...);
long
my_strntol_8bit
(
CHARSET_INFO
*
,
const
char
*
s
,
uint
l
,
int
base
,
char
**
e
,
int
*
err
);
...
...
This diff is collapsed.
Click to expand it.
mysys/charset.c
View file @
36d5d147
...
...
@@ -80,6 +80,7 @@ static void simple_cs_init_functions(CHARSET_INFO *cs)
cs
->
strntoll
=
my_strntoll_8bit
;
cs
->
strntoull
=
my_strntoull_8bit
;
cs
->
strntod
=
my_strntod_8bit
;
cs
->
scan
=
my_scan_8bit
;
cs
->
mbmaxlen
=
1
;
}
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-big5.c
View file @
36d5d147
...
...
@@ -6257,7 +6257,8 @@ CHARSET_INFO my_charset_big5 =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-bin.c
View file @
36d5d147
...
...
@@ -305,6 +305,7 @@ static CHARSET_INFO my_charset_bin_st =
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
,
my_scan_8bit
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-czech.c
View file @
36d5d147
...
...
@@ -634,7 +634,8 @@ CHARSET_INFO my_charset_czech =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
#endif
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-euc_kr.c
View file @
36d5d147
...
...
@@ -8674,7 +8674,8 @@ CHARSET_INFO my_charset_euc_kr =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
#endif
This diff is collapsed.
Click to expand it.
strings/ctype-gb2312.c
View file @
36d5d147
...
...
@@ -5724,7 +5724,8 @@ CHARSET_INFO my_charset_gb2312 =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
#endif
This diff is collapsed.
Click to expand it.
strings/ctype-gbk.c
View file @
36d5d147
...
...
@@ -9912,6 +9912,7 @@ CHARSET_INFO my_charset_gbk =
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
,
my_scan_8bit
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-latin1_de.c
View file @
36d5d147
...
...
@@ -452,7 +452,8 @@ CHARSET_INFO my_charset_latin1_de =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
#endif
This diff is collapsed.
Click to expand it.
strings/ctype-simple.c
View file @
36d5d147
...
...
@@ -968,3 +968,29 @@ my_bool my_like_range_simple(CHARSET_INFO *cs,
*
min_str
++
=
*
max_str
++
=
' '
;
// Because if key compression
return
0
;
}
ulong
my_scan_8bit
(
CHARSET_INFO
*
cs
,
const
char
*
str
,
const
char
*
end
,
int
sq
)
{
const
char
*
str0
=
str
;
switch
(
sq
)
{
case
MY_SEQ_INTTAIL
:
if
(
*
str
==
'.'
)
{
for
(
str
++
;
str
!=
end
&&
*
str
==
'0'
;
str
++
);
return
str
-
str0
;
}
return
0
;
case
MY_SEQ_SPACES
:
for
(
str
++
;
str
!=
end
;
str
++
)
{
if
(
!
my_isspace
(
cs
,
*
str
))
break
;
}
return
str
-
str0
;
default:
return
0
;
}
}
This diff is collapsed.
Click to expand it.
strings/ctype-sjis.c
View file @
36d5d147
...
...
@@ -4498,7 +4498,8 @@ CHARSET_INFO my_charset_sjis =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
#endif
This diff is collapsed.
Click to expand it.
strings/ctype-tis620.c
View file @
36d5d147
...
...
@@ -726,7 +726,8 @@ CHARSET_INFO my_charset_tis620 =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-ujis.c
View file @
36d5d147
...
...
@@ -8468,7 +8468,8 @@ CHARSET_INFO my_charset_ujis =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-utf8.c
View file @
36d5d147
...
...
@@ -2000,6 +2000,7 @@ CHARSET_INFO my_charset_utf8 =
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
,
my_scan_8bit
};
...
...
@@ -3073,7 +3074,8 @@ CHARSET_INFO my_charset_ucs2 =
my_strntoul_ucs2
,
my_strntoll_ucs2
,
my_strntoull_ucs2
,
my_strntod_ucs2
my_strntod_ucs2
,
my_scan_8bit
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-win1250ch.c
View file @
36d5d147
...
...
@@ -660,7 +660,8 @@ CHARSET_INFO my_charset_win1250ch =
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype.c
View file @
36d5d147
...
...
@@ -2849,7 +2849,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -2895,7 +2896,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -2940,7 +2942,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -2985,7 +2988,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3031,7 +3035,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3076,7 +3081,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3121,7 +3127,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3166,7 +3173,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3212,7 +3220,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3257,7 +3266,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3302,7 +3312,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3347,7 +3358,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3392,7 +3404,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3437,7 +3450,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3482,7 +3496,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3528,7 +3543,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3573,7 +3589,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3619,7 +3636,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3665,7 +3683,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3710,7 +3729,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3755,7 +3775,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3800,7 +3821,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3845,7 +3867,8 @@ static CHARSET_INFO compiled_charsets[] = {
my_strntoul_8bit
,
my_strntoll_8bit
,
my_strntoull_8bit
,
my_strntod_8bit
my_strntod_8bit
,
my_scan_8bit
},
#endif
...
...
@@ -3891,6 +3914,7 @@ static CHARSET_INFO compiled_charsets[] = {
NULL
,
NULL
,
NULL
,
NULL
,
NULL
}
};
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment