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
5aab4ac2
Commit
5aab4ac2
authored
20 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
parents
996986fe
b226bebc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
strings/ctype-tis620.c
strings/ctype-tis620.c
+2
-2
No files found.
strings/ctype-tis620.c
View file @
5aab4ac2
...
@@ -541,7 +541,7 @@ int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)),
...
@@ -541,7 +541,7 @@ int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)),
tc1
=
buf
;
tc1
=
buf
;
if
((
len1
+
len2
+
2
)
>
(
int
)
sizeof
(
buf
))
if
((
len1
+
len2
+
2
)
>
(
int
)
sizeof
(
buf
))
tc1
=
(
uchar
*
)
malloc
(
len1
+
len2
);
tc1
=
(
uchar
*
)
malloc
(
len1
+
len2
+
2
);
tc2
=
tc1
+
len1
+
1
;
tc2
=
tc1
+
len1
+
1
;
memcpy
((
char
*
)
tc1
,
(
char
*
)
s1
,
len1
);
memcpy
((
char
*
)
tc1
,
(
char
*
)
s1
,
len1
);
tc1
[
len1
]
=
0
;
/* if length(s1)> len1, need to put 'end of string' */
tc1
[
len1
]
=
0
;
/* if length(s1)> len1, need to put 'end of string' */
...
@@ -568,7 +568,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
...
@@ -568,7 +568,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
a
=
buf
;
a
=
buf
;
if
((
a_length
+
b_length
+
2
)
>
(
int
)
sizeof
(
buf
))
if
((
a_length
+
b_length
+
2
)
>
(
int
)
sizeof
(
buf
))
alloced
=
a
=
(
uchar
*
)
malloc
(
a_length
+
b_length
);
alloced
=
a
=
(
uchar
*
)
malloc
(
a_length
+
b_length
+
2
);
b
=
a
+
a_length
+
1
;
b
=
a
+
a_length
+
1
;
memcpy
((
char
*
)
a
,
(
char
*
)
a0
,
a_length
);
memcpy
((
char
*
)
a
,
(
char
*
)
a0
,
a_length
);
...
...
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