database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

MDEV-24966 fixup: cmake -DWITH_WSREP=OFF

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-14 12:31:51 +03:00
parent a1e70388c4
commit 72e0601d11
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@ -1206,8 +1206,14 @@ dispatch_command_return do_command(THD *thd, bool blocking)
enum enum_server_command command; enum enum_server_command command;
DBUG_ENTER("do_command"); DBUG_ENTER("do_command");
#ifdef WITH_WSREP
DBUG_ASSERT(!thd->async_state.pending_ops() || DBUG_ASSERT(!thd->async_state.pending_ops() ||
(WSREP(thd) && thd->wsrep_trx().state() == wsrep::transaction::s_aborted)); (WSREP(thd) &&
thd->wsrep_trx().state() == wsrep::transaction::s_aborted));
#else
DBUG_ASSERT(!thd->async_state.pending_ops());
#endif
if (thd->async_state.m_state == thd_async_state::enum_async_state::RESUMED) if (thd->async_state.m_state == thd_async_state::enum_async_state::RESUMED)
{ {
/* /*