mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post-merge fix: DBUG macros are wrapped inside a loop.

Browse source 
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:
Davi Arnaut 2009-09-30 19:14:55 -03:00
parent 565f1bc4a1
commit e218ac06ed
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/sql_parse.cc
View file

@ -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,
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)
{ {