Bug #17218692 correction merge

silvakid · silvakid · commit 140fdd0388b4 · 2015-05-13T12:29:00.000+01:00
diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
@@ -980,9 +980,9 @@ MySQL_Prepared_ResultSet::getString(const uint32_t columnIndex) const
 			char buf[18];
 			MYSQL_TIME * t = static_cast<MYSQL_TIME *>(result_bind->rbind[columnIndex - 1].buffer);
                         if (t->second_part) {
-			        snprintf(buf, sizeof(buf) - 1, "%s%02d:%02d:%02d.%06lu", t->neg? "-":"", t->hour, t->minute, t->second, t->second_part);
+                          snprintf(buf, sizeof(buf), "%s%02d:%02d:%02d.%06lu", t->neg? "-":"", t->hour, t->minute, t->second, t->second_part);
                         } else {
-			        snprintf(buf, sizeof(buf) - 1, "%s%02d:%02d:%02d", t->neg? "-":"", t->hour, t->minute, t->second);
+                          snprintf(buf, sizeof(buf), "%s%02d:%02d:%02d", t->neg? "-":"", t->hour, t->minute, t->second);
                         }
 			CPP_INFO_FMT("It's a time %s", buf);
 			return sql::SQLString(buf);
diff --git a/test/unit/bugs/bugs.cpp b/test/unit/bugs/bugs.cpp
@@ -822,5 +822,41 @@ void bugs::bug21053335()
 }
 
 
+void bugs::bug17218692()
+{
+  logMsg("bugs::bug17218692");
+  try
+  {
+
+    stmt->execute("DROP TABLE IF EXISTS bug17218692");
+    stmt->execute("CREATE TABLE bug17218692(c1  time(6))");
+    stmt->execute("INSERT INTO bug17218692 VALUES('-838:59:58.987657')");
+
+    res.reset(stmt->executeQuery("select * from bug17218692"));
+    res->next();
+
+    std::stringstream log;
+    log<<"["<<res->getString(1)<<"]";
+
+    ASSERT_EQUALS(log.str(), "[-838:59:58.987657]");
+
+    pstmt.reset(con->prepareStatement("select * from bug17218692 "));
+    res.reset(pstmt->executeQuery());
+    res->next();
+
+    std::stringstream log2;
+    log2 << "["<<res->getString(1)<<"]";
+    ASSERT_EQUALS(log.str(), log2.str());
+
+  }
+  catch (sql::SQLException & e)
+  {
+    FAIL("Exception thrown");
+    throw;
+  }
+
+
+}
+
 } /* namespace regression */
 } /* namespace testsuite */
diff --git a/test/unit/bugs/bugs.h b/test/unit/bugs/bugs.h
@@ -62,6 +62,7 @@ class bugs : public unit_fixture
     TEST_CASE(bug68523);
     TEST_CASE(bug66235);
     TEST_CASE(bug14520822);
+    TEST_CASE(bug17218692);
     TEST_CASE(bug21053335);
   }
 
@@ -108,6 +109,8 @@ class bugs : public unit_fixture
 
   void bug14520822();
 
+  void bug17218692();
+
   void bug21053335();
 
 };
