bk commit into 4.1 tree (reggie:1.2289) 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.2289 05/05/23 12:31:22 reggie@mdk10.(none) +2 -0
  BUG#10687 - Merge engine fails under Windows
  
  This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
  It also adds a check in has_path to avoid a possible redundant comparison.
  
  ha_myisammrg.cc:
    Replaced missing / in format string
  my_getwd.c:
    Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison

  sql/ha_myisammrg.cc
    1.57 05/05/23 12:28:21 reggie@mdk10.(none) +1 -1
    Replaced missing / in format string

  mysys/my_getwd.c
    1.15 05/05/23 12:27:00 reggie@mdk10.(none) +4 -1
    Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison

# 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.14/mysys/my_getwd.c	2005-05-23 11:53:08 -05:00
+++ 1.15/mysys/my_getwd.c	2005-05-23 12:27:00 -05:00
@@ -208,7 +208,10 @@
 
 my_bool has_path(const char *name)
 {
-  return test(strchr(name, FN_LIBCHAR)) || test(strchr(name,'/'))
+  return test(strchr(name, FN_LIBCHAR)) 
+#if FN_LIBCHAR != '/'
+    || test(strchr(name,'/'))
+#endif
 #ifdef FN_DEVCHAR
     || test(strchr(name, FN_DEVCHAR))
 #endif

--- 1.56/sql/ha_myisammrg.cc	2005-05-23 12:05:07 -05:00
+++ 1.57/sql/ha_myisammrg.cc	2005-05-23 12:28:21 -05:00
@@ -406,7 +406,7 @@
         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%s/%s", mysql_data_home,
+      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,