Commit 1dba0d70 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix problem with comments/blank lines in MERGE files.

parent 029a4412

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -46712,6 +46712,9 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.42

@itemize @bullet

@item

Fixes problem when one edited @code{.MRG} tables by hand.

(Patch from Benjamin Pflugmann).

@item

Enforce that all tables in a @code{MERGE} table come from the same

database.

@item

myisammrg/myrg_open.c

+7 −8
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ int handle_locking) 
      end[-1]='\0';

    if (buff[0] && buff[0] != '#')	/* Skipp empty lines and comments */

    {

      last_isam=isam;

      if (!test_if_hard_path(buff))

      {

	VOID(strmake(name_buff+dir_length,buff,
@@ -75,7 +74,6 @@ int handle_locking) 
      if (!(isam=mi_open(buff,mode,test(handle_locking))))

	goto err;

      files++;

    }

      last_isam=isam;

      if (info.reclength && info.reclength != isam->s->base.reclength)

      {
@@ -84,6 +82,7 @@ int handle_locking) 
      }

      info.reclength=isam->s->base.reclength;

    }

  }

  if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+

				       files*sizeof(MYRG_TABLE),

				       MYF(MY_WME))))