summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-02-22 10:03:08 -0500
committercmiller@zippy.cornsilk.net <>2007-02-22 10:03:08 -0500
commit6e096ee8d9f5aa2cbe3c2bba4aecde6fceaa888f (patch)
tree1bef9445e8b72c15c47554a6cfa32aef7e32ce69 /BitKeeper
parentdffdc8118b2af185861eac52f220d96b32c76b37 (diff)
downloadmariadb-git-6e096ee8d9f5aa2cbe3c2bba4aecde6fceaa888f.tar.gz
Prevent bugs by making DBUG_* expressions syntactically equivalent
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.
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed9
1 files changed, 9 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 43292906ddd..c79a4cf25cc 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -34,3 +34,12 @@
459c2098XoAUsUn8N07IVRDD6CTM-A
459ea845XenN-uWqEM5LFvUT60tW_A
45af88c9RIIJWPfBxs3o7zekI-ELPQ
+45c38d90tNwOTSaYKHXd3ccLtnytlQ
+45c390d6BbWrwyEi5T5VsWKYxl06Rg
+45c39d31g0iik6UE_oTK5N55ry-ycA
+45da6370nnZlAAIieMCrXkxF9toOyQ
+45da6551zUuplwxuqcT2fhRgceC0CQ
+45db0d4bkGtxBk21sZFJgbCV1FcNRg
+45db468b-DKE8kUTV42eYMYmk8_g9g
+45dd21d1rVPnDfvZTNVHLalcjnbsZw
+45ddaf15_Ld7IAEpUUP3FJjJ-oSEFg