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
bed38d06
Commit
bed38d06
authored
Feb 16, 2006
by
reggie@big_geek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved prune_partition_set decl from handler.h to sql_partition.h during merge
cleaned up some files from the partition code move
parent
3ce0880d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
sql/Makefile.am
sql/Makefile.am
+2
-1
sql/partition_info.cpp
sql/partition_info.cpp
+12
-6
sql/sql_partition.h
sql/sql_partition.h
+1
-0
No files found.
sql/Makefile.am
View file @
bed38d06
...
@@ -65,7 +65,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
...
@@ -65,7 +65,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h
\
sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h
\
parse_file.h sql_view.h sql_trigger.h
\
parse_file.h sql_view.h sql_trigger.h
\
sql_array.h sql_cursor.h event.h event_priv.h
\
sql_array.h sql_cursor.h event.h event_priv.h
\
sql_plugin.h authors.h sql_partition.h partition_info.h partition_element.h
sql_plugin.h authors.h sql_partition.h partition_info.h
\
partition_element.h
mysqld_SOURCES
=
sql_lex.cc sql_handler.cc sql_partition.cc
\
mysqld_SOURCES
=
sql_lex.cc sql_handler.cc sql_partition.cc
\
item.cc item_sum.cc item_buff.cc item_func.cc
\
item.cc item_sum.cc item_buff.cc item_func.cc
\
item_cmpfunc.cc item_strfunc.cc item_timefunc.cc
\
item_cmpfunc.cc item_strfunc.cc item_timefunc.cc
\
...
...
sql/partition_info.cpp
View file @
bed38d06
...
@@ -191,7 +191,7 @@ bool partition_info::set_up_default_partitions(handler *file, ulonglong max_rows
...
@@ -191,7 +191,7 @@ bool partition_info::set_up_default_partitions(handler *file, ulonglong max_rows
bool
partition_info
::
set_up_default_subpartitions
(
handler
*
file
,
bool
partition_info
::
set_up_default_subpartitions
(
handler
*
file
,
ulonglong
max_rows
)
ulonglong
max_rows
)
{
{
uint
i
,
j
;
//, no_parts, no_subparts;
uint
i
,
j
;
char
*
default_name
,
*
name_ptr
;
char
*
default_name
,
*
name_ptr
;
bool
result
=
TRUE
;
bool
result
=
TRUE
;
partition_element
*
part_elem
;
partition_element
*
part_elem
;
...
@@ -200,16 +200,11 @@ bool partition_info::set_up_default_subpartitions(handler *file,
...
@@ -200,16 +200,11 @@ bool partition_info::set_up_default_subpartitions(handler *file,
if
(
no_subparts
==
0
)
if
(
no_subparts
==
0
)
no_subparts
=
file
->
get_default_no_partitions
(
max_rows
);
no_subparts
=
file
->
get_default_no_partitions
(
max_rows
);
// no_parts= part_info->no_parts;
//no_subparts= part_info->no_subparts;
if
(
unlikely
((
no_parts
*
no_subparts
)
>
MAX_PARTITIONS
))
if
(
unlikely
((
no_parts
*
no_subparts
)
>
MAX_PARTITIONS
))
{
{
my_error
(
ER_TOO_MANY_PARTITIONS_ERROR
,
MYF
(
0
));
my_error
(
ER_TOO_MANY_PARTITIONS_ERROR
,
MYF
(
0
));
goto
end
;
goto
end
;
}
}
// if (unlikely((!(default_name=
// create_default_partition_names(no_subparts, (uint)0, TRUE)))))
//goto end;
i
=
0
;
i
=
0
;
do
do
{
{
...
@@ -277,6 +272,17 @@ bool partition_info::set_up_defaults_for_partitioning(handler *file,
...
@@ -277,6 +272,17 @@ bool partition_info::set_up_defaults_for_partitioning(handler *file,
DBUG_RETURN
(
FALSE
);
DBUG_RETURN
(
FALSE
);
}
}
/*
A support function to check if a partition element's name is unique
SYNOPSIS
has_unique_name()
partition_element element to check
RETURN VALUES
TRUE Has unique name
FALSE Doesn't
*/
bool
partition_info
::
has_unique_name
(
partition_element
*
element
)
bool
partition_info
::
has_unique_name
(
partition_element
*
element
)
{
{
DBUG_ENTER
(
"partition_info::has_unique_name"
);
DBUG_ENTER
(
"partition_info::has_unique_name"
);
...
...
sql/sql_partition.h
View file @
bed38d06
...
@@ -92,6 +92,7 @@ int get_parts_for_update(const byte *old_data, byte *new_data,
...
@@ -92,6 +92,7 @@ int get_parts_for_update(const byte *old_data, byte *new_data,
longlong
*
func_value
);
longlong
*
func_value
);
int
get_part_for_delete
(
const
byte
*
buf
,
const
byte
*
rec0
,
int
get_part_for_delete
(
const
byte
*
buf
,
const
byte
*
rec0
,
partition_info
*
part_info
,
uint32
*
part_id
);
partition_info
*
part_info
,
uint32
*
part_id
);
void
prune_partition_set
(
const
TABLE
*
table
,
part_id_range
*
part_spec
);
bool
check_partition_info
(
partition_info
*
part_info
,
handlerton
**
eng_type
,
bool
check_partition_info
(
partition_info
*
part_info
,
handlerton
**
eng_type
,
handler
*
file
,
ulonglong
max_rows
);
handler
*
file
,
ulonglong
max_rows
);
bool
fix_partition_func
(
THD
*
thd
,
const
char
*
name
,
TABLE
*
table
,
bool
fix_partition_func
(
THD
*
thd
,
const
char
*
name
,
TABLE
*
table
,
...
...
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