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
27970ee7
Commit
27970ee7
authored
Dec 13, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/15268-bug-5.0-mysql
parents
11b6afd3
cb06e0c1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
3 deletions
+21
-3
mysql-test/r/select.result
mysql-test/r/select.result
+8
-0
mysql-test/t/select.test
mysql-test/t/select.test
+10
-0
sql/item_cmpfunc.h
sql/item_cmpfunc.h
+3
-3
No files found.
mysql-test/r/select.result
View file @
27970ee7
...
@@ -3337,3 +3337,11 @@ id select_type table type possible_keys key key_len ref rows Extra
...
@@ -3337,3 +3337,11 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 const PRIMARY PRIMARY 4 const 1 Using index
1 SIMPLE t2 const PRIMARY PRIMARY 4 const 1 Using index
1 SIMPLE t3 const PRIMARY PRIMARY 8 const,const 1
1 SIMPLE t3 const PRIMARY PRIMARY 8 const,const 1
DROP TABLE t1,t2,t3;
DROP TABLE t1,t2,t3;
create table t1(f1 char, f2 char not null);
insert into t1 values(null,'a');
create table t2 (f2 char not null);
insert into t2 values('b');
select * from t1 left join t2 on f1=t2.f2 where t1.f2='a';
f1 f2 f2
NULL a NULL
drop table t1,t2;
mysql-test/t/select.test
View file @
27970ee7
...
@@ -2805,3 +2805,13 @@ EXPLAIN SELECT t2.key_a,foo
...
@@ -2805,3 +2805,13 @@ EXPLAIN SELECT t2.key_a,foo
WHERE
t2
.
key_a
=
2
and
key_b
=
5
;
WHERE
t2
.
key_a
=
2
and
key_b
=
5
;
DROP
TABLE
t1
,
t2
,
t3
;
DROP
TABLE
t1
,
t2
,
t3
;
#
# Bug#15268 Unchecked null value caused server crash
#
create
table
t1
(
f1
char
,
f2
char
not
null
);
insert
into
t1
values
(
null
,
'a'
);
create
table
t2
(
f2
char
not
null
);
insert
into
t2
values
(
'b'
);
select
*
from
t1
left
join
t2
on
f1
=
t2
.
f2
where
t1
.
f2
=
'a'
;
drop
table
t1
,
t2
;
sql/item_cmpfunc.h
View file @
27970ee7
...
@@ -723,9 +723,9 @@ public:
...
@@ -723,9 +723,9 @@ public:
{
{
char
buff
[
STRING_BUFFER_USUAL_SIZE
];
char
buff
[
STRING_BUFFER_USUAL_SIZE
];
String
tmp
(
buff
,
sizeof
(
buff
),
cmp_charset
),
*
res
;
String
tmp
(
buff
,
sizeof
(
buff
),
cmp_charset
),
*
res
;
if
(
!
(
res
=
arg
->
val_str
(
&
tmp
)))
res
=
arg
->
val_str
(
&
tmp
);
return
1
;
/* Can't be right */
return
(
value_res
?
(
res
?
sortcmp
(
value_res
,
res
,
cmp_charset
)
:
1
)
:
return
sortcmp
(
value_res
,
res
,
cmp_charset
);
(
res
?
-
1
:
0
)
);
}
}
int
compare
(
cmp_item
*
c
)
int
compare
(
cmp_item
*
c
)
{
{
...
...
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