database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Fix up merge. Some macros are now functions. Some functions are

Browse Source 
renamed.  Some new THD proc_info states are new.  Directories must be
encountered in make in a specific order, to have symlinks already set.
Move community-server-specific tests into own tests, so that we can 
exempt them from testing on enterprise servers.


BitKeeper/deleted/.del-profiling.inc:
  Delete: mysql-test/include/profiling.inc
BitKeeper/deleted/.del-profiling.require:
  Delete: mysql-test/r/profiling.require
configure.in:
  Set a new order of sql_client_dirs, so that the make directory traversal
  doesn't miss symlink dependencies.
mysql-test/r/not_embedded_server.result:
  Account for new "executing" state.
mysql-test/t/information_schema.test:
  Move community-feature test to another test file.
mysql-test/t/profiling.test:
  Make test more generic to community features.
sql/lex.h:
  Add symbol lost in manual merge.
sql/mysql_priv.h:
  Insert a preprocessor layer between setting the caller and the function
  that sets the thread state, so we can get caller information.
sql/mysqld.cc:
  Add new server variable "have_community_features".
sql/set_var.cc:
  Add new server variable "have_community_features".
sql/sql_class.cc:
  Insert a preprocessor layer between setting the caller and the function
  that sets the thread state, so we can get caller information.
sql/sql_profile.cc:
  Function name change, my_strndup()
sql/sql_profile.h:
  Insert a preprocessor layer between setting the caller and the function
  that sets the thread state, so we can get caller information.
mysql-test/include/have_community_features.inc:
  New BitKeeper file ``mysql-test/include/have_community_features.inc''
mysql-test/r/have_community_features.require:
  New BitKeeper file ``mysql-test/r/have_community_features.require''
mysql-test/r/variables+c.result:
  New BitKeeper file ``mysql-test/r/variables+c.result''
mysql-test/t/variables+c.test:
  New BitKeeper file ``mysql-test/t/variables+c.test''
This commit is contained in:
unknown
2007-05-02 14:13:33 -04:00
parent 4687fe01d7
commit 0901dbc583
17 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.cc
View File

@@ -181,9 +181,16 @@ my_bool thd_tablespace_op(const THD *thd)
}
const char *thd_proc_info(THD *thd, const char *info)
const char *set_thd_proc_info(THD *thd, const char *info,
const char *calling_function,
const char *calling_file,
const unsigned int calling_line)
{
const char *old_info= thd->proc_info;
DBUG_PRINT("proc_info", ("%s:%d %s", calling_file, calling_line, info));
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
thd->profiling.status_change(info, calling_function, calling_file, calling_line);
#endif
thd->proc_info= info;
return old_info;
}