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
f80fbfa2
Commit
f80fbfa2
authored
Oct 01, 2008
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merge of bug #37943 5.0-bugteam -> 5.1-bugteam
parents
1901da7f
e59a0361
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
99 additions
and
2 deletions
+99
-2
mysql-test/include/index_merge1.inc
mysql-test/include/index_merge1.inc
+15
-0
mysql-test/r/index_merge_myisam.result
mysql-test/r/index_merge_myisam.result
+10
-0
sql/opt_range.cc
sql/opt_range.cc
+74
-2
No files found.
mysql-test/include/index_merge1.inc
View file @
f80fbfa2
...
@@ -487,3 +487,18 @@ select * from t2 where a=4 or b=4;
...
@@ -487,3 +487,18 @@ select * from t2 where a=4 or b=4;
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
#
# Bug #37943: Reproducible mysqld crash/sigsegv in sel_trees_can_be_ored
#
CREATE
TABLE
t1
(
a
varchar
(
8
),
b
set
(
'a'
,
'b'
,
'c'
,
'd'
,
'e'
,
'f'
,
'g'
,
'h'
),
KEY
b
(
b
),
KEY
a
(
a
));
INSERT
INTO
t1
VALUES
(
'y'
,
''
),
(
'z'
,
''
);
#should not crash
SELECT
b
,
a
from
t1
WHERE
(
b
!=
'c'
AND
b
!=
'f'
&&
b
!=
'h'
)
OR
(
a
=
'pure-S'
)
OR
(
a
=
'DE80337a'
)
OR
(
a
=
'DE80799'
);
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
mysql-test/r/index_merge_myisam.result
View file @
f80fbfa2
...
@@ -520,6 +520,16 @@ a filler b
...
@@ -520,6 +520,16 @@ a filler b
4 zz 4
4 zz 4
5 qq 4
5 qq 4
drop table t1, t2;
drop table t1, t2;
CREATE TABLE t1 (a varchar(8), b set('a','b','c','d','e','f','g','h'),
KEY b(b), KEY a(a));
INSERT INTO t1 VALUES ('y',''), ('z','');
SELECT b,a from t1 WHERE (b!='c' AND b!='f' && b!='h') OR
(a='pure-S') OR (a='DE80337a') OR (a='DE80799');
b a
y
z
DROP TABLE t1;
End of 5.0 tests
#---------------- ROR-index_merge tests -----------------------
#---------------- ROR-index_merge tests -----------------------
SET SESSION STORAGE_ENGINE = MyISAM;
SET SESSION STORAGE_ENGINE = MyISAM;
drop table if exists t0,t1,t2;
drop table if exists t0,t1,t2;
...
...
sql/opt_range.cc
View file @
f80fbfa2
...
@@ -574,6 +574,7 @@ public:
...
@@ -574,6 +574,7 @@ public:
keys_map
.
clear_all
();
keys_map
.
clear_all
();
bzero
((
char
*
)
keys
,
sizeof
(
keys
));
bzero
((
char
*
)
keys
,
sizeof
(
keys
));
}
}
SEL_TREE
(
SEL_TREE
*
arg
,
RANGE_OPT_PARAM
*
param
);
/*
/*
Note: there may exist SEL_TREE objects with sel_tree->type=KEY and
Note: there may exist SEL_TREE objects with sel_tree->type=KEY and
keys[i]=0 for all i. (SergeyP: it is not clear whether there is any
keys[i]=0 for all i. (SergeyP: it is not clear whether there is any
...
@@ -767,6 +768,7 @@ public:
...
@@ -767,6 +768,7 @@ public:
trees_next
(
trees
),
trees_next
(
trees
),
trees_end
(
trees
+
PREALLOCED_TREES
)
trees_end
(
trees
+
PREALLOCED_TREES
)
{}
{}
SEL_IMERGE
(
SEL_IMERGE
*
arg
,
RANGE_OPT_PARAM
*
param
);
int
or_sel_tree
(
RANGE_OPT_PARAM
*
param
,
SEL_TREE
*
tree
);
int
or_sel_tree
(
RANGE_OPT_PARAM
*
param
,
SEL_TREE
*
tree
);
int
or_sel_tree_with_checks
(
RANGE_OPT_PARAM
*
param
,
SEL_TREE
*
new_tree
);
int
or_sel_tree_with_checks
(
RANGE_OPT_PARAM
*
param
,
SEL_TREE
*
new_tree
);
int
or_sel_imerge_with_checks
(
RANGE_OPT_PARAM
*
param
,
SEL_IMERGE
*
imerge
);
int
or_sel_imerge_with_checks
(
RANGE_OPT_PARAM
*
param
,
SEL_IMERGE
*
imerge
);
...
@@ -883,6 +885,61 @@ int SEL_IMERGE::or_sel_imerge_with_checks(RANGE_OPT_PARAM *param, SEL_IMERGE* im
...
@@ -883,6 +885,61 @@ int SEL_IMERGE::or_sel_imerge_with_checks(RANGE_OPT_PARAM *param, SEL_IMERGE* im
}
}
SEL_TREE
::
SEL_TREE
(
SEL_TREE
*
arg
,
RANGE_OPT_PARAM
*
param
)
:
Sql_alloc
()
{
keys_map
=
arg
->
keys_map
;
type
=
arg
->
type
;
for
(
int
idx
=
0
;
idx
<
MAX_KEY
;
idx
++
)
{
if
((
keys
[
idx
]
=
arg
->
keys
[
idx
]))
keys
[
idx
]
->
increment_use_count
(
1
);
}
List_iterator
<
SEL_IMERGE
>
it
(
arg
->
merges
);
for
(
SEL_IMERGE
*
el
=
it
++
;
el
;
el
=
it
++
)
{
SEL_IMERGE
*
merge
=
new
SEL_IMERGE
(
el
,
param
);
if
(
!
merge
||
merge
->
trees
==
merge
->
trees_next
)
{
merges
.
empty
();
return
;
}
merges
.
push_back
(
merge
);
}
}
SEL_IMERGE
::
SEL_IMERGE
(
SEL_IMERGE
*
arg
,
RANGE_OPT_PARAM
*
param
)
:
Sql_alloc
()
{
uint
elements
=
(
arg
->
trees_end
-
arg
->
trees
);
if
(
elements
>
PREALLOCED_TREES
)
{
uint
size
=
elements
*
sizeof
(
SEL_TREE
**
);
if
(
!
(
trees
=
(
SEL_TREE
**
)
alloc_root
(
param
->
mem_root
,
size
)))
goto
mem_err
;
}
else
trees
=
&
trees_prealloced
[
0
];
trees_next
=
trees
;
trees_end
=
trees
+
elements
;
for
(
SEL_TREE
**
tree
=
trees
,
**
arg_tree
=
arg
->
trees
;
tree
<
trees_end
;
tree
++
,
arg_tree
++
)
{
if
(
!
(
*
tree
=
new
SEL_TREE
(
*
arg_tree
,
param
)))
goto
mem_err
;
}
return
;
mem_err:
trees
=
&
trees_prealloced
[
0
];
trees_next
=
trees
;
trees_end
=
trees
;
}
/*
/*
Perform AND operation on two index_merge lists and store result in *im1.
Perform AND operation on two index_merge lists and store result in *im1.
*/
*/
...
@@ -942,10 +999,23 @@ int imerge_list_or_tree(RANGE_OPT_PARAM *param,
...
@@ -942,10 +999,23 @@ int imerge_list_or_tree(RANGE_OPT_PARAM *param,
{
{
SEL_IMERGE
*
imerge
;
SEL_IMERGE
*
imerge
;
List_iterator
<
SEL_IMERGE
>
it
(
*
im1
);
List_iterator
<
SEL_IMERGE
>
it
(
*
im1
);
bool
tree_used
=
FALSE
;
while
((
imerge
=
it
++
))
while
((
imerge
=
it
++
))
{
{
if
(
imerge
->
or_sel_tree_with_checks
(
param
,
tree
))
SEL_TREE
*
or_tree
;
if
(
tree_used
)
{
or_tree
=
new
SEL_TREE
(
tree
,
param
);
if
(
!
or_tree
||
(
or_tree
->
keys_map
.
is_clear_all
()
&&
or_tree
->
merges
.
is_empty
()))
return
FALSE
;
}
else
or_tree
=
tree
;
if
(
imerge
->
or_sel_tree_with_checks
(
param
,
or_tree
))
it
.
remove
();
it
.
remove
();
tree_used
=
TRUE
;
}
}
return
im1
->
is_empty
();
return
im1
->
is_empty
();
}
}
...
@@ -5548,6 +5618,8 @@ get_mm_parts(RANGE_OPT_PARAM *param, COND *cond_func, Field *field,
...
@@ -5548,6 +5618,8 @@ get_mm_parts(RANGE_OPT_PARAM *param, COND *cond_func, Field *field,
}
}
}
}
if
(
tree
&&
tree
->
merges
.
is_empty
()
&&
tree
->
keys_map
.
is_clear_all
())
tree
=
NULL
;
DBUG_RETURN
(
tree
);
DBUG_RETURN
(
tree
);
}
}
...
...
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