diff options
| author | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
| commit | 447c18954e904e5770d64ae3b0817a16b9060b74 (patch) | |
| tree | 4689ffbe50e97ce9a47deb58fa2b9e7decdfc6a8 /myisammrg/myrg_open.c | |
| parent | 102cabfe4acd9c78fe321829bd168342b3fbd68a (diff) | |
| parent | 759cf54a9e70013d92fe18a84b3e4c56244de7da (diff) | |
| download | mariadb-git-447c18954e904e5770d64ae3b0817a16b9060b74.tar.gz | |
merge with 3.23.42
Diffstat (limited to 'myisammrg/myrg_open.c')
| -rw-r--r-- | myisammrg/myrg_open.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index ce2c97e1276..9fa89b315ff 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -30,10 +30,10 @@ */ -MYRG_INFO *myrg_open(name,mode,handle_locking) -const char *name; -int mode; -int handle_locking; +MYRG_INFO *myrg_open( +const char *name, +int mode, +int handle_locking) { int save_errno,i,errpos; uint files,dir_length,length,options; @@ -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), |