bk commit into 4.1 tree (lenz:1.2265) BUG#10687

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz 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.2265 05/05/24 14:30:22 lenz@stripped +3 -0
  - Backport of the patch to fix BUG#10687 (Merge engine fails 
    on Windows): applied required patches on top of the 4.1.12
    release (will be published as 4.1.12a for Windows)

  sql/ha_myisammrg.cc
    1.55 05/05/24 14:30:17 lenz@stripped +1 -0
    - Backport of the patch to fix BUG#10687 (Merge engine fails 
      on Windows): added extra debug output

  mysys/my_getwd.c
    1.14 05/05/24 14:30:17 lenz@stripped +4 -1
    - Backport of the patch to fix BUG#10687 (Merge engine fails 
      on Windows): Added test to see if FN_LIBCHAR != '/' before
      doing comparison to avoid redundant comparison

  myisammrg/myrg_open.c
    1.29 05/05/24 14:30:17 lenz@stripped +3 -1
    - Backport of the patch to fix BUG#10687 (Merge engine fails 
      under Windows): use fn_format to convert pathnames if the files 
      in the merge file have a pathname

# 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:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1.12a

--- 1.28/myisammrg/myrg_open.c	2005-04-28 18:28:44 +02:00
+++ 1.29/myisammrg/myrg_open.c	2005-05-24 14:30:17 +02:00
@@ -67,7 +67,7 @@
   while ((length=my_b_gets(&file,buff,FN_REFLEN-1)))
   {
     if ((end=buff+length)[-1] == '\n')
-      end[-1]='\0';
+      *--end='\0';
     if (!buff[0])
       continue;		/* Skip empty lines */
     if (buff[0] == '#')
@@ -86,6 +86,8 @@
                    sizeof(name_buff)-1-dir_length));
       VOID(cleanup_dirname(buff,name_buff));
     }
+    else
+      fn_format(buff, buff, "", "", 0);
     if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))
       goto err;
     if (!m_info)                                /* First file */

--- 1.13/mysys/my_getwd.c	2005-04-28 18:28:44 +02:00
+++ 1.14/mysys/my_getwd.c	2005-05-24 14:30:17 +02:00
@@ -208,7 +208,10 @@
 
 my_bool has_path(const char *name)
 {
-  return test(strchr(name, FN_LIBCHAR))
+  return test(strchr(name, FN_LIBCHAR)) 
+#if FN_LIBCHAR != '/'
+    || test(strchr(name,'/'))
+#endif
 #ifdef FN_DEVCHAR
     || test(strchr(name, FN_DEVCHAR))
 #endif

--- 1.54/sql/ha_myisammrg.cc	2005-04-28 18:28:44 +02:00
+++ 1.55/sql/ha_myisammrg.cc	2005-05-24 14:30:17 +02:00
@@ -422,6 +422,7 @@
     }
     else
       table_name=(*tbl)->path;
+    DBUG_PRINT("info",("MyISAM table_name: '%s'", table_name));
     *pos++= table_name;
   }
   *pos=0;