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
5822d316
Commit
5822d316
authored
Sep 09, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Follow-up to MDEV-13407: Remove fil_wait_crypt_bg_threads()
parents
4c0d391c
99e36a71
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
33 deletions
+0
-33
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0mysql.cc
+0
-33
No files found.
storage/innobase/row/row0mysql.cc
View file @
5822d316
...
@@ -3312,36 +3312,6 @@ row_mysql_lock_table(
...
@@ -3312,36 +3312,6 @@ row_mysql_lock_table(
return
(
err
);
return
(
err
);
}
}
static
void
fil_wait_crypt_bg_threads
(
dict_table_t
*
table
)
{
time_t
start
=
time
(
0
);
time_t
last
=
start
;
while
(
table
->
get_ref_count
()
>
0
)
{
dict_mutex_exit_for_mysql
();
os_thread_sleep
(
20000
);
dict_mutex_enter_for_mysql
();
time_t
now
=
time
(
0
);
if
(
now
>=
last
+
30
)
{
ib
::
warn
()
<<
"Waited "
<<
now
-
start
<<
" seconds for ref-count on table "
<<
table
->
name
;
last
=
now
;
}
if
(
now
>=
start
+
300
)
{
ib
::
warn
()
<<
"After "
<<
now
-
start
<<
" seconds, gave up waiting "
<<
"for ref-count on table "
<<
table
->
name
;
break
;
}
}
}
/** Drop ancillary FTS tables as part of dropping a table.
/** Drop ancillary FTS tables as part of dropping a table.
@param[in,out] table Table cache entry
@param[in,out] table Table cache entry
@param[in,out] trx Transaction handle
@param[in,out] trx Transaction handle
...
@@ -3685,9 +3655,6 @@ row_drop_table_for_mysql(
...
@@ -3685,9 +3655,6 @@ row_drop_table_for_mysql(
shouldn't have to. There should never be record locks on a table
shouldn't have to. There should never be record locks on a table
that is going to be dropped. */
that is going to be dropped. */
/* Wait on background threads to stop using table */
fil_wait_crypt_bg_threads
(
table
);
if
(
table
->
get_ref_count
()
>
0
||
table
->
n_rec_locks
>
0
if
(
table
->
get_ref_count
()
>
0
||
table
->
n_rec_locks
>
0
||
lock_table_has_locks
(
table
))
{
||
lock_table_has_locks
(
table
))
{
goto
defer
;
goto
defer
;
...
...
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