diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-05 12:37:51 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-05 12:37:51 +0200 |
| commit | c670b9021e782ead4cdd0d20ead2421367626ea5 (patch) | |
| tree | 4178c9a4656d1df6bfbabc07b9962deb25d57ab5 /sql/sql_class.cc | |
| parent | fdd6963890d5cd793155d135c3fa321ecb5b704d (diff) | |
| parent | 7647c2744c95f23fa7a1f4aec98359f5a9a55e01 (diff) | |
| download | mariadb-git-c670b9021e782ead4cdd0d20ead2421367626ea5.tar.gz | |
Automerge with 5.2
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 cd408ac723f..a1f8dbab175 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -328,7 +328,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 |