1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)

This commit is contained in:
Seppo Jaakola
2012-10-24 23:13:43 +03:00
277 changed files with 9660 additions and 1958 deletions

View File

@ -1702,7 +1702,7 @@ public:
my_hrtime_t user_time;
// track down slow pthread_create
ulonglong prior_thr_create_utime, thr_create_utime;
ulonglong start_utime, utime_after_lock;
ulonglong start_utime, utime_after_lock, utime_after_query;
// Process indicator
struct {
@ -2547,8 +2547,8 @@ public:
*/
void update_server_status()
{
ulonglong end_utime_of_query= current_utime();
if (end_utime_of_query > utime_after_lock + variables.long_query_time)
utime_after_query= current_utime();
if (utime_after_query > utime_after_lock + variables.long_query_time)
server_status|= SERVER_QUERY_WAS_SLOW;
}
inline ulonglong found_rows(void)