From: Nirbhay Choubey
Date: January 7 2013 10:53am
Subject: bzr push into mysql-5.5 branch (nirbhay.choubey:4143 to 4144) Bug#16066243
List-Archive: http://lists.mysql.com/commits/145569
X-Bug: 16066243
Message-Id: <20130107105342.14339.39892.4144@Nirbhay-lenovo>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4144 Nirbhay Choubey	2013-01-07 [merge]
      Merge of patch for Bug#16066243 from mysql-5.1.

    modified:
      mysys/mf_pack.c
      mysys/my_lib.c
 4143 Satya Bodapati	2013-01-04 [merge]
      Merge Post Fix for BUG#14628410 from mysql-5.1 to mysql-5.5

    modified:
      storage/innobase/row/row0merge.c
=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2011-07-03 23:25:49 +0000
+++ b/mysys/mf_pack.c	2013-01-07 10:49:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "mysys_priv.h"
 #include <m_string.h>
@@ -451,10 +452,10 @@ char *intern_filename(char *to, const ch
   char buff[FN_REFLEN];
   if (from == to)
   {						/* Dirname may destroy from */
-    strmov(buff,from);
+    (void) strnmov(buff, from, FN_REFLEN);
     from=buff;
   }
   length= dirname_part(to, from, &to_length);	/* Copy dirname & fix chars */
-  (void) strmov(to + to_length,from+length);
+  (void) strnmov(to + to_length, from + length, FN_REFLEN - to_length);
   return (to);
 } /* intern_filename */

=== modified file 'mysys/my_lib.c'
--- a/mysys/my_lib.c	2013-01-04 11:12:49 +0000
+++ b/mysys/my_lib.c	2013-01-07 10:49:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 /* TODO: check for overun of memory for names. */
 

No bundle (reason: useless for push emails).