diff options
| author | Chad MILLER <chad@mysql.com> | 2009-05-05 17:03:23 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-05-05 17:03:23 -0400 |
| commit | 4822696ecb7302efc543e0be109f1c2a8f1bdf4e (patch) | |
| tree | 14698de1876a7bea69d52b7f7ddaedbf0877551f /sql/sql_class.cc | |
| parent | 14f923c0286588f9f391a2fda8b9fab5a4e2953c (diff) | |
| download | mariadb-git-4822696ecb7302efc543e0be109f1c2a8f1bdf4e.tar.gz | |
Pull 5.1 treatment of community features into 5.0.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 8a0d84c6735..f2e04647452 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -173,7 +173,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)); -#if defined(ENABLED_PROFILING) +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) thd->profiling.status_change(info, calling_function, calling_file, calling_line); #endif thd->proc_info= info; @@ -272,7 +272,7 @@ THD::THD() init(); /* Initialize sub structures */ init_sql_alloc(&warn_root, WARN_ALLOC_BLOCK_SIZE, WARN_ALLOC_PREALLOC_SIZE); -#ifdef ENABLED_PROFILING +#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) profiling.set_thd(this); #endif user_connect=(USER_CONN *)0; |