bk commit into 4.1 tree (reggie:1.2287) BUG#10687

[reggie]

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.2287 05/05/23 12:05:15 reggie@mdk10.(none) +2 -0
  BUG# 10687: Merge engine fails under Windows
  
  This cset is to roll out the cset applied earlier from Ingo.
  This bug has been fixed with a different cset.
  

  strings/my_vsnprintf.c
    1.31 05/05/23 12:05:07 reggie@mdk10.(none) +0 -6
    removed the patch applied earlier.  The patch was to add %c ability.  
    Monty has already done this.

  sql/ha_myisammrg.cc
    1.56 05/05/23 12:05:07 reggie@mdk10.(none) +2 -2
    removed the patch applied earlier

# 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.30/strings/my_vsnprintf.c	2005-05-19 16:02:07 -05:00
+++ 1.31/strings/my_vsnprintf.c	2005-05-23 12:05:07 -05:00
@@ -28,7 +28,6 @@
     %#[l]u
     %#[l]x
     %#.#s	Note first # is ignored
-    %c
     
   RETURN
     length of result string
@@ -119,11 +118,6 @@
 	bmove(to, store_start, res_length);
       }
       to+= res_length;
-      continue;
-    }
-    else if (*fmt == 'c')
-    {
-      *(to++)= (char) va_arg(ap, int);
       continue;
     }
     /* We come here on '%%', unknown code or too long parameter */

--- 1.55/sql/ha_myisammrg.cc	2005-05-19 16:02:07 -05:00
+++ 1.56/sql/ha_myisammrg.cc	2005-05-23 12:05:07 -05:00
@@ -406,8 +406,8 @@
         This means that it might not be possible to move the DATADIR of
         an embedded server without changing the paths in the .MRG file.
       */
-      uint length= my_snprintf(buff, FN_REFLEN, "%s%c%s/%s", mysql_data_home,
-			       FN_LIBCHAR, tables->db, tables->real_name);
+      uint length= my_snprintf(buff, FN_REFLEN, "%s%s/%s", mysql_data_home,
+			       tables->db, tables->real_name);
       /*
         If a MyISAM table is in the same directory as the MERGE table,
         we use the table name without a path. This means that the