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
c997af7d
Commit
c997af7d
authored
Sep 23, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove reference to dict_sys->mutex
parent
631c5ab4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
13 deletions
+3
-13
storage/innobase/trx/trx0trx.cc
storage/innobase/trx/trx0trx.cc
+3
-13
No files found.
storage/innobase/trx/trx0trx.cc
View file @
c997af7d
...
@@ -1273,16 +1273,10 @@ trx_update_mod_tables_timestamp(
...
@@ -1273,16 +1273,10 @@ trx_update_mod_tables_timestamp(
trx_mod_tables_t
::
const_iterator
end
=
trx
->
mod_tables
.
end
();
trx_mod_tables_t
::
const_iterator
end
=
trx
->
mod_tables
.
end
();
#ifdef UNIV_DEBUG
#ifdef UNIV_DEBUG
# if MYSQL_VERSION_ID >= 100405
# define dict_sys_mutex dict_sys.mutex
# else
# define dict_sys_mutex dict_sys->mutex
# endif
const
bool
preserve_tables
=
!
innodb_evict_tables_on_commit_debug
const
bool
preserve_tables
=
!
innodb_evict_tables_on_commit_debug
||
trx
->
is_recovered
/* avoid trouble with XA recovery */
||
trx
->
is_recovered
/* avoid trouble with XA recovery */
# if 1
/* if dict_stats_exec_sql() were not playing dirty tricks */
# if 1
/* if dict_stats_exec_sql() were not playing dirty tricks */
||
mutex_own
(
&
dict_sys
_
mutex
)
||
mutex_own
(
&
dict_sys
.
mutex
)
# else
/* this would be more proper way to do it */
# else
/* this would be more proper way to do it */
||
trx
->
dict_operation_lock_mode
||
trx
->
dict_operation
||
trx
->
dict_operation_lock_mode
||
trx
->
dict_operation
# endif
# endif
...
@@ -1312,15 +1306,11 @@ trx_update_mod_tables_timestamp(
...
@@ -1312,15 +1306,11 @@ trx_update_mod_tables_timestamp(
}
}
/* recheck while holding the mutex that blocks
/* recheck while holding the mutex that blocks
table->acquire() */
table->acquire() */
mutex_enter
(
&
dict_sys
_
mutex
);
mutex_enter
(
&
dict_sys
.
mutex
);
if
(
!
table
->
get_ref_count
())
{
if
(
!
table
->
get_ref_count
())
{
# if MYSQL_VERSION_ID >= 100405
dict_sys
.
remove
(
table
,
true
);
dict_sys
.
remove
(
table
,
true
);
# else
dict_table_remove_from_cache_low
(
table
,
true
);
# endif
}
}
mutex_exit
(
&
dict_sys
_
mutex
);
mutex_exit
(
&
dict_sys
.
mutex
);
#endif
#endif
}
}
...
...
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