List:Commits« Previous MessageNext Message »
From:Alexander Barkov Date:November 21 2011 12:57pm
Subject:bzr push into mysql-trunk branch (alexander.barkov:3604 to 3605)
View as plain text  
 3605 Alexander Barkov	2011-11-21
      Removing debug code.

    modified:
      sql/sql_time.cc
 3604 Alexander Barkov	2011-11-21 [merge]
      Merging mysql-trunk 0> mysql-trunk-wl5885

    modified:
      mysql-test/r/create-big.result
      mysql-test/suite/federated/federated.test
      mysql-test/suite/federated/federated_plugin.test
      mysql-test/t/create-big.test
      mysql-test/t/disabled.def
      sql/sql_insert.cc
      sql/sql_table.cc
=== modified file 'sql/sql_time.cc'
--- a/sql/sql_time.cc	2011-11-18 09:52:00 +0000
+++ b/sql/sql_time.cc	2011-11-21 12:57:16 +0000
@@ -1615,10 +1615,6 @@ void mix_date_and_time(MYSQL_TIME *ldate
     long days, useconds;
     int sign= ltime->neg ? 1 : -1;
     MYSQL_TIME tmp= *ldate;
-    if (tmp.neg)
-    {
-      sleep(0);
-    }
     ldate->neg= calc_time_diff(ldate, ltime, sign, &seconds, &useconds);
     DBUG_ASSERT(!ldate->neg);
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (alexander.barkov:3604 to 3605) Alexander Barkov22 Nov