Merge work:/home/bk/mysql-4.0 (53b88c20) · Commits · Software / OSDI20 Artifacts / mariadb

include/myisam.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -378,6 +378,8 @@ typedef struct st_mi_sort_param
		uint key, key_length,real_key_length,sortbuff_size;
		uint maxbuffers, keys, find_length, sort_keys_length;
		uchar **sort_keys;
		byte *rec_buff;
		uint alloced_rec_buff_length;
		void wordlist, wordptr;
		MI_KEYDEF *keyinfo;
		SORT_INFO *sort_info;

myisam/mi_check.c

+25 −19

Original line number	Diff line number	Diff line
		@@ -898,7 +898,7 @@ int chk_data_link(MI_CHECK param, MI_INFO info,int extend)
		info->checksum=mi_checksum(info,record);
		if (param->testflag & (T_EXTEND \| T_MEDIUM \| T_VERBOSE))
		{
		if (_mi_rec_check(info,record))
		if (_mi_rec_check(info,record, info->rec_buff))
		{
		mi_check_print_error(param,"Found wrong packed record at %s",
		llstr(start_recpos,llbuff));
		@@ -1143,6 +1143,8 @@ int mi_repair(MI_CHECK param, register MI_INFO info,
		MYF(MY_WME \| MY_WAIT_IF_FULL)))
		goto err;
		info->opt_flag\|=WRITE_CACHE_USED;
		sort_param.rec_buff=info->rec_buff;
		sort_param.alloced_rec_buff_length=info->alloced_rec_buff_length;
		if (!(sort_param.record=(byte*) my_malloc((uint) share->base.pack_reclength,
		MYF(0))))
		{
		@@ -1787,6 +1789,7 @@ int mi_repair_by_sort(MI_CHECK param, register MI_INFO info,
		param->testflag\|=T_REP; /* for easy checking */

		bzero((char*)&sort_info,sizeof(sort_info));
		bzero((char *)&sort_param, sizeof(sort_param));
		if (!(sort_info.key_block=
		alloc_key_blocks(param,
		(uint) param->sort_key_blocks,
		@@ -1804,6 +1807,8 @@ int mi_repair_by_sort(MI_CHECK param, register MI_INFO info,
		info->opt_flag\|=WRITE_CACHE_USED;
		info->rec_cache.file=info->dfile; /* for sort_delete_record */

		sort_param.rec_buff=info->rec_buff;
		sort_param.alloced_rec_buff_length=info->alloced_rec_buff_length;
		if (!(sort_param.record=(byte*) my_malloc((uint) share->base.pack_reclength,
		MYF(0))))
		{
		@@ -2570,15 +2575,13 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		my_off_t pos;
		byte *to;
		MI_BLOCK_INFO block_info;
		MI_INFO *info;
		MYISAM_SHARE *share;
		SORT_INFO *sort_info=sort_param->sort_info;
		MI_CHECK *param=sort_info->param;
		MI_INFO *info=sort_info->info;
		MYISAM_SHARE *share=info->s;
		char llbuff[22],llbuff2[22];
		DBUG_ENTER("sort_get_next_record");

		info=sort_info->info;
		share=info->s;
		switch (share->data_file_type) {
		case STATIC_RECORD:
		for (;;)
		@@ -2665,8 +2668,8 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		param->testflag\|=T_RETRY_WITHOUT_QUICK;
		DBUG_RETURN(1); /* Something wrong with data */
		}
		if (((b_type=_mi_get_block_info(&block_info,-1,pos)) &
		(BLOCK_ERROR \| BLOCK_FATAL_ERROR)) \|\|
		b_type=_mi_get_block_info(&block_info,-1,pos);
		if ((b_type & (BLOCK_ERROR \| BLOCK_FATAL_ERROR)) \|\|
		((b_type & BLOCK_FIRST) &&
		(block_info.rec_len < (uint) share->base.min_pack_length \|\|
		block_info.rec_len > (uint) share->base.max_pack_length)))
		@@ -2787,7 +2790,9 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		sort_param->pos=block_info.filepos+block_info.block_len;
		if (share->base.blobs)
		{
		if (!(to=mi_fix_rec_buff_for_blob(info,block_info.rec_len)))
		if (!(to=mi_alloc_rec_buff(info,block_info.rec_len,
		&(sort_param->rec_buff),
		&(sort_param->alloced_rec_buff_length))))
		{
		mi_check_print_error(param,"Not enough memory for blob at %s",
		llstr(sort_param->start_recpos,llbuff));
		@@ -2795,7 +2800,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		}
		}
		else
		to= info->rec_buff;
		to= sort_param->rec_buff;
		}
		if (left_length < block_info.data_len \|\| ! block_info.data_len)
		{
		@@ -2837,7 +2842,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		}
		} while (left_length);

		if (_mi_rec_unpack(info,sort_param->record,info->rec_buff,
		if (_mi_rec_unpack(info,sort_param->record,sort_param->rec_buff,
		sort_param->find_length) != MY_FILE_ERROR)
		{
		if (sort_param->read_cache.error < 0)
		@@ -2846,7 +2851,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		info->checksum=mi_checksum(info,sort_param->record);
		if ((param->testflag & (T_EXTEND \| T_REP)) \|\| searching)
		{
		if (_mi_rec_check(info, sort_param->record))
		if (_mi_rec_check(info, sort_param->record, sort_param->rec_buff))
		{
		mi_check_print_info(param,"Found wrong packed record at %s",
		llstr(sort_param->start_recpos,llbuff));
		@@ -2858,7 +2863,8 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		DBUG_RETURN(0);
		}
		if (!searching)
		mi_check_print_info(param,"Found wrong stored record at %s",
		mi_check_print_info(param,"Key %d - Found wrong stored record at %s",
		sort_param->key+1,
		llstr(sort_param->start_recpos,llbuff));
		try_next:
		pos=(sort_param->start_recpos+=MI_DYN_ALIGN_SIZE);
		@@ -2894,7 +2900,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		llstr(sort_param->pos,llbuff));
		continue;
		}
		if (_mi_read_cache(&sort_param->read_cache,(byte*) info->rec_buff,
		if (_mi_read_cache(&sort_param->read_cache,(byte*) sort_param->rec_buff,
		block_info.filepos, block_info.rec_len,
		READING_NEXT))
		{
		@@ -2903,7 +2909,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		llstr(sort_param->pos,llbuff));
		continue;
		}
		if (_mi_pack_rec_unpack(info,sort_param->record,info->rec_buff,
		if (_mi_pack_rec_unpack(info,sort_param->record,sort_param->rec_buff,
		block_info.rec_len))
		{
		if (! searching)
		@@ -2963,7 +2969,7 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
		break;
		case DYNAMIC_RECORD:
		if (! info->blobs)
		from=info->rec_buff;
		from=sort_param->rec_buff;
		else
		{
		/* must be sure that local buffer is big enough */
		@@ -3013,7 +3019,7 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
		if (info->s->base.blobs)
		length+=save_pack_length(block_buff+length,info->blob_length);
		if (my_b_write(&info->rec_cache,block_buff,length) \|\|
		my_b_write(&info->rec_cache,(byte*) info->rec_buff,reclength))
		my_b_write(&info->rec_cache,(byte*) sort_param->rec_buff,reclength))
		{
		mi_check_print_error(param,"%d when writing to datafile",my_errno);
		DBUG_RETURN(1);

myisam/mi_close.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ int mi_close(register MI_INFO *info)
		myisam_open_list=list_delete(myisam_open_list,&info->open_list);
		pthread_mutex_unlock(&share->intern_lock);

		my_free(mi_get_rec_buff_ptr(info, info->rec_buff), MYF(MY_ALLOW_ZERO_PTR));
		if (flag)
		{
		if (share->kfile >= 0 &&
		@@ -101,7 +102,6 @@ int mi_close(register MI_INFO *info)
		error = my_errno;

		myisam_log_command(MI_LOG_CLOSE,info,NULL,0,error);
		my_free((gptr) info->rec_alloc,MYF(MY_ALLOW_ZERO_PTR));
		my_free((gptr) info,MYF(0));

		if (error)

myisam/mi_dynrec.c

+7 −30

Original line number	Diff line number	Diff line
		@@ -724,11 +724,11 @@ uint _mi_rec_pack(MI_INFO info, register byte to, register const byte *from)


		/*
		** Check if a record was correctly packed. Used only by isamchk
		** Returns 0 if record is ok.
		Check if a record was correctly packed. Used only by myisamchk
		Returns 0 if record is ok.
		*/

		my_bool _mi_rec_check(MI_INFO info,const char record)
		my_bool _mi_rec_check(MI_INFO info,const char record, byte *rec_buff)
		{
		uint length,new_length,flag,bit,i;
		char pos,end,packpos,to;
		@@ -736,7 +736,7 @@ my_bool _mi_rec_check(MI_INFO info,const char record)
		reg3 MI_COLUMNDEF *rec;
		DBUG_ENTER("_mi_rec_check");

		packpos=info->rec_buff; to= info->rec_buff+info->s->base.pack_bits;
		packpos=rec_buff; to= rec_buff+info->s->base.pack_bits;
		rec=info->s->rec;
		flag= *packpos; bit=1;

		@@ -820,7 +820,7 @@ my_bool _mi_rec_check(MI_INFO info,const char record)
		to+=length;
		}
		}
		if (info->packed_length != (uint) (to - info->rec_buff)
		if (info->packed_length != (uint) (to - rec_buff)
		+ test(info->s->calc_checksum) \|\|
		(bit != 1 && (flag & ~(bit - 1))))
		goto err;
		@@ -1090,32 +1090,12 @@ int _mi_read_dynamic_record(MI_INFO info, my_off_t filepos, byte buf)
		DBUG_RETURN(-1);
		}


		byte mi_fix_rec_buff_for_blob(MI_INFO info, ulong length)
		{
		uint extra;
		if (! info->rec_buff \|\| length > info->alloced_rec_buff_length)
		{
		byte *newptr;
		extra=ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER)+MI_SPLIT_LENGTH+
		MI_DYN_DELETE_BLOCK_HEADER;
		if (!(newptr=(byte*) my_realloc((gptr) info->rec_alloc,length+extra,
		MYF(MY_ALLOW_ZERO_PTR))))
		return newptr;
		info->rec_alloc=newptr;
		info->rec_buff=newptr+ALIGN_SIZE(MI_DYN_DELETE_BLOCK_HEADER);
		info->alloced_rec_buff_length=length;
		}
		return info->rec_buff;
		}


		/* compare unique constraint between stored rows */

		int _mi_cmp_dynamic_unique(MI_INFO info, MI_UNIQUEDEF def,
		const byte *record, my_off_t pos)
		{
		byte rec_buff,rec_alloc,*old_record;
		byte rec_buff,old_record;
		uint alloced_rec_buff_length;
		int error;
		DBUG_ENTER("_mi_cmp_dynamic_unique");
		@@ -1125,12 +1105,10 @@ int _mi_cmp_dynamic_unique(MI_INFO info, MI_UNIQUEDEF def,

		/* Don't let the compare destroy blobs that may be in use */
		rec_buff=info->rec_buff;
		rec_alloc=info->rec_alloc;
		alloced_rec_buff_length=info->alloced_rec_buff_length;
		if (info->s->base.blobs)
		{
		info->rec_buff=0;
		info->rec_alloc=0;
		info->alloced_rec_buff_length=0;
		}
		error=_mi_read_dynamic_record(info,pos,old_record);
		@@ -1138,9 +1116,8 @@ int _mi_cmp_dynamic_unique(MI_INFO info, MI_UNIQUEDEF def,
		error=mi_unique_comp(def, record, old_record, def->null_are_equal);
		if (info->s->base.blobs)
		{
		my_free(info->rec_alloc,MYF(MY_ALLOW_ZERO_PTR));
		my_free(mi_get_rec_buff_ptr(info, info->rec_buff), MYF(MY_ALLOW_ZERO_PTR));
		info->rec_buff=rec_buff;
		info->rec_alloc=rec_alloc;
		info->alloced_rec_buff_length=alloced_rec_buff_length;
		}
		my_afree(old_record);

myisam/mi_extra.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -328,11 +328,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function)
		}
		}
		if (share->base.blobs)
		{
		my_free(info->rec_alloc,MYF(MY_ALLOW_ZERO_PTR));
		info->rec_alloc=info->rec_buff=0;
		mi_fix_rec_buff_for_blob(info,info->s->base.pack_reclength);
		}
		mi_fix_rec_buff_for_blob(info, -1);
		break;
		case HA_EXTRA_NORMAL: /* Theese isn't in use */
		info->quick_mode=0;