From: Marc Alff
Date: December 2 2010 8:07am
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3406) Bug#58172
List-Archive: http://lists.mysql.com/commits/125752
X-Bug: 58172
Message-Id: <201012020807.oB268uUQ022533@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7012948347879877146=="

--===============7012948347879877146==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-58172/ based on revid:zhenxing.he@stripped

 3406 Marc Alff	2010-12-02
      Bug#58172 Column performance_schema.threads.processlist_time out of range
      
      Before this fix, the column processlist_time in table performance_schema.threads
      could receive out of range values.
      
      Some negative time was computed, because timers may have some drift and are not
      guaranteed to be always monotonous.
      
      This fix replaces negative time values with 0, to correct the data,
      and make the data fit into an unsigned column.

    modified:
      storage/perfschema/table_threads.cc
=== modified file 'storage/perfschema/table_threads.cc'
--- a/storage/perfschema/table_threads.cc	2010-12-01 18:46:51 +0000
+++ b/storage/perfschema/table_threads.cc	2010-12-02 08:07:06 +0000
@@ -289,7 +289,11 @@ int table_threads::read_row_values(TABLE
         break;
       case 8: /* PROCESSLIST_TIME */
         if (m_row.m_start_time)
-          set_field_ulonglong(f, my_time(0) - m_row.m_start_time);
+        {
+          time_t now= my_time(0);
+          ulonglong elapsed= (now > m_row.m_start_time ? now - m_row.m_start_time : 0);
+          set_field_ulonglong(f, elapsed);
+        }
         else
           f->set_null();
         break;


--===============7012948347879877146==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   58172/
# testament_sha1: 577c2551affca4f3eaeff65f52b299207c8c9669
# timestamp: 2010-12-02 09:07:12 +0100
# base_revision_id: zhenxing.he@stripped\
#   iel8lvhmulyagtsv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYoIruEAAbxfgAUQWGf///oC
DAC////6UASPduyFTuu7l2slxcJSJpPRMTQbVP0Cn6pkxDTTIAGgeoJRJpkwmg0Sn6Cm01HqaAAA
GQCSECJpDJpiaZTynqeInqMgaAAHMAmAEwAAmAAJgACSSamJ6E0mYoabQEHpAD1NABpEhumKrjD0
9x9Va7zBTCXRZmRyg+VBTZygzHkiivciI5GDX+ZvCZhm2X/G8pjgMwxQ+m30odPG7PD0dY+Kx8Sf
vfzmfX+lp3eHCVTTpep42TnCb6TMXf2ZObmSLMFInCY9o622hVItQjpFQOFDR68+dmKfEo+hCh5N
Xx0OuTokOwSH72Lm40AamtqKiUTmNyM3SftlaJSTPcpYh6MHMqF1M4iGrHGHSGUzlssJoNYFEGuM
asri+UaHK4yjK434luqrj/DiOUrLuOnlYuLYvy9KyUUUQvkw8m31gvJLfCUpNrYMsUYbWcVMUh1y
M/XU43JsgijhUC9A45ua/lbtQztHax6qPapnhAaE48xMbdrs87khR4m7qJN7nWMDSVpUiWwsN1ly
vNexExrFl3JyanBOYuV+gikXKYHynqWyyXhYJDeyDlYU3YYI06sLNpFpjJoqKIZ1QeOg7GhjSTMI
wWcoP28oWYmI80DORMpdWbKeCpJ0Wakya9rhijy1883NgKx8XTozNShigarJqtMmFKtNeS8i/J4a
dte+ZDcfO2ps4FE+J0zN922yk8GGJpI58LyCQ44OG3ockphXRoN2YkC3dtAmoFiiDEtIqcW4Dq4F
lVLpCDq3LKdWH20BuhCUgwqFcSu2KPr1xlBfbphuHkmYkCPteHHPtYcBcVXGzFGY4zQsJq0FseO8
fq2qQWCJgKiKIaMKxgovRiatlpWV98UemjItSTplYx7RrEH5c+w57k+DGptcN4yc7J2Yoglkk/Pv
peqek4PdcGYrCrOg6lZzNlpmVPCxlmdW/ZMk089ytfnakReLqRpQikWioWZYI6xdPSTMiFRyg1In
wPC7YwC7astggZD+5dFYavR3dZI5Pc89DIoMcUQ5OFdn0z37BRqDHRd6xzWxTCwfzakyIUJxjlFx
FN1aYOSTWR5Hp6RkLgnvCLTa6OUMxnC4n3mt1IxLSVupb3qsrBWEwYgkWibWNLaeuADhy/YAYRq5
dgxM86l2pz1EI0Nac5Sn3Gz4nkM+6Sn1lzMwYMUY2SxqlKEty1E5WsNWsWTqkkTDLBKGGCQ5m4Vv
Nxag29p5S690zJky1a1xKQ/rUKng4whdnCqEDgA4JxS64lVlZ7UjEo1ZB/GzJw45pcs1eDPLYYbx
Wdg9lBUCnBbZiNIjYiMlpojDe5eHHnejKZ5OxE7hnmypLuMPOq1cF2e+Q50zD/aMHb6AzumXreaV
xwSAsCQckWCaaVufU5ZfMTnde32mxUtM+fnVqOndk86YsRV6ZIs60aFovFmo4lYPoFgcYMTuSa8a
H06R4YY+VHpRL8GXYqbpFTpmxRdSuXaFyLQ32gqa2qqrC+Q5gLbjwVH4Ito9JdmB/i7kinChIRQR
XcI=


--===============7012948347879877146==--