diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
| commit | 3797ca41b39c862cf4733eadea8c91ed138ca1a4 (patch) | |
| tree | ec51a2bcd2a7c071f89d3177ca7914dccd111c9f /sql/sql_class.cc | |
| parent | 5789f96c624d00aeef137602ab0c4828620748e8 (diff) | |
| parent | 3bac9cf7fe12c1b1c644ac7963c701b79b3127f3 (diff) | |
| download | mariadb-git-3797ca41b39c862cf4733eadea8c91ed138ca1a4.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index cac9b624bae..20898d68500 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -327,7 +327,7 @@ const char *set_thd_proc_info(THD *thd, const char *info, const char *old_info= thd->proc_info; DBUG_PRINT("proc_info", ("%s:%d %s", calling_file, calling_line, - (info != NULL) ? info : "(null)")); + (info != NULL) ? info : "")); #if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) thd->profiling.status_change(info, calling_function, calling_file, calling_line); #endif |