mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
e4e85cd2ef
Fixed wrong mutex order bug in Aria when flush_log_for_bitmap() was called when table is not yet marked for change. include/my_base.h: Added flag that table is opened only for status mysql-test/r/myisam-big.result: Test case for lp:925377 mysql-test/t/myisam-big.test: Test case for lp:925377 sql/sql_base.cc: If thd->version == 0 (happens only when we are opening a table that is flushed under MYSQL_LOCK_IGNORE_FLUSH), open the table in HA_OPEN_FOR_STATUS mode storage/maria/ma_bitmap.c: Fixed wrong mutex order bug in Aria when flush_log_for_bitmap() was called when table is not yet marked for change. storage/maria/ma_dbug.c: Ignore last_version <= 1 as these are either flushed or only opened for status storage/maria/ma_open.c: Use last_version=1 as a marker that table was opened with HA_OPEN_FOR_STATUS. In this case we just open a new version of the table in read only mode. storage/myisam/mi_create.c: Update prototype storage/myisam/mi_dbug.c: Ignore last_version <= 1 as these are either flushed or only opened for status storage/myisam/mi_open.c: Use last_version=1 as a marker that table was opened with HA_OPEN_FOR_STATUS. If HA_OPEN_FOR_STATUS is used, we will not assert if there is an old not-to-be-used version of the table existing. In this case we just open a new version of the table in read only mode. storage/myisam/myisamdef.h: Updated prototype
207 lines
5.5 KiB
C
207 lines
5.5 KiB
C
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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 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) *((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;
|
|
}
|
|
#endif
|
|
case HA_KEYTYPE_BIT:
|
|
{
|
|
uint i;
|
|
fputs("0x",stream);
|
|
for (i=0 ; i < keyseg->length ; i++)
|
|
fprintf(stream, "%02x", (uint) *key++);
|
|
key= end;
|
|
break;
|
|
}
|
|
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
|
|
/**
|
|
Check if the named table is in the open list.
|
|
|
|
@param[in] name table path as in MYISAM_SHARE::unique_file_name
|
|
@param[in] where verbal description of caller
|
|
|
|
@retval TRUE table is in open list
|
|
@retval FALSE table is not in open list
|
|
|
|
@note This function takes THR_LOCK_myisam. Do not call it when
|
|
this mutex is locked by this thread already.
|
|
*/
|
|
|
|
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);
|
|
mysql_mutex_lock(&THR_LOCK_myisam);
|
|
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)
|
|
{
|
|
mysql_mutex_unlock(&THR_LOCK_myisam);
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_myisam);
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif /* EXTRA_DEBUG */
|