Commit 3372cc87 authored by Davi Arnaut's avatar Davi Arnaut

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.
parent f474f75b
...@@ -2177,7 +2177,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2177,7 +2177,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
my_pthread_setspecific_ptr(THR_THD, thd); my_pthread_setspecific_ptr(THR_THD, thd);
if (!res) if (!res)
send_ok(thd); send_ok(thd);
break; goto end;
} }
); );
#endif #endif
...@@ -2318,6 +2318,12 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -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)); my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
break; break;
} }
/* Break the switch for DBUG wrapped code. */
#ifndef DBUG_OFF
end:
#endif
if (thd->lock || thd->open_tables || thd->derived_tables || if (thd->lock || thd->open_tables || thd->derived_tables ||
thd->prelocked_mode) thd->prelocked_mode)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment