mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Fix for MacOSX and symlinks
Fix for USE_FRM and crashed index file configure.in: Fix for MacOSX and symlinks myisam/mi_open.c: Give better error message in case of of crashed index file mysql-test/r/repair.result: new test case mysql-test/r/update.result: new test case mysql-test/t/repair.test: Added test with crashed MyISAM index header mysql-test/t/update.test: Added test case from bugs system sql/handler.cc: Indentation changes sql/sql_table.cc: Fix for USE_FRM and crashed index file
This commit is contained in:
@ -114,8 +114,10 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
|
||||
errpos=1;
|
||||
if (my_read(kfile,(char*) share->state.header.file_version,head_length,
|
||||
MYF(MY_NABP)))
|
||||
{
|
||||
my_errno= HA_ERR_NOT_A_TABLE;
|
||||
goto err;
|
||||
|
||||
}
|
||||
if (memcmp((byte*) share->state.header.file_version,
|
||||
(byte*) myisam_file_magic, 4))
|
||||
{
|
||||
@ -165,7 +167,10 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
|
||||
}
|
||||
errpos=3;
|
||||
if (my_read(kfile,disk_cache,info_length,MYF(MY_NABP)))
|
||||
{
|
||||
my_errno=HA_ERR_CRASHED;
|
||||
goto err;
|
||||
}
|
||||
len=mi_uint2korr(share->state.header.state_info_length);
|
||||
keys= (uint) share->state.header.keys;
|
||||
uniques= (uint) share->state.header.uniques;
|
||||
|
Reference in New Issue
Block a user