bk commit into 5.0 tree (jimw:1.1899) BUG#10687

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1899 05/05/25 14:41:50 jimw@stripped +2 -0
  Fix MERGE tables on Microsoft Windows. This a backport of the
  fix from the main 5.0 tree. (Bug #10687)

  mysys/my_getwd.c
    1.14 05/05/25 14:41:46 jimw@stripped +4 -1
    Check for '/' even if it is not FN_LIBCHAR in has_path()

  myisammrg/myrg_open.c
    1.29 05/05/25 14:41:46 jimw@stripped +3 -1
    Call fn_format() if file has a path.

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-build

--- 1.28/myisammrg/myrg_open.c	2005-04-28 09:28:44 -07:00
+++ 1.29/myisammrg/myrg_open.c	2005-05-25 14:41:46 -07: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 09:28:44 -07:00
+++ 1.14/mysys/my_getwd.c	2005-05-25 14:41:46 -07: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