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
fac2a7a8
Commit
fac2a7a8
authored
Apr 22, 2017
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-12495 Conditional jump depends on uninitialised value for: SELECT NULL UNION geom_expression
parent
97fb1f26
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
1 deletion
+30
-1
mysql-test/r/gis.result
mysql-test/r/gis.result
+13
-0
mysql-test/t/gis.test
mysql-test/t/gis.test
+13
-0
sql/item.cc
sql/item.cc
+4
-1
No files found.
mysql-test/r/gis.result
View file @
fac2a7a8
...
...
@@ -1630,3 +1630,16 @@ SELECT ASTEXT(p) FROM v1;
ASTEXT(p)
POINT(1 1)
DROP VIEW v1;
#
# Start of 10.0 tests
#
#
# MDEV-12495 Conditional jump depends on uninitialised value for: SELECT NULL UNION geom_expression
#
SELECT AsText(g) FROM (SELECT NULL AS g UNION SELECT Point(1,1)) AS t1;
AsText(g)
NULL
POINT(1 1)
#
# End 10.0 tests
#
mysql-test/t/gis.test
View file @
fac2a7a8
...
...
@@ -1492,3 +1492,16 @@ SELECT ASTEXT(p) FROM v1;
DROP
VIEW
v1
;
# --echo End of 5.5 tests
--
echo
#
--
echo
# Start of 10.0 tests
--
echo
#
--
echo
#
--
echo
# MDEV-12495 Conditional jump depends on uninitialised value for: SELECT NULL UNION geom_expression
--
echo
#
SELECT
AsText
(
g
)
FROM
(
SELECT
NULL
AS
g
UNION
SELECT
Point
(
1
,
1
))
AS
t1
;
--
echo
#
--
echo
# End 10.0 tests
--
echo
#
sql/item.cc
View file @
fac2a7a8
...
...
@@ -9464,7 +9464,10 @@ void Item_cache_row::set_null()
Item_type_holder
::
Item_type_holder
(
THD
*
thd
,
Item
*
item
)
:
Item
(
thd
,
item
),
enum_set_typelib
(
0
),
fld_type
(
get_real_type
(
item
))
:
Item
(
thd
,
item
),
enum_set_typelib
(
0
),
fld_type
(
get_real_type
(
item
)),
geometry_type
(
Field
::
GEOM_GEOMETRY
)
{
DBUG_ASSERT
(
item
->
fixed
);
maybe_null
=
item
->
maybe_null
;
...
...
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