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
db7809e8
Commit
db7809e8
authored
Apr 09, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dead code, remove unused argument
parent
a53200d4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
19 deletions
+14
-19
sql/ha_partition.cc
sql/ha_partition.cc
+1
-2
sql/ha_partition.h
sql/ha_partition.h
+1
-2
sql/handler.cc
sql/handler.cc
+2
-2
sql/handler.h
sql/handler.h
+2
-2
sql/sql_table.cc
sql/sql_table.cc
+6
-7
sql/unireg.cc
sql/unireg.cc
+2
-4
No files found.
sql/ha_partition.cc
View file @
db7809e8
...
@@ -529,8 +529,7 @@ int ha_partition::rename_table(const char *from, const char *to)
...
@@ -529,8 +529,7 @@ int ha_partition::rename_table(const char *from, const char *to)
int
ha_partition
::
create_partitioning_metadata
(
const
char
*
path
,
int
ha_partition
::
create_partitioning_metadata
(
const
char
*
path
,
const
char
*
old_path
,
const
char
*
old_path
,
int
action_flag
,
int
action_flag
)
HA_CREATE_INFO
*
create_info
)
{
{
DBUG_ENTER
(
"ha_partition::create_partitioning_metadata()"
);
DBUG_ENTER
(
"ha_partition::create_partitioning_metadata()"
);
...
...
sql/ha_partition.h
View file @
db7809e8
...
@@ -239,8 +239,7 @@ public:
...
@@ -239,8 +239,7 @@ public:
virtual
int
create
(
const
char
*
name
,
TABLE
*
form
,
virtual
int
create
(
const
char
*
name
,
TABLE
*
form
,
HA_CREATE_INFO
*
create_info
);
HA_CREATE_INFO
*
create_info
);
virtual
int
create_partitioning_metadata
(
const
char
*
name
,
virtual
int
create_partitioning_metadata
(
const
char
*
name
,
const
char
*
old_name
,
int
action_flag
,
const
char
*
old_name
,
int
action_flag
);
HA_CREATE_INFO
*
create_info
);
virtual
void
update_create_info
(
HA_CREATE_INFO
*
create_info
);
virtual
void
update_create_info
(
HA_CREATE_INFO
*
create_info
);
virtual
char
*
update_table_comment
(
const
char
*
comment
);
virtual
char
*
update_table_comment
(
const
char
*
comment
);
virtual
int
change_partitions
(
HA_CREATE_INFO
*
create_info
,
virtual
int
change_partitions
(
HA_CREATE_INFO
*
create_info
,
...
...
sql/handler.cc
View file @
db7809e8
...
@@ -3844,11 +3844,11 @@ handler::ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info)
...
@@ -3844,11 +3844,11 @@ handler::ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info)
int
int
handler
::
ha_create_partitioning_metadata
(
const
char
*
name
,
const
char
*
old_name
,
handler
::
ha_create_partitioning_metadata
(
const
char
*
name
,
const
char
*
old_name
,
int
action_flag
,
HA_CREATE_INFO
*
info
)
int
action_flag
)
{
{
mark_trx_read_write
();
mark_trx_read_write
();
return
create_partitioning_metadata
(
name
,
old_name
,
action_flag
,
info
);
return
create_partitioning_metadata
(
name
,
old_name
,
action_flag
);
}
}
...
...
sql/handler.h
View file @
db7809e8
...
@@ -2067,7 +2067,7 @@ public:
...
@@ -2067,7 +2067,7 @@ public:
int
ha_create
(
const
char
*
name
,
TABLE
*
form
,
HA_CREATE_INFO
*
info
);
int
ha_create
(
const
char
*
name
,
TABLE
*
form
,
HA_CREATE_INFO
*
info
);
int
ha_create_partitioning_metadata
(
const
char
*
name
,
const
char
*
old_name
,
int
ha_create_partitioning_metadata
(
const
char
*
name
,
const
char
*
old_name
,
int
action_flag
,
HA_CREATE_INFO
*
info
);
int
action_flag
);
int
ha_change_partitions
(
HA_CREATE_INFO
*
create_info
,
int
ha_change_partitions
(
HA_CREATE_INFO
*
create_info
,
const
char
*
path
,
const
char
*
path
,
...
@@ -3007,7 +3007,7 @@ private:
...
@@ -3007,7 +3007,7 @@ private:
virtual
int
create
(
const
char
*
name
,
TABLE
*
form
,
HA_CREATE_INFO
*
info
)
=
0
;
virtual
int
create
(
const
char
*
name
,
TABLE
*
form
,
HA_CREATE_INFO
*
info
)
=
0
;
virtual
int
create_partitioning_metadata
(
const
char
*
name
,
const
char
*
old_name
,
virtual
int
create_partitioning_metadata
(
const
char
*
name
,
const
char
*
old_name
,
int
action_flag
,
HA_CREATE_INFO
*
info
)
int
action_flag
)
{
return
FALSE
;
}
{
return
FALSE
;
}
virtual
int
change_partitions
(
HA_CREATE_INFO
*
create_info
,
virtual
int
change_partitions
(
HA_CREATE_INFO
*
create_info
,
...
...
sql/sql_table.cc
View file @
db7809e8
...
@@ -1713,7 +1713,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
...
@@ -1713,7 +1713,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
my_free
(
const_cast
<
uchar
*>
(
frm
.
str
));
my_free
(
const_cast
<
uchar
*>
(
frm
.
str
));
if
(
error
||
lpt
->
table
->
file
->
ha_create_partitioning_metadata
(
shadow_path
,
if
(
error
||
lpt
->
table
->
file
->
ha_create_partitioning_metadata
(
shadow_path
,
NULL
,
CHF_CREATE_FLAG
,
lpt
->
create_info
))
NULL
,
CHF_CREATE_FLAG
))
{
{
mysql_file_delete
(
key_file_frm
,
shadow_frm_name
,
MYF
(
0
));
mysql_file_delete
(
key_file_frm
,
shadow_frm_name
,
MYF
(
0
));
error
=
1
;
error
=
1
;
...
@@ -1765,13 +1765,13 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
...
@@ -1765,13 +1765,13 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
if
(
mysql_file_delete
(
key_file_frm
,
frm_name
,
MYF
(
MY_WME
))
||
if
(
mysql_file_delete
(
key_file_frm
,
frm_name
,
MYF
(
MY_WME
))
||
#ifdef WITH_PARTITION_STORAGE_ENGINE
#ifdef WITH_PARTITION_STORAGE_ENGINE
lpt
->
table
->
file
->
ha_create_partitioning_metadata
(
path
,
shadow_path
,
lpt
->
table
->
file
->
ha_create_partitioning_metadata
(
path
,
shadow_path
,
CHF_DELETE_FLAG
,
NULL
)
||
CHF_DELETE_FLAG
)
||
deactivate_ddl_log_entry
(
part_info
->
frm_log_entry
->
entry_pos
)
||
deactivate_ddl_log_entry
(
part_info
->
frm_log_entry
->
entry_pos
)
||
(
sync_ddl_log
(),
FALSE
)
||
(
sync_ddl_log
(),
FALSE
)
||
mysql_file_rename
(
key_file_frm
,
mysql_file_rename
(
key_file_frm
,
shadow_frm_name
,
frm_name
,
MYF
(
MY_WME
))
||
shadow_frm_name
,
frm_name
,
MYF
(
MY_WME
))
||
lpt
->
table
->
file
->
ha_create_partitioning_metadata
(
path
,
shadow_path
,
lpt
->
table
->
file
->
ha_create_partitioning_metadata
(
path
,
shadow_path
,
CHF_RENAME_FLAG
,
NULL
))
CHF_RENAME_FLAG
))
#else
#else
mysql_file_rename
(
key_file_frm
,
mysql_file_rename
(
key_file_frm
,
shadow_frm_name
,
frm_name
,
MYF
(
MY_WME
)))
shadow_frm_name
,
frm_name
,
MYF
(
MY_WME
)))
...
@@ -4048,7 +4048,7 @@ static bool check_if_created_table_can_be_opened(THD *thd,
...
@@ -4048,7 +4048,7 @@ static bool check_if_created_table_can_be_opened(THD *thd,
/*
/*
It is impossible to open definition of partitioned table without .par file.
It is impossible to open definition of partitioned table without .par file.
*/
*/
if
(
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_CREATE_FLAG
,
create_info
))
if
(
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_CREATE_FLAG
))
return
TRUE
;
return
TRUE
;
init_tmp_table_share
(
thd
,
&
share
,
db
,
0
,
table_name
,
path
);
init_tmp_table_share
(
thd
,
&
share
,
db
,
0
,
table_name
,
path
);
...
@@ -4060,7 +4060,7 @@ static bool check_if_created_table_can_be_opened(THD *thd,
...
@@ -4060,7 +4060,7 @@ static bool check_if_created_table_can_be_opened(THD *thd,
(
void
)
closefrm
(
&
table
,
0
);
(
void
)
closefrm
(
&
table
,
0
);
free_table_share
(
&
share
);
free_table_share
(
&
share
);
(
void
)
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_DELETE_FLAG
,
create_info
);
(
void
)
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_DELETE_FLAG
);
return
result
;
return
result
;
}
}
#endif
#endif
...
@@ -7172,8 +7172,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
...
@@ -7172,8 +7172,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
/* Tell the handler that a new frm file is in place. */
/* Tell the handler that a new frm file is in place. */
error
=
t_table_list
->
table
->
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
error
=
t_table_list
->
table
->
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_INDEX_FLAG
,
CHF_INDEX_FLAG
);
create_info
);
DBUG_ASSERT
(
thd
->
open_tables
==
t_table_list
->
table
);
DBUG_ASSERT
(
thd
->
open_tables
==
t_table_list
->
table
);
close_thread_table
(
thd
,
&
thd
->
open_tables
);
close_thread_table
(
thd
,
&
thd
->
open_tables
);
...
...
sql/unireg.cc
View file @
db7809e8
...
@@ -384,12 +384,10 @@ int rea_create_table(THD *thd, LEX_CUSTRING *frm,
...
@@ -384,12 +384,10 @@ int rea_create_table(THD *thd, LEX_CUSTRING *frm,
if
(
thd
->
variables
.
keep_files_on_create
)
if
(
thd
->
variables
.
keep_files_on_create
)
create_info
->
options
|=
HA_CREATE_KEEP_FILES
;
create_info
->
options
|=
HA_CREATE_KEEP_FILES
;
if
(
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_CREATE_FLAG
,
if
(
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_CREATE_FLAG
)
||
create_info
)
||
ha_create_table
(
thd
,
path
,
db
,
table_name
,
create_info
,
frm
))
ha_create_table
(
thd
,
path
,
db
,
table_name
,
create_info
,
frm
))
{
{
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_DELETE_FLAG
,
file
->
ha_create_partitioning_metadata
(
path
,
NULL
,
CHF_DELETE_FLAG
);
create_info
);
goto
err_handler
;
goto
err_handler
;
}
}
}
}
...
...
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