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

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34726/my51-bug34726

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
This commit is contained in:
cmiller@zippy.cornsilk.net 2008-03-05 17:13:00 -05:00
commit b80f05181b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@ -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