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
b3179b7e
Commit
b3179b7e
authored
Jun 10, 2020
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaned up compile failure if DEBUG_SYNC is disabled in DEBUG builds
parent
7f941c4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
sql/wsrep_high_priority_service.cc
sql/wsrep_high_priority_service.cc
+2
-2
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/ha_rocksdb.cc
+2
-0
No files found.
sql/wsrep_high_priority_service.cc
View file @
b3179b7e
...
@@ -508,11 +508,11 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
...
@@ -508,11 +508,11 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
thd_proc_info
(
thd
,
"applying write set"
);
thd_proc_info
(
thd
,
"applying write set"
);
#ifdef ENABLED_DEBUG_SYNC
/* moved dbug sync point here, after possible THD switch for SR transactions
/* moved dbug sync point here, after possible THD switch for SR transactions
has ben done
has ben done
*/
*/
/* Allow tests to block the applier thread using the DBUG facilities */
/* Allow tests to block the applier thread using the DBUG facilities */
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF
(
"sync.wsrep_apply_cb"
,
DBUG_EXECUTE_IF
(
"sync.wsrep_apply_cb"
,
{
{
const
char
act
[]
=
const
char
act
[]
=
...
@@ -522,7 +522,7 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
...
@@ -522,7 +522,7 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
DBUG_ASSERT
(
!
debug_sync_set_action
(
thd
,
DBUG_ASSERT
(
!
debug_sync_set_action
(
thd
,
STRING_WITH_LEN
(
act
)));
STRING_WITH_LEN
(
act
)));
};);
};);
#endif
#endif
/* ENABLED_DEBUG_SYNC */
wsrep_setup_uk_and_fk_checks
(
thd
);
wsrep_setup_uk_and_fk_checks
(
thd
);
int
ret
=
apply_events
(
thd
,
m_rli
,
data
,
err
);
int
ret
=
apply_events
(
thd
,
m_rli
,
data
,
err
);
...
...
storage/rocksdb/ha_rocksdb.cc
View file @
b3179b7e
...
@@ -8977,6 +8977,7 @@ int ha_rocksdb::get_row_by_rowid(uchar *const buf, const char *const rowid,
...
@@ -8977,6 +8977,7 @@ int ha_rocksdb::get_row_by_rowid(uchar *const buf, const char *const rowid,
Rdb_transaction
*
const
tx
=
get_or_create_tx
(
table
->
in_use
);
Rdb_transaction
*
const
tx
=
get_or_create_tx
(
table
->
in_use
);
DBUG_ASSERT
(
tx
!=
nullptr
);
DBUG_ASSERT
(
tx
!=
nullptr
);
#ifdef ENABLED_DEBUG_SYNC
DEBUG_SYNC
(
ha_thd
(),
"rocksdb.get_row_by_rowid"
);
DEBUG_SYNC
(
ha_thd
(),
"rocksdb.get_row_by_rowid"
);
DBUG_EXECUTE_IF
(
"dbug.rocksdb.get_row_by_rowid"
,
{
DBUG_EXECUTE_IF
(
"dbug.rocksdb.get_row_by_rowid"
,
{
THD
*
thd
=
ha_thd
();
THD
*
thd
=
ha_thd
();
...
@@ -8986,6 +8987,7 @@ int ha_rocksdb::get_row_by_rowid(uchar *const buf, const char *const rowid,
...
@@ -8986,6 +8987,7 @@ int ha_rocksdb::get_row_by_rowid(uchar *const buf, const char *const rowid,
DBUG_ASSERT
(
opt_debug_sync_timeout
>
0
);
DBUG_ASSERT
(
opt_debug_sync_timeout
>
0
);
DBUG_ASSERT
(
!
debug_sync_set_action
(
thd
,
STRING_WITH_LEN
(
act
)));
DBUG_ASSERT
(
!
debug_sync_set_action
(
thd
,
STRING_WITH_LEN
(
act
)));
};);
};);
#endif
/* ENABLED_DEBUG_SYNC */
bool
found
;
bool
found
;
rocksdb
::
Status
s
;
rocksdb
::
Status
s
;
...
...
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