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
063fe51c
Commit
063fe51c
authored
Dec 04, 2006
by
gkodinov/kgeorge@macbook.gmz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item_func.cc:
fixed a valgrind warning type_varchar.test: fixed a valgrind warning
parent
8b8e8202
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
mysql-test/t/type_varchar.test
mysql-test/t/type_varchar.test
+1
-0
sql/item_func.cc
sql/item_func.cc
+14
-5
No files found.
mysql-test/t/type_varchar.test
View file @
063fe51c
...
...
@@ -196,3 +196,4 @@ INSERT INTO t1 VALUES (10), (50), (30), ('1a'), (60), ('t');
SELECT
a
,(
a
+
0
)
FROM
t1
ORDER
BY
a
;
SELECT
a
,(
a
DIV
2
)
FROM
t1
ORDER
BY
a
;
SELECT
a
,
CAST
(
a
AS
SIGNED
)
FROM
t1
ORDER
BY
a
;
DROP
TABLE
t1
;
sql/item_func.cc
View file @
063fe51c
...
...
@@ -900,7 +900,8 @@ void Item_func_signed::print(String *str)
longlong
Item_func_signed
::
val_int_from_str
(
int
*
error
)
{
char
buff
[
MAX_FIELD_WIDTH
],
*
end
;
char
buff
[
MAX_FIELD_WIDTH
],
*
end
,
*
start
;
uint32
length
;
String
tmp
(
buff
,
sizeof
(
buff
),
&
my_charset_bin
),
*
res
;
longlong
value
;
...
...
@@ -916,13 +917,21 @@ longlong Item_func_signed::val_int_from_str(int *error)
return
0
;
}
null_value
=
0
;
end
=
(
char
*
)
res
->
ptr
()
+
res
->
length
();
value
=
my_strtoll10
(
res
->
ptr
(),
&
end
,
error
);
if
(
*
error
>
0
||
end
!=
res
->
ptr
()
+
res
->
length
())
start
=
(
char
*
)
res
->
ptr
();
length
=
res
->
length
();
end
=
start
+
length
;
value
=
my_strtoll10
(
start
,
&
end
,
error
);
if
(
*
error
>
0
||
end
!=
start
+
length
)
{
char
err_buff
[
128
];
String
err_tmp
(
err_buff
,(
uint32
)
sizeof
(
err_buff
),
system_charset_info
);
err_tmp
.
copy
(
start
,
length
,
system_charset_info
);
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_TRUNCATED_WRONG_VALUE
,
ER
(
ER_TRUNCATED_WRONG_VALUE
),
"INTEGER"
,
res
->
c_ptr
());
err_tmp
.
c_ptr
());
}
return
value
;
}
...
...
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