Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34726/my51-bug34726
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
This commit is contained in:
commit
b80f05181b
@ -253,7 +253,8 @@ const char *set_thd_proc_info(THD *thd, const char *info,
|
|||||||
const unsigned int calling_line)
|
const unsigned int calling_line)
|
||||||
{
|
{
|
||||||
const char *old_info= thd->proc_info;
|
const char *old_info= thd->proc_info;
|
||||||
DBUG_PRINT("proc_info", ("%s:%d %s", calling_file, calling_line, info));
|
DBUG_PRINT("proc_info", ("%s:%d %s", calling_file, calling_line,
|
||||||
|
(info != NULL) ? info : "(null)"));
|
||||||
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
|
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
|
||||||
thd->profiling.status_change(info, calling_function, calling_file, calling_line);
|
thd->profiling.status_change(info, calling_function, calling_file, calling_line);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user