• unknown's avatar
    Fix up merge. Some macros are now functions. Some functions are · 0901dbc5
    unknown authored
    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''
    0901dbc5
mysql_priv.h 84.1 KB