mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
165eb1186c
Changed to use longlong10_to_str() instead of longlong2str() when base is 10 or -10 as former is much faster than later Changed my_vsnprintf() to use longlong2str instead of int2str() to get rid of warnings and to get support for long pointers even when long is 32 bit. client/mysqltest.cc: longlong2str() -> longlong10_to_str() include/m_string.h: Added extra argument to longlong2str() to make it have same prototype is int2str() mysys/charset.c: Fixed compiler warning mysys/mf_soundex.c: Fixed compiler warning mysys/my_getopt.c: longlong2str() -> longlong10_to_str() sql/create_options.cc: Fixed compiler warning sql/item_strfunc.cc: Added extra argument to longlong2str sql/opt_range.cc: longlong2str() -> longlong10_to_str() sql/partition_info.cc: longlong2str() -> longlong10_to_str() sql/slave.cc: longlong2str() -> longlong10_to_str() sql/sql_bitmap.h: Added extra argument to longlong2str sql/sql_partition.cc: Added extra argument to longlong2str sql/sql_select.cc: longlong2str() -> longlong10_to_str() sql/sql_show.cc: Added extra argument to longlong2str storage/innodb_plugin/handler/ha_innodb.cc: Update to new parameters for longlong2str() storage/maria/ma_dbug.c: longlong2str() -> longlong10_to_str() storage/maria/maria_chk.c: Added extra argument to longlong2str storage/myisam/mi_dbug.c: longlong2str() -> longlong10_to_str() storage/myisam/myisamchk.c: Added extra argument to longlong2str storage/xtradb/handler/ha_innodb.cc: Update to new parameters for longlong2str() strings/longlong2str.c: Added extra argument to longlong2str() to make it have same prototype is int2str() strings/my_vsnprintf.c: Changed my_vsnprintf() to use longlong2str instead of int2str() to get rid of warnings and to get support for long pointers even when long is 32 bit. Added cast to get rid of compiler warnings
202 lines
5.3 KiB
C
202 lines
5.3 KiB
C
/* Copyright (C) 2006 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; version 2 of the License.
|
|
|
|
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 "maria_def.h"
|
|
|
|
void _ma_print_key(FILE *stream, MARIA_KEY *key)
|
|
{
|
|
_ma_print_keydata(stream, key->keyinfo->seg, key->data, key->data_length);
|
|
}
|
|
|
|
|
|
/* Print a key in a user understandable format */
|
|
|
|
void _ma_print_keydata(FILE *stream, register HA_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)
|
|
{
|
|
/* A NULL value is encoded by a 1-byte flag. Zero means NULL. */
|
|
if (! *(key++))
|
|
{
|
|
fprintf(stream,"NULL");
|
|
continue;
|
|
}
|
|
end++;
|
|
}
|
|
|
|
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) *((const 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_uint4korr(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];
|
|
longlong10_to_str(mi_sint8korr(key),buff,-10);
|
|
VOID(fprintf(stream,"%s",buff));
|
|
key=end;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_ULONGLONG:
|
|
{
|
|
char buff[21];
|
|
longlong10_to_str(mi_sint8korr(key),buff,10);
|
|
VOID(fprintf(stream,"%s",buff));
|
|
key=end;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_BIT:
|
|
{
|
|
uint i;
|
|
fputs("0x",stream);
|
|
for (i=0 ; i < keyseg->length ; i++)
|
|
fprintf(stream, "%02x", (uint) *key++);
|
|
key= end;
|
|
break;
|
|
}
|
|
|
|
#endif
|
|
case HA_KEYTYPE_VARTEXT1: /* VARCHAR and TEXT */
|
|
case HA_KEYTYPE_VARTEXT2: /* VARCHAR and TEXT */
|
|
case HA_KEYTYPE_VARBINARY1: /* VARBINARY and BLOB */
|
|
case HA_KEYTYPE_VARBINARY2: /* VARBINARY and BLOB */
|
|
{
|
|
uint tmp_length;
|
|
get_key_length(tmp_length,key);
|
|
/*
|
|
The following command sometimes gives a warning from valgrind.
|
|
Not yet sure if the bug is in valgrind, glibc or mysqld
|
|
*/
|
|
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 _ma_check_table_is_closed(const char *name, const char *where)
|
|
{
|
|
char filename[FN_REFLEN];
|
|
LIST *pos;
|
|
DBUG_ENTER("_ma_check_table_is_closed");
|
|
|
|
(void) fn_format(filename,name,"",MARIA_NAME_IEXT,4+16+32);
|
|
pthread_mutex_lock(&THR_LOCK_maria);
|
|
for (pos=maria_open_list ; pos ; pos=pos->next)
|
|
{
|
|
MARIA_HA *info=(MARIA_HA*) pos->data;
|
|
MARIA_SHARE *share= info->s;
|
|
if (!strcmp(share->unique_file_name.str, 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));
|
|
pthread_mutex_unlock(&THR_LOCK_maria);
|
|
DBUG_RETURN(1);
|
|
}
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_maria);
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif /* EXTRA_DEBUG */
|