From: Satya Bodapati
Date: December 12 2012 10:07am
Subject: bzr push into mysql-trunk branch (satya.bodapati:5222 to 5223) Bug#15913195
List-Archive: http://lists.mysql.com/commits/145497
X-Bug: 15913195
Message-Id: <20121212100743.13337.67829.5223@satya-ThinkPad-T420>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5223 Satya Bodapati	2012-12-12 [merge]
      Merge fix for Bug#15913195 from mysql-5.6 to mysql-trunk

    modified:
      storage/innobase/fil/fil0fil.cc
 5222 Joerg Bruehe	2012-12-12 [merge]
      Empty upmerge

=== modified file 'storage/innobase/fil/fil0fil.cc'
--- a/storage/innobase/fil/fil0fil.cc	revid:joerg.bruehe@stripped
+++ b/storage/innobase/fil/fil0fil.cc	revid:satya.bodapati@stripped
@@ -3897,7 +3897,8 @@ fil_make_ibbackup_old_name(
 
 	memcpy(path, name, len);
 	memcpy(path + len, suffix, (sizeof suffix) - 1);
-	ut_sprintf_timestamp_without_extra_chars(path + len + sizeof suffix);
+	ut_sprintf_timestamp_without_extra_chars(
+		path + len + ((sizeof suffix) - 1));
 	return(path);
 }
 #endif /* UNIV_HOTBACKUP */

No bundle (reason: useless for push emails).