diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-03-05 17:13:00 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-03-05 17:13:00 -0500 |
| commit | 5521666f65216d832f69dc06810999a6d13cd198 (patch) | |
| tree | b4cfd6da0bc117dd0e47cec202b604984c5e1ea3 | |
| parent | f6d51ae79fa3dc0e85f3f7d843b0b9b79db2ede8 (diff) | |
| parent | b6595704efebe3678b5696996bd84d35e3511256 (diff) | |
| download | mariadb-git-5521666f65216d832f69dc06810999a6d13cd198.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34726/my51-bug34726
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
sql/sql_class.cc:
Auto merged
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 376102c8bf9..6d5dd556f1d 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -253,7 +253,8 @@ const char *set_thd_proc_info(THD *thd, const char *info, const unsigned int calling_line) { 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) thd->profiling.status_change(info, calling_function, calling_file, calling_line); #endif |