database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-15580: Assertion `!lex->explain' failed in lex_start(THD*):

Browse Source 
Problem was that we did not delete explain information
when Galera must replay a query.

Could not find easily repeatable test case that would not
cause other problems.
This commit is contained in:
Jan Lindström
2018-04-12 16:02:25 +03:00
parent c2dc72c0c3
commit 82e968197a
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

@ -7201,6 +7201,8 @@ static void wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
if (thd->wsrep_conflict_state == MUST_REPLAY) if (thd->wsrep_conflict_state == MUST_REPLAY)
{ {
if (thd->lex->explain)
delete_explain_query(thd->lex);
wsrep_replay_transaction(thd); wsrep_replay_transaction(thd);
} }
@ -7251,8 +7253,12 @@ static void wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
} }
/* If retry is requested clean up explain structure */ /* If retry is requested clean up explain structure */
if (thd->wsrep_conflict_state == RETRY_AUTOCOMMIT && thd->lex->explain) if ((thd->wsrep_conflict_state == RETRY_AUTOCOMMIT ||
thd->wsrep_conflict_state == MUST_REPLAY )
&& thd->lex->explain)
{
delete_explain_query(thd->lex); delete_explain_query(thd->lex);
}
} while (thd->wsrep_conflict_state== RETRY_AUTOCOMMIT); } while (thd->wsrep_conflict_state== RETRY_AUTOCOMMIT);