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
3692bd32
Commit
3692bd32
authored
Dec 29, 2015
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-9488 - Table cache cleanups
Cleanup now unused arguments of tdc_open_view().
parent
c1d1c598
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
19 deletions
+4
-19
sql/sql_base.cc
sql/sql_base.cc
+2
-8
sql/sql_base.h
sql/sql_base.h
+1
-10
sql/sql_view.cc
sql/sql_view.cc
+1
-1
No files found.
sql/sql_base.cc
View file @
3692bd32
...
@@ -2300,8 +2300,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
...
@@ -2300,8 +2300,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
DBUG_RETURN
(
true
);
DBUG_RETURN
(
true
);
}
}
if
(
!
tdc_open_view
(
thd
,
table_list
,
alias
,
key
,
key_length
,
if
(
!
tdc_open_view
(
thd
,
table_list
,
CHECK_METADATA_VERSION
))
CHECK_METADATA_VERSION
))
{
{
DBUG_ASSERT
(
table_list
->
view
!=
0
);
DBUG_ASSERT
(
table_list
->
view
!=
0
);
DBUG_RETURN
(
FALSE
);
// VIEW
DBUG_RETURN
(
FALSE
);
// VIEW
...
@@ -3269,9 +3268,6 @@ check_and_update_routine_version(THD *thd, Sroutine_hash_entry *rt,
...
@@ -3269,9 +3268,6 @@ check_and_update_routine_version(THD *thd, Sroutine_hash_entry *rt,
@param thd Thread handle
@param thd Thread handle
@param table_list TABLE_LIST with db, table_name & belong_to_view
@param table_list TABLE_LIST with db, table_name & belong_to_view
@param alias Alias name
@param cache_key Key for table definition cache
@param cache_key_length Length of cache_key
@param flags Flags which modify how we open the view
@param flags Flags which modify how we open the view
@todo This function is needed for special handling of views under
@todo This function is needed for special handling of views under
...
@@ -3280,9 +3276,7 @@ check_and_update_routine_version(THD *thd, Sroutine_hash_entry *rt,
...
@@ -3280,9 +3276,7 @@ check_and_update_routine_version(THD *thd, Sroutine_hash_entry *rt,
@return FALSE if success, TRUE - otherwise.
@return FALSE if success, TRUE - otherwise.
*/
*/
bool
tdc_open_view
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
const
char
*
alias
,
bool
tdc_open_view
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
uint
flags
)
const
char
*
cache_key
,
uint
cache_key_length
,
uint
flags
)
{
{
TABLE
not_used
;
TABLE
not_used
;
TABLE_SHARE
*
share
;
TABLE_SHARE
*
share
;
...
...
sql/sql_base.h
View file @
3692bd32
...
@@ -305,16 +305,7 @@ void close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
...
@@ -305,16 +305,7 @@ void close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
ha_extra_function
extra
,
ha_extra_function
extra
,
TABLE
*
skip_table
);
TABLE
*
skip_table
);
OPEN_TABLE_LIST
*
list_open_tables
(
THD
*
thd
,
const
char
*
db
,
const
char
*
wild
);
OPEN_TABLE_LIST
*
list_open_tables
(
THD
*
thd
,
const
char
*
db
,
const
char
*
wild
);
bool
tdc_open_view
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
const
char
*
alias
,
bool
tdc_open_view
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
uint
flags
);
const
char
*
cache_key
,
uint
cache_key_length
,
uint
flags
);
static
inline
bool
tdc_open_view
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
const
char
*
alias
,
uint
flags
)
{
const
char
*
key
;
uint
key_length
=
get_table_def_key
(
table_list
,
&
key
);
return
tdc_open_view
(
thd
,
table_list
,
alias
,
key
,
key_length
,
flags
);
}
TABLE
*
find_table_for_mdl_upgrade
(
THD
*
thd
,
const
char
*
db
,
TABLE
*
find_table_for_mdl_upgrade
(
THD
*
thd
,
const
char
*
db
,
const
char
*
table_name
,
const
char
*
table_name
,
...
...
sql/sql_view.cc
View file @
3692bd32
...
@@ -215,7 +215,7 @@ fill_defined_view_parts (THD *thd, TABLE_LIST *view)
...
@@ -215,7 +215,7 @@ fill_defined_view_parts (THD *thd, TABLE_LIST *view)
TABLE_LIST
decoy
;
TABLE_LIST
decoy
;
memcpy
(
&
decoy
,
view
,
sizeof
(
TABLE_LIST
));
memcpy
(
&
decoy
,
view
,
sizeof
(
TABLE_LIST
));
if
(
tdc_open_view
(
thd
,
&
decoy
,
decoy
.
alias
,
OPEN_VIEW_NO_PARSE
))
if
(
tdc_open_view
(
thd
,
&
decoy
,
OPEN_VIEW_NO_PARSE
))
return
TRUE
;
return
TRUE
;
if
(
!
lex
->
definer
)
if
(
!
lex
->
definer
)
...
...
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