summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-04-03 19:52:24 -0400
committerunknown <cmiller@zippy.cornsilk.net>2007-04-03 19:52:24 -0400
commit2879da7f847eeda8ebf7cdad769f665fe95f5259 (patch)
treef5182482cadf49899468ed490901464095a3484f /sql
parent46503d161ecc5756f0dd7130969e9ae9df303b31 (diff)
downloadmariadb-git-2879da7f847eeda8ebf7cdad769f665fe95f5259.tar.gz
Unreported minor bug: We start numbering query IDs at zero, which
is a special case in "SHOW PROFILE FOR QUERY n". No one can get the zero item (which is always the statement that turns on profiling), because zero represents the final item, internally. Now, order the queries starting at one. mysql-test/r/profiling.result: Renumber the query IDs. sql/sql_profile.cc: Start the profile_id_counter at 1, to overstep the special-case value of zero. Unrelated, but looks similar: don't use -1 to initialize an unsigned integer field. That causes warnings in some environments.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_profile.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc
index b17bb6daa0d..5fd83ce70c6 100644
--- a/sql/sql_profile.cc
+++ b/sql/sql_profile.cc
@@ -158,7 +158,7 @@ void PROFILE_ENTRY::collect()
QUERY_PROFILE::QUERY_PROFILE(PROFILING *profiling_arg, char *query_source_arg,
uint query_length_arg)
- :profiling(profiling_arg), server_query_id(-1), profiling_query_id(-1),
+ :profiling(profiling_arg), server_query_id(0), profiling_query_id(0),
query_source(NULL)
{
profile_end= &profile_start;
@@ -445,7 +445,7 @@ bool QUERY_PROFILE::show(uint options)
}
PROFILING::PROFILING()
- :profile_id_counter(0), keeping(1), current(NULL), last(NULL)
+ :profile_id_counter(1), keeping(1), current(NULL), last(NULL)
{
}