summaryrefslogtreecommitdiff
path: root/sql/sql_profile.h
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2012-10-12 19:38:45 +0200
committerMarc Alff <marc.alff@oracle.com>2012-10-12 19:38:45 +0200
commitfc1fbe159afa043d647711c83778d6911e5dfe39 (patch)
tree63b8507791451f005c2dad1cf208509b8c6dfcd1 /sql/sql_profile.h
parent1d16fc16dc50d21e2456d6367cea20f83404ffc6 (diff)
downloadmariadb-git-fc1fbe159afa043d647711c83778d6911e5dfe39.tar.gz
Bug#14629232 SECURITY VULNERABILITY WITH SHOW PROFILE
This fix resolves a security vulnerability of SHOW PROFILE. See the bug report for details.
Diffstat (limited to 'sql/sql_profile.h')
-rw-r--r--sql/sql_profile.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index b21216f290f..c59b342e502 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.h
@@ -182,6 +182,7 @@ private:
char *file;
unsigned int line;
+ ulong m_seq;
double time_usecs;
char *allocated_status_memory;
@@ -213,8 +214,9 @@ private:
query_id_t profiling_query_id; /* Session-specific id. */
char *query_source;
- PROF_MEASUREMENT *profile_start;
- PROF_MEASUREMENT *profile_end;
+ double m_start_time_usecs;
+ double m_end_time_usecs;
+ ulong m_seq_counter;
Queue<PROF_MEASUREMENT> entries;