diff options
| author | monty@hundin.mysql.fi <> | 2001-08-30 11:20:28 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-30 11:20:28 +0300 |
| commit | 1dba0d70054a18fac3fa0ecee2ae00e5df2239cc (patch) | |
| tree | daff2e79f76f2d5985022e679d968ec274ff57ae | |
| parent | 029a441238df81a6539e1ce40e9385a6e8e5b228 (diff) | |
| download | mariadb-git-1dba0d70054a18fac3fa0ecee2ae00e5df2239cc.tar.gz | |
Fix problem with comments/blank lines in MERGE files.
| -rw-r--r-- | Docs/manual.texi | 3 | ||||
| -rw-r--r-- | myisammrg/myrg_open.c | 15 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 286926e102e..f23ef6cca94 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -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 diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index f70d33feb2b..df94fb680cb 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -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,14 +74,14 @@ 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) + { + my_errno=HA_ERR_WRONG_IN_RECORD; + goto err; + } + info.reclength=isam->s->base.reclength; } - last_isam=isam; - if (info.reclength && info.reclength != isam->s->base.reclength) - { - my_errno=HA_ERR_WRONG_IN_RECORD; - goto err; - } - info.reclength=isam->s->base.reclength; } if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+ files*sizeof(MYRG_TABLE), |