diff options
| author | Brandon Nesterenko <brandon.nesterenko@mariadb.com> | 2021-12-21 14:42:32 -0700 |
|---|---|---|
| committer | Brandon Nesterenko <brandon.nesterenko@mariadb.com> | 2021-12-21 14:42:58 -0700 |
| commit | 68f3175dc058968c69cad86031c2643d622f055f (patch) | |
| tree | edd3787ed0e7897dff05b862595e496c7ca15fea | |
| parent | 946dafb260fc5683e1ec1410a801f2235ba2313a (diff) | |
| download | mariadb-git-10.6-MDEV-26919.tar.gz | |
MDEV-26919 Fixed assert10.6-MDEV-26919
Temporary branch used for testing on buildbot
| -rw-r--r-- | sql/log_event_server.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index 1d8b65f20dd..25bf7f1404d 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -3296,7 +3296,8 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg, (thd->lex->sql_command == SQLCOM_XA_PREPARE || xid_state.get_state_code() == XA_PREPARED)) { - DBUG_ASSERT(thd->lex->xa_opt != XA_ONE_PHASE); + DBUG_ASSERT(thd->lex->sql_command == SQLCOM_XA_PREPARE || + thd->lex->xa_opt != XA_ONE_PHASE); flags2|= thd->lex->sql_command == SQLCOM_XA_PREPARE ? FL_PREPARED_XA : FL_COMPLETED_XA; |