Commit 0fbb50b5 authored by unknown's avatar unknown

Fix problem with comments/blank lines in MERGE files.


Docs/manual.texi:
  Changelog
parent 9001f351
...@@ -46712,6 +46712,9 @@ not yet 100% confident in this code. ...@@ -46712,6 +46712,9 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.42 @appendixsubsec Changes in release 3.23.42
@itemize @bullet @itemize @bullet
@item @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 Enforce that all tables in a @code{MERGE} table come from the same
database. database.
@item @item
...@@ -65,7 +65,6 @@ int handle_locking) ...@@ -65,7 +65,6 @@ int handle_locking)
end[-1]='\0'; end[-1]='\0';
if (buff[0] && buff[0] != '#') /* Skipp empty lines and comments */ if (buff[0] && buff[0] != '#') /* Skipp empty lines and comments */
{ {
last_isam=isam;
if (!test_if_hard_path(buff)) if (!test_if_hard_path(buff))
{ {
VOID(strmake(name_buff+dir_length,buff, VOID(strmake(name_buff+dir_length,buff,
...@@ -75,7 +74,6 @@ int handle_locking) ...@@ -75,7 +74,6 @@ int handle_locking)
if (!(isam=mi_open(buff,mode,test(handle_locking)))) if (!(isam=mi_open(buff,mode,test(handle_locking))))
goto err; goto err;
files++; files++;
}
last_isam=isam; last_isam=isam;
if (info.reclength && info.reclength != isam->s->base.reclength) if (info.reclength && info.reclength != isam->s->base.reclength)
{ {
...@@ -84,6 +82,7 @@ int handle_locking) ...@@ -84,6 +82,7 @@ int handle_locking)
} }
info.reclength=isam->s->base.reclength; info.reclength=isam->s->base.reclength;
} }
}
if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+ if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+
files*sizeof(MYRG_TABLE), files*sizeof(MYRG_TABLE),
MYF(MY_WME)))) MYF(MY_WME))))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment