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
581aebe2
Commit
581aebe2
authored
4 years ago
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-24167: Fix -DPLUGIN_PERFSCHEMA=NO and Windows debug builds
parent
4e359eb8
Branches unavailable
Tags unavailable
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
8 deletions
+14
-8
storage/innobase/dict/dict0dict.cc
storage/innobase/dict/dict0dict.cc
+1
-1
storage/innobase/fil/fil0fil.cc
storage/innobase/fil/fil0fil.cc
+1
-1
storage/innobase/include/btr0sea.h
storage/innobase/include/btr0sea.h
+1
-1
storage/innobase/include/srw_lock.h
storage/innobase/include/srw_lock.h
+9
-3
storage/innobase/trx/trx0i_s.cc
storage/innobase/trx/trx0i_s.cc
+1
-1
storage/innobase/trx/trx0purge.cc
storage/innobase/trx/trx0purge.cc
+1
-1
No files found.
storage/innobase/dict/dict0dict.cc
View file @
581aebe2
...
...
@@ -1038,7 +1038,7 @@ void dict_sys_t::create()
table_id_hash
.
create
(
hash_size
);
temp_id_hash
.
create
(
hash_size
);
latch
.
init
(
dict_operation_lock_key
);
latch
.
SRW_LOCK_INIT
(
dict_operation_lock_key
);
if
(
!
srv_read_only_mode
)
{
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/fil/fil0fil.cc
View file @
581aebe2
...
...
@@ -957,7 +957,7 @@ fil_space_t *fil_space_t::create(const char *name, ulint id, ulint flags,
<<
" "
<<
fil_crypt_get_type
(
crypt_data
));
}
space
->
latch
.
init
(
fil_space_latch_key
);
space
->
latch
.
SRW_LOCK_INIT
(
fil_space_latch_key
);
if
(
space
->
purpose
==
FIL_TYPE_TEMPORARY
)
{
/* SysTablespace::open_or_create() would pass
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/include/btr0sea.h
View file @
581aebe2
...
...
@@ -250,7 +250,7 @@ struct btr_search_sys_t
void
init
()
{
memset
((
void
*
)
this
,
0
,
sizeof
*
this
);
latch
.
init
(
btr_search_latch_key
);
latch
.
SRW_LOCK_INIT
(
btr_search_latch_key
);
}
void
alloc
(
ulint
hash_size
)
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/include/srw_lock.h
View file @
581aebe2
...
...
@@ -32,6 +32,12 @@ this program; if not, write to the Free Software Foundation, Inc.,
# endif
#endif
#ifdef UNIV_PFS_RWLOCK
# define SRW_LOCK_INIT(key) init(key)
#else
# define SRW_LOCK_INIT(key) init()
#endif
class
srw_lock
final
#if defined __linux__ && !defined SRW_LOCK_DUMMY
:
protected
rw_lock
...
...
@@ -40,7 +46,7 @@ class srw_lock final
#if defined SRW_LOCK_DUMMY || (!defined _WIN32 && !defined __linux__)
mysql_rwlock_t
lock
;
public:
void
init
(
mysql_pfs_key_t
key
)
{
mysql_rwlock_init
(
key
,
&
lock
);
}
void
SRW_LOCK_INIT
(
mysql_pfs_key_t
key
)
{
mysql_rwlock_init
(
key
,
&
lock
);
}
void
destroy
()
{
mysql_rwlock_destroy
(
&
lock
);
}
void
rd_lock
()
{
mysql_rwlock_rdlock
(
&
lock
);
}
void
rd_unlock
()
{
mysql_rwlock_unlock
(
&
lock
);
}
...
...
@@ -67,7 +73,7 @@ class srw_lock final
# endif
public:
void
init
(
mysql_pfs_key_t
key
)
void
SRW_LOCK_INIT
(
mysql_pfs_key_t
key
)
{
# ifdef UNIV_PFS_RWLOCK
pfs_psi
=
PSI_RWLOCK_CALL
(
init_rwlock
)(
key
,
this
);
...
...
@@ -83,7 +89,7 @@ class srw_lock final
pfs_psi
=
nullptr
;
}
# endif
DBUG_ASSERT
(
!
is_locked_or_waiting
(
));
IF_WIN
(,
DBUG_ASSERT
(
!
is_locked_or_waiting
()
));
}
void
rd_lock
()
{
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/trx/trx0i_s.cc
View file @
581aebe2
...
...
@@ -1263,7 +1263,7 @@ trx_i_s_cache_init(
acquire trx_i_s_cache_t::rw_lock, rdlock
release trx_i_s_cache_t::rw_lock */
cache
->
rw_lock
.
init
(
trx_i_s_cache_lock_key
);
cache
->
rw_lock
.
SRW_LOCK_INIT
(
trx_i_s_cache_lock_key
);
cache
->
last_read
=
0
;
...
...
This diff is collapsed.
Click to expand it.
storage/innobase/trx/trx0purge.cc
View file @
581aebe2
...
...
@@ -175,7 +175,7 @@ void purge_sys_t::create()
offset
=
0
;
hdr_page_no
=
0
;
hdr_offset
=
0
;
latch
.
init
(
trx_purge_latch_key
);
latch
.
SRW_LOCK_INIT
(
trx_purge_latch_key
);
mutex_create
(
LATCH_ID_PURGE_SYS_PQ
,
&
pq_mutex
);
truncate
.
current
=
NULL
;
truncate
.
last
=
NULL
;
...
...
This diff is collapsed.
Click to expand it.
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