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
e870df66
Commit
e870df66
authored
Dec 11, 2002
by
bar@bar.mysql.r18.ru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use of new num->str functions
fix in ucs2 charset
parent
2204f764
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
sql/field.cc
sql/field.cc
+10
-6
sql/item_sum.cc
sql/item_sum.cc
+1
-3
strings/ctype-utf8.c
strings/ctype-utf8.c
+2
-2
No files found.
sql/field.cc
View file @
e870df66
...
...
@@ -3778,9 +3778,11 @@ int Field_string::store(double nr)
int
Field_string
::
store
(
longlong
nr
)
{
char
buff
[
22
];
char
*
end
=
longlong10_to_str
(
nr
,
buff
,
-
10
);
return
Field_string
::
store
(
buff
,(
uint
)
(
end
-
buff
),
default_charset_info
);
char
buff
[
64
];
int
l
;
CHARSET_INFO
*
cs
=
charset
();
l
=
cs
->
ll10tostr
(
cs
,
buff
,
sizeof
(
buff
),
-
10
,
nr
);
return
Field_string
::
store
(
buff
,(
uint
)
l
,
cs
);
}
...
...
@@ -3975,9 +3977,11 @@ int Field_varstring::store(double nr)
int
Field_varstring
::
store
(
longlong
nr
)
{
char
buff
[
22
];
char
*
end
=
longlong10_to_str
(
nr
,
buff
,
-
10
);
return
Field_varstring
::
store
(
buff
,(
uint
)
(
end
-
buff
),
default_charset_info
);
char
buff
[
64
];
int
l
;
CHARSET_INFO
*
cs
=
charset
();
l
=
cs
->
ll10tostr
(
cs
,
buff
,
sizeof
(
buff
),
-
10
,
nr
);
return
Field_varstring
::
store
(
buff
,(
uint
)
l
,
cs
);
}
...
...
sql/item_sum.cc
View file @
e870df66
...
...
@@ -108,9 +108,7 @@ Item_sum_int::val_str(String *str)
longlong
nr
=
val_int
();
if
(
null_value
)
return
0
;
char
buff
[
21
];
uint
length
=
(
uint
)
(
longlong10_to_str
(
nr
,
buff
,
-
10
)
-
buff
);
str
->
copy
(
buff
,
length
,
thd_charset
());
str
->
set
(
nr
,
thd_charset
());
return
str
;
}
...
...
strings/ctype-utf8.c
View file @
e870df66
...
...
@@ -3055,8 +3055,8 @@ CHARSET_INFO my_charset_ucs2 =
my_hash_sort_ucs2
,
/* hash_sort */
0
,
my_snprintf_ucs2
,
my_l10tostr_
8bit
,
my_ll10tostr_
8bit
,
my_l10tostr_
ucs2
,
my_ll10tostr_
ucs2
,
my_strntol_ucs2
,
my_strntoul_ucs2
,
my_strntoll_ucs2
,
...
...
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