bk commit into 5.1 tree (knielsen:1.2212)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2212 06/06/23 14:59:40 knielsen@stripped +2 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622
  into  mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2

  server-tools/instance-manager/instance_options.cc
    1.35 06/06/23 14:59:37 knielsen@stripped +3 -3
    Manual merge.

  mysys/mf_dirname.c
    1.14 06/06/23 14:57:46 knielsen@stripped +0 -0
    Auto merged

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-vg-apr2/RESYNC

--- 1.13/mysys/mf_dirname.c	2006-02-25 19:35:07 +01:00
+++ 1.14/mysys/mf_dirname.c	2006-06-23 14:57:46 +02:00
@@ -72,7 +72,9 @@
 
   SYNPOSIS
     convert_dirname()
-    to				Store result here
+    to				Store result here. Must be at least of size
+    				min(FN_REFLEN, strlen(from) + 1) to make room
+    				for adding FN_LIBCHAR at the end.
     from			Original filename. May be == to
     from_end			Pointer at end of filename (normally end \0)
 

--- 1.34/server-tools/instance-manager/instance_options.cc	2006-05-22 13:20:37 +02:00
+++ 1.35/server-tools/instance-manager/instance_options.cc	2006-06-23 14:59:37 +02:00
@@ -420,8 +420,13 @@
   const char *tmp;
   char *end;
 
-  if (!mysqld_path.str && !(mysqld_path.str= strdup_root(&alloc, default_path)))
-    goto err;
+  if (!mysqld_path.str)
+  {
+    // Need one extra byte, as convert_dirname() adds a slash at the end.
+    if (!(mysqld_path.str= alloc_root(&alloc, strlen(default_path) + 2)))
+      goto err;
+    strcpy(mysqld_path.str, default_path);
+  }
 
   // it's safe to cast this to char* since this is a buffer we are allocating
   end= convert_dirname((char*)mysqld_path.str, mysqld_path.str, NullS);