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
2d8c5755
Commit
2d8c5755
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing crashing bugs as reported in bugs database
#195
parent
691d4b31
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
mysql-test/r/cast.result
mysql-test/r/cast.result
+3
-0
mysql-test/t/cast.test
mysql-test/t/cast.test
+1
-0
sql/item_cmpfunc.cc
sql/item_cmpfunc.cc
+2
-1
sql/item_strfunc.h
sql/item_strfunc.h
+2
-1
No files found.
mysql-test/r/cast.result
View file @
2d8c5755
...
@@ -40,3 +40,6 @@ cast("1:2:3" as TIME) = "1:02:03"
...
@@ -40,3 +40,6 @@ cast("1:2:3" as TIME) = "1:02:03"
select cast(NULL as DATE);
select cast(NULL as DATE);
cast(NULL as DATE)
cast(NULL as DATE)
NULL
NULL
select cast(NULL as BINARY);
cast(NULL as BINARY)
NULL
This diff is collapsed.
Click to expand it.
mysql-test/t/cast.test
View file @
2d8c5755
...
@@ -21,3 +21,4 @@ select cast("2001-1-1" as date) = "2001-01-01";
...
@@ -21,3 +21,4 @@ select cast("2001-1-1" as date) = "2001-01-01";
select
cast
(
"2001-1-1"
as
datetime
)
=
"2001-01-01 00:00:00"
;
select
cast
(
"2001-1-1"
as
datetime
)
=
"2001-01-01 00:00:00"
;
select
cast
(
"1:2:3"
as
TIME
)
=
"1:02:03"
;
select
cast
(
"1:2:3"
as
TIME
)
=
"1:02:03"
;
select
cast
(
NULL
as
DATE
);
select
cast
(
NULL
as
DATE
);
select
cast
(
NULL
as
BINARY
);
This diff is collapsed.
Click to expand it.
sql/item_cmpfunc.cc
View file @
2d8c5755
...
@@ -769,6 +769,7 @@ Item_func_if::val_str(String *str)
...
@@ -769,6 +769,7 @@ Item_func_if::val_str(String *str)
{
{
Item
*
arg
=
args
[
0
]
->
val_int
()
?
args
[
1
]
:
args
[
2
];
Item
*
arg
=
args
[
0
]
->
val_int
()
?
args
[
1
]
:
args
[
2
];
String
*
res
=
arg
->
val_str
(
str
);
String
*
res
=
arg
->
val_str
(
str
);
if
(
res
)
res
->
set_charset
(
charset
());
res
->
set_charset
(
charset
());
null_value
=
arg
->
null_value
;
null_value
=
arg
->
null_value
;
return
res
;
return
res
;
...
...
This diff is collapsed.
Click to expand it.
sql/item_strfunc.h
View file @
2d8c5755
...
@@ -512,6 +512,7 @@ public:
...
@@ -512,6 +512,7 @@ public:
{
{
String
*
tmp
=
args
[
0
]
->
val_str
(
a
);
String
*
tmp
=
args
[
0
]
->
val_str
(
a
);
null_value
=
args
[
0
]
->
null_value
;
null_value
=
args
[
0
]
->
null_value
;
if
(
tmp
)
tmp
->
set_charset
(
&
my_charset_bin
);
tmp
->
set_charset
(
&
my_charset_bin
);
return
tmp
;
return
tmp
;
}
}
...
...
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