database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge pull request #112 from openquery/MDEV-8981

Browse Source 
MDEV-8981: Analyze stmt - cycles can overflow
This commit is contained in:
Sergei Petrunia
2015-11-06 16:35:00 +03:00
parent b80cc31ab4 0b8144a472
commit 4e421687c2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_analyze_stmt.h
View File

@@ -47,6 +47,14 @@ protected:
ulonglong count;
ulonglong cycles;
ulonglong last_start;
void cycles_stop_tracking()
{
ulonglong end= my_timer_cycles();
cycles += end - last_start;
if (unlikely(end < last_start))
cycles += ULONGLONG_MAX;
}
public:
Exec_time_tracker() : count(0), cycles(0) {}
@@ -59,7 +67,7 @@ public:
void stop_tracking()
{
count++;
cycles += my_timer_cycles()- last_start;
cycles_stop_tracking();
}
// interface for getting the time
@@ -93,7 +101,7 @@ public:
*/
void stop_tracking()
{
cycles += my_timer_cycles()- last_start;
cycles_stop_tracking();
}
};