From: Alexander Barkov
Date: November 18 2011 11:54am
Subject: bzr push into mysql-trunk branch (alexander.barkov:3567 to 3568) WL#946
List-Archive: http://lists.mysql.com/commits/142063
Message-Id: <201111181154.pAIBsVhp010222@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3568 Alexander Barkov	2011-11-18
      WL#946 fixing field-t gunit test failure.

    modified:
      unittest/gunit/field-t.cc
 3567 Alexander Barkov	2011-11-18
      The fix for Bug#13399082 also fixes the Bug#13354387
      Adding test case for Bug#13354387.

    modified:
      mysql-test/r/type_temporal_fractional.result
      mysql-test/t/type_temporal_fractional.test
=== modified file 'unittest/gunit/field-t.cc'
--- a/unittest/gunit/field-t.cc	2011-11-01 11:52:24 +0000
+++ b/unittest/gunit/field-t.cc	2011-11-18 11:49:13 +0000
@@ -258,7 +258,8 @@ TEST_F(FieldTest, FieldTimef)
   // it requires a mock table
   
   struct timeval tv;
-  EXPECT_EQ(0, f->get_timestamp(&tv));
+  int warnings= 0;
+  EXPECT_EQ(0, f->get_timestamp(&tv, &warnings));
   // EXPECT_EQ(40992, tv.tv_sec);  // This is 11:23:12.  Why?  Time zone?
   EXPECT_EQ(123400, tv.tv_usec);
 

No bundle (reason: useless for push emails).