Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 (d6d8749c) · Commits · Software / OSDI20 Artifacts / mariadb

myisam/mi_check.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1155,12 +1155,13 @@ int chk_data_link(MI_CHECK param, MI_INFO info,int extend)
		*/
		int search_result= (keyinfo->flag & HA_SPATIAL) ?
		rtree_find_first(info, key, info->lastkey, key_length,
		SEARCH_SAME) :
		MBR_EQUAL \| MBR_DATA) :
		_mi_search(info,keyinfo,info->lastkey,key_length,
		SEARCH_SAME, info->s->state.key_root[key]);
		if (search_result)
		{
		mi_check_print_error(param,"Record at: %10s Can't find key for index: %2d",
		mi_check_print_error(param,"Record at: %10s "
		"Can't find key for index: %2d",
		llstr(start_recpos,llbuff),key+1);
		if (error++ > MAXERR \|\| !(param->testflag & T_VERBOSE))
		goto err2;

myisam/mi_create.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,8 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		my_off_t key_root[MI_MAX_POSSIBLE_KEY],key_del[MI_MAX_KEY_BLOCK_SIZE];
		MI_CREATE_INFO tmp_create_info;
		DBUG_ENTER("mi_create");
		DBUG_PRINT("enter", ("keys: %u columns: %u uniques: %u flags: %u",
		keys, columns, uniques, flags));

		if (!ci)
		{
		@@ -447,6 +449,16 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		uniques * MI_UNIQUEDEF_SIZE +
		(key_segs + unique_key_parts)*HA_KEYSEG_SIZE+
		columns*MI_COLUMNDEF_SIZE);
		DBUG_PRINT("info", ("info_length: %u", info_length));
		/* There are only 16 bits for the total header length. */
		if (info_length > 65535)
		{
		my_printf_error(0, "MyISAM table '%s' has too many columns and/or "
		"indexes and/or unique constraints.",
		MYF(0), name + dirname_length(name));
		my_errno= HA_WRONG_CREATE_OPTION;
		goto err;
		}

		bmove(share.state.header.file_version,(byte*) myisam_file_magic,4);
		ci->old_options=options\| (ci->old_options & HA_OPTION_TEMP_COMPRESS_RECORD ?
		@@ -616,6 +628,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		errpos=3;
		}

		DBUG_PRINT("info", ("write state info and base info"));
		if (mi_state_info_write(file, &share.state, 2) \|\|
		mi_base_info_write(file, &share.base))
		goto err;
		@@ -629,6 +642,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		#endif

		/* Write key and keyseg definitions */
		DBUG_PRINT("info", ("write key and keyseg definitions"));
		for (i=0 ; i < share.base.keys - uniques; i++)
		{
		uint sp_segs=(keydefs[i].flag & HA_SPATIAL) ? 2*SPDIMS : 0;
		@@ -677,6 +691,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		}

		/* Save unique definition */
		DBUG_PRINT("info", ("write unique definitions"));
		for (i=0 ; i < share.state.header.uniques ; i++)
		{
		if (mi_uniquedef_write(file, &uniquedefs[i]))
		@@ -687,6 +702,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		goto err;
		}
		}
		DBUG_PRINT("info", ("write field definitions"));
		for (i=0 ; i < share.base.fields ; i++)
		if (mi_recinfo_write(file, &recinfo[i]))
		goto err;
		@@ -701,6 +717,7 @@ int mi_create(const char name,uint keys,MI_KEYDEF keydefs,
		#endif

		/* Enlarge files */
		DBUG_PRINT("info", ("enlarge to keystart: %lu", (ulong) share.base.keystart));
		if (my_chsize(file,(ulong) share.base.keystart,0,MYF(0)))
		goto err;

myisam/mi_delete_table.c

+18 −6

Original line number	Diff line number	Diff line
		@@ -34,13 +34,25 @@ int mi_delete_table(const char *name)
		#ifdef USE_RAID
		{
		MI_INFO *info;
		/* we use 'open_for_repair' to be able to delete a crashed table */
		/*
		When built with RAID support, we need to determine if this table
		makes use of the raid feature. If yes, we need to remove all raid
		chunks. This is done with my_raid_delete(). Unfortunately it is
		necessary to open the table just to check this. We use
		'open_for_repair' to be able to open even a crashed table. If even
		this open fails, we assume no raid configuration for this table
		and try to remove the normal data file only. This may however
		leave the raid chunks behind.
		*/
		if (!(info= mi_open(name, O_RDONLY, HA_OPEN_FOR_REPAIR)))
		DBUG_RETURN(my_errno);
		raid_type= 0;
		else
		{
		raid_type= info->s->base.raid_type;
		raid_chunks= info->s->base.raid_chunks;
		mi_close(info);
		}
		}
		#ifdef EXTRA_DEBUG
		check_table_is_closed(name,"delete");
		#endif

myisam/mi_dynrec.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1116,6 +1116,9 @@ int _mi_read_dynamic_record(MI_INFO info, my_off_t filepos, byte buf)
		info->rec_cache.pos_in_file <= block_info.next_filepos &&
		flush_io_cache(&info->rec_cache))
		goto err;
		/* A corrupted table can have wrong pointers. (Bug# 19835) */
		if (block_info.next_filepos == HA_OFFSET_ERROR)
		goto panic;
		info->rec_cache.seek_not_done=1;
		if ((b_type=_mi_get_block_info(&block_info,file,
		block_info.next_filepos))

myisam/mi_key.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ uint _mi_make_key(register MI_INFO info, uint keynr, uchar key,
		TODO: nulls processing
		*/
		#ifdef HAVE_SPATIAL
		return sp_make_key(info,keynr,key,record,filepos);
		DBUG_RETURN(sp_make_key(info,keynr,key,record,filepos));
		#else
		DBUG_ASSERT(0); /* mi_open should check that this never happens*/
		#endif