database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix problem with comments/blank lines in MERGE files.

Browse Source 
Docs/manual.texi:
  Changelog
This commit is contained in:
unknown
2001-08-30 11:20:28 +03:00
parent 9001f3515b
commit 0fbb50b597
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Docs/manual.texi
View File

@ -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

15
myisammrg/myrg_open.c
View File

@ -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,14 +74,14 @@ 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;
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)+ if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+
files*sizeof(MYRG_TABLE), files*sizeof(MYRG_TABLE),