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

Post-merge cleanup: Reorganize code for better comprehensibility.

Browse Source 
Removes the need of a hack (the jump to label).
This commit is contained in:
Davi Arnaut
2009-09-30 19:59:30 -03:00
parent e218ac06ed
commit 3c5d9f4272
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
sql/sql_parse.cc
View File

@ -2162,26 +2162,27 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break;
mysql_log.write(thd,command,NullS);
#ifndef DBUG_OFF
DBUG_EXECUTE_IF("simulate_detached_thread_refresh",
{
/*
Simulate a reload without a attached thread session.
Provides a environment similar to that of when the
server receives a SIGHUP signal and reloads caches
and flushes tables.
*/
bool res;
my_pthread_setspecific_ptr(THR_THD, NULL);
res= reload_acl_and_cache(NULL, options | REFRESH_FAST,
NULL, &not_used);
my_pthread_setspecific_ptr(THR_THD, thd);
if (!res)
send_ok(thd);
goto end;
}
);
bool debug_simulate= FALSE;
DBUG_EXECUTE_IF("simulate_detached_thread_refresh", debug_simulate= TRUE;);
if (debug_simulate)
{
/*
Simulate a reload without a attached thread session.
Provides a environment similar to that of when the
server receives a SIGHUP signal and reloads caches
and flushes tables.
*/
bool res;
my_pthread_setspecific_ptr(THR_THD, NULL);
res= reload_acl_and_cache(NULL, options | REFRESH_FAST,
NULL, &not_used);
my_pthread_setspecific_ptr(THR_THD, thd);
if (!res)
send_ok(thd);
break;
}
#endif
if (!reload_acl_and_cache(thd, options, (TABLE_LIST*) 0, &not_used))
if (!reload_acl_and_cache(thd, options, NULL, &not_used))
send_ok(thd);
break;
}
@ -2319,11 +2320,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
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)
{