bzr push into mysql-trunk branch (nirbhay.choubey:5323 to 5324) Bug#16066243

[Nirbhay Choubey]

 5324 Nirbhay Choubey	2013-01-04 [merge]
      Merge of patch for bug#16066243 from mysql-5.6.

    modified:
      mysys/my_lib.c
 5323 Tor Didriksen	2013-01-04 [merge]
      merge 5.6 => trunk

    modified:
      unittest/gunit/CMakeLists.txt
      unittest/gunit/field-t.cc
      unittest/gunit/test_utils.cc
=== modified file 'mysys/my_lib.c'
--- a/mysys/my_lib.c	2012-11-21 17:05:35 +0000
+++ b/mysys/my_lib.c	2013-01-04 11:15:37 +0000
@@ -96,7 +96,7 @@ MY_DIR	*my_dir(const char *path, myf MyF
   MEM_ROOT      *names_storage;
   DIR		*dirp;
   struct dirent *dp;
-  char		tmp_path[FN_REFLEN+1],*tmp_file;
+  char		tmp_path[FN_REFLEN + 2], *tmp_file;
   char	dirent_tmp[sizeof(struct dirent)+_POSIX_PATH_MAX+1];
 
   DBUG_ENTER("my_dir");
@@ -197,10 +197,11 @@ char * directory_file_name (char * dst,
 {
   /* Process as Unix format: just remove test the final slash. */
   char *end;
+  DBUG_ASSERT(strlen(src) < (FN_REFLEN + 1));
 
   if (src[0] == 0)
     src= (char*) ".";				/* Use empty as current */
-  end=strmov(dst, src);
+  end= strnmov(dst, src, FN_REFLEN + 1);
   if (end[-1] != FN_LIBCHAR)
   {
     end[0]=FN_LIBCHAR;				/* Add last '/' */

No bundle (reason: useless for push emails).