List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:January 11 2011 1:57pm
Subject:bzr push into mysql-trunk branch (davi:3484 to 3485)
View as plain text  
 3485 Davi Arnaut	2011-01-11 [merge]
      Merge of mysql-5.5 into mysql-trunk.

    modified:
      mysys/my_getsystime.c
 3484 Jan Wedvik	2011-01-11 [merge]
      Merge of fix for bug#58553, "Queries with pushed conditions causes 'explain 
      extended' to crash mysqld" (see http://lists.mysql.com/commits/128409).

    modified:
      sql/handler.cc
      sql/sql_base.cc
      sql/sql_select.cc
=== modified file 'mysys/my_getsystime.c'
--- a/mysys/my_getsystime.c	2010-07-15 11:13:30 +0000
+++ b/mysys/my_getsystime.c	2011-01-11 13:53:50 +0000
@@ -165,7 +165,13 @@ ulonglong my_micro_time_and_time(time_t
 
   mysql_mutex_lock(&THR_LOCK_time);
   cur_gethrtime= gethrtime();
-  if ((cur_gethrtime - prev_gethrtime) > DELTA_FOR_SECONDS)
+  /*
+    Due to bugs in the Solaris (x86) implementation of gethrtime(),
+    the time returned by it might not be monotonic. Don't use the
+    cached time(2) value if this is a case.
+  */
+  if ((prev_gethrtime > cur_gethrtime) ||
+      ((cur_gethrtime - prev_gethrtime) > DELTA_FOR_SECONDS))
   {
     cur_time= time(0);
     prev_gethrtime= cur_gethrtime;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (davi:3484 to 3485) Davi Arnaut11 Jan