mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
Post-merge fix: DBUG macros are wrapped inside a loop.
sql/sql_parse.cc: DBUG macros are wrapped inside a loop. Allow to break the command switch from within a DBUG macro.
This commit is contained in:
parent
565f1bc4a1
commit
e218ac06ed
1 changed files with 7 additions and 1 deletions
|
@ -2177,7 +2177,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
|
|||
my_pthread_setspecific_ptr(THR_THD, thd);
|
||||
if (!res)
|
||||
send_ok(thd);
|
||||
break;
|
||||
goto end;
|
||||
}
|
||||
);
|
||||
#endif
|
||||
|
@ -2318,6 +2318,12 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
|
|||
my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
|
||||
break;
|
||||
}
|
||||
|
||||
/* Break the switch for DBUG wrapped code. */
|
||||
#ifndef DBUG_OFF
|
||||
end:
|
||||
#endif
|
||||
|
||||
if (thd->lock || thd->open_tables || thd->derived_tables ||
|
||||
thd->prelocked_mode)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue