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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f4ba3d90
Commit
f4ba3d90
authored
Nov 11, 2002
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
For coding convenuence cs->mbmaxlen is now 1 for 8bit charsets
parent
446a5b0a
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
34 additions
and
33 deletions
+34
-33
mysys/charset.c
mysys/charset.c
+1
-0
mysys/test_charset.c
mysys/test_charset.c
+1
-1
sql/item_strfunc.cc
sql/item_strfunc.cc
+3
-3
sql/sql_show.cc
sql/sql_show.cc
+1
-1
strings/ctype-bin.c
strings/ctype-bin.c
+1
-1
strings/ctype-czech.c
strings/ctype-czech.c
+1
-1
strings/ctype-latin1_de.c
strings/ctype-latin1_de.c
+1
-1
strings/ctype-tis620.c
strings/ctype-tis620.c
+1
-1
strings/ctype-win1250ch.c
strings/ctype-win1250ch.c
+1
-1
strings/ctype.c
strings/ctype.c
+23
-23
No files found.
mysys/charset.c
View file @
f4ba3d90
...
...
@@ -389,6 +389,7 @@ static CHARSET_INFO *add_charset(CHARSET_INFO *cs, myf flags)
cs
->
hash_caseup
=
my_hash_caseup_simple
;
cs
->
hash_sort
=
my_hash_sort_simple
;
cs
->
snprintf
=
my_snprintf_8bit
;
cs
->
mbmaxlen
=
1
;
set_max_sort_char
(
cs
);
create_fromuni
(
cs
);
...
...
mysys/test_charset.c
View file @
f4ba3d90
...
...
@@ -46,7 +46,7 @@ static void _print_csinfo(CHARSET_INFO *cs)
cs
->
strnxfrm
,
cs
->
like_range
);
printf
(
"multi-byte: %3s (%d, %p, %p, %p)
\n
"
,
cs
->
mbmaxlen
?
"yes"
:
"no"
,
cs
->
mbmaxlen
>
1
?
"yes"
:
"no"
,
cs
->
mbmaxlen
,
cs
->
ismbchar
,
cs
->
ismbhead
,
...
...
sql/item_strfunc.cc
View file @
f4ba3d90
...
...
@@ -1928,7 +1928,7 @@ String *Item_func_conv_charset::val_str(String *str)
s
=
(
const
uchar
*
)
arg
->
ptr
();
se
=
s
+
arg
->
length
();
dmaxlen
=
arg
->
length
()
*
(
to
->
mbmaxlen
?
to
->
mbmaxlen
:
1
)
+
1
;
dmaxlen
=
arg
->
length
()
*
to
->
mbmaxlen
+
1
;
str
->
alloc
(
dmaxlen
);
d0
=
d
=
(
unsigned
char
*
)
str
->
ptr
();
de
=
d
+
dmaxlen
;
...
...
@@ -1970,7 +1970,7 @@ String *Item_func_conv_charset::val_str(String *str)
void
Item_func_conv_charset
::
fix_length_and_dec
()
{
max_length
=
args
[
0
]
->
max_length
*
(
conv_charset
->
mbmaxlen
?
conv_charset
->
mbmaxlen
:
1
)
;
max_length
=
args
[
0
]
->
max_length
*
conv_charset
->
mbmaxlen
;
set_charset
(
conv_charset
);
}
...
...
@@ -2002,7 +2002,7 @@ String *Item_func_conv_charset3::val_str(String *str)
s
=
(
const
uchar
*
)
arg
->
ptr
();
se
=
s
+
arg
->
length
();
dmaxlen
=
arg
->
length
()
*
(
to_charset
->
mbmaxlen
?
to_charset
->
mbmaxlen
:
1
)
+
1
;
dmaxlen
=
arg
->
length
()
*
to_charset
->
mbmaxlen
+
1
;
str
->
alloc
(
dmaxlen
);
d0
=
d
=
(
unsigned
char
*
)
str
->
ptr
();
de
=
d
+
dmaxlen
;
...
...
sql/sql_show.cc
View file @
f4ba3d90
...
...
@@ -1424,7 +1424,7 @@ int mysqld_show_charsets(THD *thd, const char *wild)
net_store_data
(
&
packet2
,
convert
,
cs
[
0
]
->
name
);
net_store_data
(
&
packet2
,(
uint32
)
cs
[
0
]
->
number
);
net_store_data
(
&
packet2
,(
uint32
)
cs
[
0
]
->
strxfrm_multiply
);
net_store_data
(
&
packet2
,(
uint32
)
(
cs
[
0
]
->
mbmaxlen
?
cs
[
0
]
->
mbmaxlen
:
1
));
net_store_data
(
&
packet2
,(
uint32
)
(
cs
[
0
]
->
mbmaxlen
));
if
(
my_net_write
(
&
thd
->
net
,
(
char
*
)
packet2
.
ptr
(),
packet2
.
length
()))
goto
err
;
...
...
strings/ctype-bin.c
View file @
f4ba3d90
...
...
@@ -162,7 +162,7 @@ static CHARSET_INFO my_charset_bin_st =
my_strnncoll_binary
,
/* strnncoll */
NULL
,
/* strxnfrm */
NULL
,
/* like_rabge */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
strings/ctype-czech.c
View file @
f4ba3d90
...
...
@@ -610,7 +610,7 @@ CHARSET_INFO my_charset_czech =
my_strnncoll_czech
,
my_strnxfrm_czech
,
my_like_range_czech
,
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
strings/ctype-latin1_de.c
View file @
f4ba3d90
...
...
@@ -428,7 +428,7 @@ CHARSET_INFO my_charset_latin1_de =
my_strnncoll_latin1_de
,
my_strnxfrm_latin1_de
,
my_like_range_latin1_de
,
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
strings/ctype-tis620.c
View file @
f4ba3d90
...
...
@@ -702,7 +702,7 @@ CHARSET_INFO my_charset_tis620 =
my_strnncoll_tis620
,
my_strnxfrm_tis620
,
my_like_range_tis620
,
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
strings/ctype-win1250ch.c
View file @
f4ba3d90
...
...
@@ -636,7 +636,7 @@ CHARSET_INFO my_charset_win1250ch =
my_strnncoll_win1250ch
,
my_strnxfrm_win1250ch
,
my_like_range_win1250ch
,
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
strings/ctype.c
View file @
f4ba3d90
...
...
@@ -2823,7 +2823,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -2860,7 +2860,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -2896,7 +2896,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -2932,7 +2932,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -2969,7 +2969,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3005,7 +3005,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3041,7 +3041,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3077,7 +3077,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3114,7 +3114,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3150,7 +3150,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3186,7 +3186,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3222,7 +3222,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3258,7 +3258,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3294,7 +3294,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3330,7 +3330,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3367,7 +3367,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3403,7 +3403,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3440,7 +3440,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3477,7 +3477,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3513,7 +3513,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3549,7 +3549,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3585,7 +3585,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
@@ -3621,7 +3621,7 @@ static CHARSET_INFO compiled_charsets[] = {
my_strnncoll_simple
,
/* strnncoll */
NULL
,
/* strnxfrm */
NULL
,
/* like_range */
0
,
/* mbmaxlen */
1
,
/* mbmaxlen */
NULL
,
/* ismbchar */
NULL
,
/* ismbhead */
NULL
,
/* mbcharlen */
...
...
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