From: Date: March 15 2005 11:27pm
Subject: bk commit into 4.1 tree (reggie:1.2120) BUG#6660
List-Archive: http://lists.mysql.com/internals/23060
X-Bug: 6660
Message-Id: <200503152227.j2FMR4RB028161@mdk10>

Below is the list of changes that have just been committed into a local
4.1 repository of reggie. When reggie does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2120 05/03/15 16:24:37 reggie@mdk10.(none) +1 -0
  Bug #6660  mysqldump creates bad pathnames on Windows
  
  sql_show.cc:
    changed strdup to thd->memdup per Serg's advice

  sql/sql_show.cc
    1.196 05/03/15 16:23:59 reggie@mdk10.(none) +1 -2
    changed strdup to thd->memdup per Serg's advice

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/mysql-4.1

--- 1.195/sql/sql_show.cc	2005-03-15 11:31:24 -06:00
+++ 1.196/sql/sql_show.cc	2005-03-15 16:23:59 -06:00
@@ -1228,12 +1228,11 @@
     packet->append(dir_type);
     packet->append(" DIRECTORY='", 12);
 #ifdef __WIN__
-    char *winfilename = strdup(filename);
+    char *winfilename = thd->memdup(filename, length);
     for (uint i=0; i < length; i++)
 	    if (winfilename[i] == '\\')
 		    winfilename[i] = '/';
     packet->append(winfilename, length);
-    free(winfilename);
 #else
     packet->append(filename, length);
 #endif