1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge.

Browse Source
This commit is contained in:
Davi Arnaut 2009-09-30 20:06:08 -03:00
commit 289f4a4083
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sql/sql_parse.cc
View File

@ -1429,24 +1429,25 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; break;
general_log_print(thd, command, NullS); general_log_print(thd, command, NullS);
#ifndef DBUG_OFF #ifndef DBUG_OFF
DBUG_EXECUTE_IF("simulate_detached_thread_refresh", 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 Simulate a reload without a attached thread session.
and flushes tables. Provides a environment similar to that of when the
*/ server receives a SIGHUP signal and reloads caches
bool res; and flushes tables.
my_pthread_setspecific_ptr(THR_THD, NULL); */
res= reload_acl_and_cache(NULL, options | REFRESH_FAST, bool res;
NULL, &not_used); my_pthread_setspecific_ptr(THR_THD, NULL);
my_pthread_setspecific_ptr(THR_THD, thd); res= reload_acl_and_cache(NULL, options | REFRESH_FAST,
if (!res) NULL, &not_used);
my_ok(thd); my_pthread_setspecific_ptr(THR_THD, thd);
goto end; if (!res)
} my_ok(thd);
); break;
}
#endif #endif
if (!reload_acl_and_cache(thd, options, NULL, &not_used)) if (!reload_acl_and_cache(thd, options, NULL, &not_used))
my_ok(thd); my_ok(thd);
@ -1591,11 +1592,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; break;
} }
/* Break the switch for DBUG wrapped code. */
#ifndef DBUG_OFF
end:
#endif
/* report error issued during command execution */ /* report error issued during command execution */
if (thd->killed_errno()) if (thd->killed_errno())
{ {