• unknown's avatar
    Prevent bugs by making DBUG_* expressions syntactically equivalent · 607c2249
    unknown authored
    to a single statement.
    ---
    Bug#24795: SHOW PROFILE
    
    Profiling is only partially functional on some architectures.  Where 
    there is no getrusage() system call, presently Null values are 
    returned where it would be required.  Notably, Windows needs some love 
    applied to make it as useful.
    
      Syntax this adds:
      
      SHOW PROFILES
      
      SHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]
       where "n" is an integer
       and "types" is zero or many (comma-separated) of
          "CPU"
          "MEMORY" (not presently supported)
          "BLOCK IO"
          "CONTEXT SWITCHES"
          "PAGE FAULTS"
          "IPC"
          "SWAPS"
          "SOURCE"
          "ALL"
    
    It also adds a session variable (boolean) "profiling", set to "no"
    by default, and (integer) profiling_history_size, set to 15 by 
    default.
    
    This patch abstracts setting THDs' "proc_info" behind a macro that 
    can be used as a hook into the profiling code when profiling 
    support is compiled in.  All future code in this line should use
    that mechanism for setting thd->proc_info.
    
    ---
    
    Tests are now set to omit the statistics.
    
    ---
    
    Adds an Information_schema table, "profiling" for access to 
    "show profile" data.
    ---
    Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-3--bug24795
    into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
    ---
    Fix merge problems.
    ---
    Fixed one bug in the query_source being NULL.  
    
    Updated test results.
    ---
    Include more thorough profiling tests.
    
    Improve support for prepared statements.
    
    Use session-specific query IDs, starting at zero.
    ---
    Selecting from I_S.profiling is no longer quashed in profiling, as
    requested by Giuseppe.
    
    Limit the size of captured query text.
    
    No longer log queries that are zero length.
    
    
    BitKeeper/deleted/.del-profile.result:
      Rename: mysql-test/r/profile.result -> BitKeeper/deleted/.del-profile.result
    BitKeeper/deleted/.del-profile.test:
      Rename: mysql-test/t/profile.test -> BitKeeper/deleted/.del-profile.test
    BitKeeper/deleted/.del-sql_profile.cc:
      Rename: sql/sql_profile.cc -> BitKeeper/deleted/.del-sql_profile.cc
    BitKeeper/deleted/.del-sql_profile.h:
      Rename: sql/sql_profile.h -> BitKeeper/deleted/.del-sql_profile.h
    configure.in:
      Add a configure-time option to enable/disable query profiling.  The
      default is enabled.
    include/my_dbug.h:
      
      
      DBUG_* statements should be syntactically equivalent to a single 
      statement.
    myisam/mi_open.c:
      DBUG_* statements should be syntactically equivalent to a single 
      statement.
    mysql-test/r/information_schema.result:
      Updated (re-recorded) tests that I missed somehow.  I verified these
      for correctness.
    mysql-test/r/information_schema_db.result:
      Updated test results I missed.
    mysql-test/r/mysqlshow.result:
      Fix merge problems.
    ndb/src/ndbapi/DictCache.cpp:
      DBUG_* statements should be syntactically equivalent to a single 
      statement.
    sql/ha_archive.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/ha_berkeley.cc:
      Include patch backported to 5.0-global.
      
      THD::options is a ulonglong, not ulong.
    sql/ha_myisam.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/ha_myisammrg.cc:
      DBUG_* statements should be syntactically equivalent to a single 
      statement.
    sql/ha_ndbcluster.cc:
      DBUG_* statements should be syntactically equivalent to a single 
      statement.
    sql/item_cmpfunc.cc:
      DBUG_* statements should be syntactically equivalent to a single 
      statement.
    sql/item_func.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/lock.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/log_event.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/mysql_priv.h:
      Use 64-bit constants for the 64-bit bit field.
      
      Add a new option bit for whether profiling is active or not.
    sql/mysqld.cc:
      Add semicolon to DBUG statement.
      
      Add a new system variable and set it.
      ---
      Set the minimum, which is zero and not 50.
    sql/repl_failsafe.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/set_var.cc:
      Make a new system global variable and session variable, to determine
      behavior of profiling.	
      ---
      Include patch backported to 5.0-global.
      
      THD::options is a ulonglong, not ulong.
    sql/set_var.h:
      The THD::options bit field is ulonglong, not ulong.
    sql/slave.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
      ---
      Include patch backported to 5.0-global.
      
      THD::options is a ulonglong, not ulong.
    sql/sp_head.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/sql_base.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
      ---
      Include patch backported to 5.0-global.
      
      THD::options is a ulonglong, not ulong.
    sql/sql_cache.cc:
      DBUG_* statements should be syntactically equivalent to a single 
      statement.
      ---
      Fix merge problems.
    sql/sql_class.cc:
      Insert a pointer to the current thread in the profiling code.
      ---
      Manual merge, undoing first patch.
      ---
      Fix merge problems.
    sql/sql_class.h:
      Create a new system variable, profiling_history_size, and add a 
      member to THD to hold profiling information about this thread's 
      execution.
      ---
      Manual merge, undoing first patch.
    sql/sql_delete.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
      ---
      Include patch backported to 5.0-global.
      
      THD::options is a ulonglong, not ulong.
    sql/sql_insert.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
      ---
      Fix merge problems.
    sql/sql_lex.cc:
      Initialize profiling options to empty.
      ---
      Manual merge, undoing first patch.
    sql/sql_lex.h:
      Add info to the lexer object so that we can hold data that comes from
      parsing statements.
      
      Reuse memory addresses of uints that can't occur in the same state-
      ment.
      
      This is dangerous because it involves knowledge of what symbols are 
      never used together, which is information stored obliquely in another
      file.
      ---
      Manual merge, undoing first patch.
    sql/sql_parse.cc:
      Add hooks to the parser to jump to profiling code.
      
      If profiling is not present, then return an error message upon being
      used.
      ---
      Manual merge, undoing first patch.
      ---
      Fix merge problems.
      ---
      Include patch backported to 5.0-global.
      
      THD::options is a ulonglong, not ulong.
    sql/sql_prepare.cc:
      From prepared statement execution, set the query source in the 
      profiler, as we can't get it from  thd .
      ---
      Make it less expensive to limit the size of the queries.
    sql/sql_repl.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/sql_select.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
      ---
      Fix merge problems.
    sql/sql_show.cc:
      Abstract setting thread-info into a function or macro.
      
      Also, remove "static" qualification on schema_table_store_record()
      so that external functions may use it.
      ---
      Manual merge, undoing first patch.
    sql/sql_table.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/sql_update.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/sql_view.cc:
      Abstract setting thread-info into a function or macro.
      ---
      Manual merge, undoing first patch.
    sql/sql_yacc.yy:
      Add new lexer symbols and insert new grammatical rules necessary to 
      retreive profiling information.
      ---
      Manual merge, undoing first patch.
      ---
      Fix merge problems.
    sql/table.h:
      Add enum item for query profiling.
    BitKeeper/deleted/.del-profiling-master.opt:
      New BitKeeper file ``mysql-test/t/profiling-master.opt''
    mysql-test/r/profiling.result:
      New BitKeeper file ``mysql-test/r/profiling.result''
      ---
      Include more verbose that describes the queries so far.
      
      Include Giuseppe's tests.
      ---
      Selecting from I_S.profiling is no longer quashed in profiling, as
      requested by Giuseppe.
    mysql-test/t/profiling.test:
      New BitKeeper file ``mysql-test/t/profiling.test''
      ---
      Include more verbose that describes the queries so far.
      
      Include Giuseppe's tests.
      ---
      Selecting from I_S.profiling is no longer quashed in profiling, as
      requested by Giuseppe.
    sql/sql_profile.cc:
      New BitKeeper file ``sql/sql_profile.cc''
      ---
      If query_source is NULL, as can sometimes happen, then don't try
      to copy that memory.
      ---
      Make each new session use its own numbering of query_ids, and not
      show the global-pool numbers to the user.
      
      Provide a way for prepared statements to set the query_source.
      ---
      Selecting from I_S.profiling is no longer quashed in profiling, as
      requested by Giuseppe.
      
      Limit the size of captured query text.
      
      No longer log queries that are zero length.
    sql/sql_profile.h:
      New BitKeeper file ``sql/sql_profile.h''
      ---
      Make each new session use its own numbering of query_ids, and not
      show the global-pool numbers to the user.
      
      Provide a way for prepared statements to set the query_source.
      ---
      Make it less expensive to limit the size of the queries.
    607c2249
sql_update.cc 45.1 KB