mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
d9a9f38e87
Added preliminary handling of symlinks in MyISAM. When using myisamchk to check tables with --force, don't repair tables that are marked as 'not closed' if they are ok. Change fn_format() to use my_real_path and my_symlink include/myisam.h: Added handling of symlinks myisam/ft_boolean_search.c: cleanup myisam/ft_dump.c: cleanup myisam/mi_check.c: Added handling of symlinks. When using check and --force, don't repair tables that are marked as 'not closed' if they are ok. myisam/mi_create.c: Added handling of symlinks. myisam/mi_dbug.c: Added handling of symlinks. myisam/mi_info.c: Added handling of symlinks. myisam/mi_open.c: Added handling of symlinks. myisam/mi_search.c: cleanup myisam/myisamchk.c: Added handling of symlinks. myisam/myisamdef.h: Added handling of symlinks. myisam/myisamlog.c: Fixed bug when using new trees myisam/myisampack.c: cleanup mysys/mf_cache.c: cleanup mysys/mf_format.c: Change to use my_real_path and my_symlink mysys/my_alloc.c: cleanup BitKeeper/etc/ignore: Added libmysqld/sql_command libmysqld/backup_dir libmysqld/simple-test to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
177 lines
4.5 KiB
C
177 lines
4.5 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Support rutiner with are using with dbug */
|
|
|
|
#include "myisamdef.h"
|
|
|
|
/* Print a key in user understandable format */
|
|
|
|
void _mi_print_key(FILE *stream, register MI_KEYSEG *keyseg,
|
|
const uchar *key, uint length)
|
|
{
|
|
int flag;
|
|
short int s_1;
|
|
long int l_1;
|
|
float f_1;
|
|
double d_1;
|
|
const uchar *end;
|
|
const uchar *key_end=key+length;
|
|
|
|
VOID(fputs("Key: \"",stream));
|
|
flag=0;
|
|
for (; keyseg->type && key < key_end ;keyseg++)
|
|
{
|
|
if (flag++)
|
|
VOID(putc('-',stream));
|
|
end= key+ keyseg->length;
|
|
if (keyseg->flag & HA_NULL_PART)
|
|
{
|
|
if (!*key)
|
|
{
|
|
fprintf(stream,"NULL");
|
|
continue;
|
|
}
|
|
key++;
|
|
}
|
|
|
|
switch (keyseg->type) {
|
|
case HA_KEYTYPE_BINARY:
|
|
if (!(keyseg->flag & HA_SPACE_PACK) && keyseg->length == 1)
|
|
{ /* packed binary digit */
|
|
VOID(fprintf(stream,"%d",(uint) *key++));
|
|
break;
|
|
}
|
|
/* fall through */
|
|
case HA_KEYTYPE_TEXT:
|
|
case HA_KEYTYPE_NUM:
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
VOID(fprintf(stream,"%.*s",(int) *key,key+1));
|
|
key+= (int) *key+1;
|
|
}
|
|
else
|
|
{
|
|
VOID(fprintf(stream,"%.*s",(int) keyseg->length,key));
|
|
key=end;
|
|
}
|
|
break;
|
|
case HA_KEYTYPE_INT8:
|
|
VOID(fprintf(stream,"%d",(int) *((signed char*) key)));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_SHORT_INT:
|
|
s_1= mi_sint2korr(key);
|
|
VOID(fprintf(stream,"%d",(int) s_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_USHORT_INT:
|
|
{
|
|
ushort u_1;
|
|
u_1= mi_uint2korr(key);
|
|
VOID(fprintf(stream,"%u",(uint) u_1));
|
|
key=end;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_LONG_INT:
|
|
l_1=mi_sint4korr(key);
|
|
VOID(fprintf(stream,"%ld",l_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_ULONG_INT:
|
|
l_1=mi_sint4korr(key);
|
|
VOID(fprintf(stream,"%lu",(ulong) l_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_INT24:
|
|
VOID(fprintf(stream,"%ld",(long) mi_sint3korr(key)));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_UINT24:
|
|
VOID(fprintf(stream,"%lu",(ulong) mi_uint3korr(key)));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_FLOAT:
|
|
mi_float4get(f_1,key);
|
|
VOID(fprintf(stream,"%g",(double) f_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_DOUBLE:
|
|
mi_float8get(d_1,key);
|
|
VOID(fprintf(stream,"%g",d_1));
|
|
key=end;
|
|
break;
|
|
#ifdef HAVE_LONG_LONG
|
|
case HA_KEYTYPE_LONGLONG:
|
|
{
|
|
char buff[21];
|
|
longlong2str(mi_sint8korr(key),buff,-10);
|
|
VOID(fprintf(stream,"%s",buff));
|
|
key=end;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_ULONGLONG:
|
|
{
|
|
char buff[21];
|
|
longlong2str(mi_sint8korr(key),buff,10);
|
|
VOID(fprintf(stream,"%s",buff));
|
|
key=end;
|
|
break;
|
|
}
|
|
#endif
|
|
case HA_KEYTYPE_VARTEXT: /* VARCHAR and TEXT */
|
|
case HA_KEYTYPE_VARBINARY: /* VARBINARY and BLOB */
|
|
{
|
|
uint tmp_length;
|
|
get_key_length(tmp_length,key);
|
|
VOID(fprintf(stream,"%.*s",(int) tmp_length,key));
|
|
key+=tmp_length;
|
|
break;
|
|
}
|
|
default: break; /* This never happens */
|
|
}
|
|
}
|
|
VOID(fputs("\"\n",stream));
|
|
return;
|
|
} /* print_key */
|
|
|
|
|
|
#ifdef EXTRA_DEBUG
|
|
|
|
my_bool check_table_is_closed(const char *name, const char *where)
|
|
{
|
|
char filename[FN_REFLEN];
|
|
LIST *pos;
|
|
DBUG_ENTER("check_table_is_closed");
|
|
|
|
(void) fn_format(filename,name,"",MI_NAME_IEXT,4+16+32);
|
|
for (pos=myisam_open_list ; pos ; pos=pos->next)
|
|
{
|
|
MI_INFO *info=(MI_INFO*) pos->data;
|
|
MYISAM_SHARE *share=info->s;
|
|
if (!strcmp(share->unique_file_name,filename))
|
|
{
|
|
if (share->last_version)
|
|
{
|
|
fprintf(stderr,"Warning: Table: %s is open on %s\n", name,where);
|
|
DBUG_PRINT("warning",("Table: %s is open on %s", name,where));
|
|
DBUG_RETURN(1);
|
|
}
|
|
}
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif /* EXTRA_DEBUG */
|