Commit 55301a10 authored by unknown's avatar unknown
Browse files

Fix MERGE tables on Microsoft Windows. This a backport of the 

fix from the main 5.0 tree. (Bug #10687)


myisammrg/myrg_open.c:
  Call fn_format() if file has a path.
mysys/my_getwd.c:
  Check for '/' even if it is not FN_LIBCHAR in has_path()
parent d8dbb838

myisammrg/myrg_open.c

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
  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 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
                   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 */

mysys/my_getwd.c

+4 −1
Original line number Diff line number Diff line
@@ -209,6 +209,9 @@ int test_if_hard_path(register const char *dir_name) 
my_bool has_path(const char *name)

{

  return test(strchr(name, FN_LIBCHAR)) 

#if FN_LIBCHAR != '/'

    || test(strchr(name,'/'))

#endif

#ifdef FN_DEVCHAR

    || test(strchr(name, FN_DEVCHAR))

#endif