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
10f17e61
Commit
10f17e61
authored
15 years ago
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
ea174a1a
9337f49d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
28 deletions
+28
-28
sql/opt_range.cc
sql/opt_range.cc
+14
-14
sql/partition_element.h
sql/partition_element.h
+1
-1
sql/sql_partition.cc
sql/sql_partition.cc
+3
-3
sql/sql_partition.h
sql/sql_partition.h
+10
-10
No files found.
sql/opt_range.cc
View file @
10f17e61
...
@@ -3137,8 +3137,9 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
...
@@ -3137,8 +3137,9 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
bool
set_full_part_if_bad_ret
=
FALSE
;
bool
set_full_part_if_bad_ret
=
FALSE
;
bool
ignore_part_fields
=
ppar
->
ignore_part_fields
;
bool
ignore_part_fields
=
ppar
->
ignore_part_fields
;
bool
did_set_ignore_part_fields
=
FALSE
;
bool
did_set_ignore_part_fields
=
FALSE
;
RANGE_OPT_PARAM
*
range_par
=
&
(
ppar
->
range_param
);
if
(
check_stack_overrun
(
ppar
->
range_param
.
thd
,
3
*
STACK_MIN_SIZE
,
NULL
))
if
(
check_stack_overrun
(
range_par
->
thd
,
3
*
STACK_MIN_SIZE
,
NULL
))
return
-
1
;
return
-
1
;
if
(
key_tree
->
left
!=
&
null_element
)
if
(
key_tree
->
left
!=
&
null_element
)
...
@@ -3234,11 +3235,11 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
...
@@ -3234,11 +3235,11 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
else
else
flag
=
key_tree
->
min_flag
|
key_tree
->
max_flag
;
flag
=
key_tree
->
min_flag
|
key_tree
->
max_flag
;
if
(
tmp_min_key
!=
ppar
->
range_param
.
min_key
)
if
(
tmp_min_key
!=
range_par
->
min_key
)
flag
&=
~
NO_MIN_RANGE
;
flag
&=
~
NO_MIN_RANGE
;
else
else
flag
|=
NO_MIN_RANGE
;
flag
|=
NO_MIN_RANGE
;
if
(
tmp_max_key
!=
ppar
->
range_param
.
max_key
)
if
(
tmp_max_key
!=
range_par
->
max_key
)
flag
&=
~
NO_MAX_RANGE
;
flag
&=
~
NO_MAX_RANGE
;
else
else
flag
|=
NO_MAX_RANGE
;
flag
|=
NO_MAX_RANGE
;
...
@@ -3265,10 +3266,10 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
...
@@ -3265,10 +3266,10 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
get_part_iter_for_interval
(
ppar
->
part_info
,
get_part_iter_for_interval
(
ppar
->
part_info
,
FALSE
,
FALSE
,
store_length_array
,
store_length_array
,
ppar
->
range_param
.
min_key
,
range_par
->
min_key
,
ppar
->
range_param
.
max_key
,
range_par
->
max_key
,
tmp_min_key
-
ppar
->
range_param
.
min_key
,
tmp_min_key
-
range_par
->
min_key
,
tmp_max_key
-
ppar
->
range_param
.
max_key
,
tmp_max_key
-
range_par
->
max_key
,
flag
,
flag
,
&
ppar
->
part_iter
);
&
ppar
->
part_iter
);
if
(
!
res
)
if
(
!
res
)
...
@@ -3304,8 +3305,7 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
...
@@ -3304,8 +3305,7 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
{
{
PARTITION_ITERATOR
subpart_iter
;
PARTITION_ITERATOR
subpart_iter
;
DBUG_EXECUTE
(
"info"
,
dbug_print_segment_range
(
key_tree
,
DBUG_EXECUTE
(
"info"
,
dbug_print_segment_range
(
key_tree
,
ppar
->
range_param
.
range_par
->
key_parts
););
key_parts
););
res
=
ppar
->
part_info
->
res
=
ppar
->
part_info
->
get_subpart_iter_for_interval
(
ppar
->
part_info
,
get_subpart_iter_for_interval
(
ppar
->
part_info
,
TRUE
,
TRUE
,
...
...
This diff is collapsed.
Click to expand it.
sql/partition_element.h
View file @
10f17e61
/* Copyright
(C) 2006-2008 MySQL AB, Sun Microsystems Inc. 2008-2009
/* Copyright
2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
...
This diff is collapsed.
Click to expand it.
sql/sql_partition.cc
View file @
10f17e61
...
@@ -7006,12 +7006,12 @@ uint32 store_tuple_to_record(Field **pfield,
...
@@ -7006,12 +7006,12 @@ uint32 store_tuple_to_record(Field **pfield,
/*
/*
RANGE(columns) partitioning: compare value bound and probe tuple.
RANGE(columns) partitioning: compare value bound and probe tuple.
The value bound always is a full tuple (but may include the MAX
_
VALUE
The value bound always is a full tuple (but may include the MAXVALUE
special value).
special value).
The probe tuple may be a prefix of partitioning tuple. The tail_is_min
The probe tuple may be a prefix of partitioning tuple. The tail_is_min
parameter specifies whether the suffix components should be assumed to
parameter specifies whether the suffix components should be assumed to
hold MAX
_
VALUE
hold MAXVALUE
*/
*/
static
int
cmp_rec_and_tuple
(
part_column_list_val
*
val
,
uint32
nvals_in_rec
)
static
int
cmp_rec_and_tuple
(
part_column_list_val
*
val
,
uint32
nvals_in_rec
)
...
...
This diff is collapsed.
Click to expand it.
sql/sql_partition.h
View file @
10f17e61
/* Copyright
(C) 2006-2008 MySQL AB, Sun Microsystems Inc. 2008-2009
/* Copyright
2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
...
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