database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Pull 5.1 treatment of community features into 5.0.

Browse Source
This commit is contained in:
Chad MILLER
2009-05-05 17:03:23 -04:00
parent 978e8e06b0
commit 9d58239dea
17 changed files with 88 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

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