Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 (37d6a4e4) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+2 −0

Original line number	Diff line number	Diff line
		@@ -48987,6 +48987,8 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.

		@itemize @bullet
		@item
		Fixed problem on win98 that made sending of results very slow.
		@item
		Boolean fulltext search weighting scheme changed to something more reasonable.
		@item
		Fixed bug in boolean fulltext search, that caused MySQL to ignore queries of

+3 −3

Original line number	Diff line number	Diff line
		@@ -851,10 +851,10 @@ static void mysql_read_default_options(struct st_mysql_options *options,
		options->rpl_probe= 1;
		break;
		case 24: /* enable-reads-from-master */
		options->rpl_parse = 1;
		options->no_master_reads= 0;
		break;
		case 25: /* repl-parse-query */
		options->no_master_reads = 0;
		options->rpl_parse= 1;
		break;
		default:
		DBUG_PRINT("warning",("unknown option: %s",option[0]));

+6 −6

Original line number	Diff line number	Diff line
		@@ -489,7 +489,7 @@ float ft_boolean_find_relevance(FT_INFO ftb, byte record, uint length)
		ftbw=(FTB_WORD *)(ftb->list[c]);
		if (_mi_compare_text(ftb->charset, word.pos, word.len,
		(uchar*) ftbw->word+1, ftbw->len-1,
		(ftbw->flags&FTB_FLAG_TRUNC) ) >0)
		(my_bool) (ftbw->flags&FTB_FLAG_TRUNC)) >0)
		b=c;
		else
		a=c;
		@@ -499,7 +499,7 @@ float ft_boolean_find_relevance(FT_INFO ftb, byte record, uint length)
		ftbw=(FTB_WORD *)(ftb->list[c]);
		if (_mi_compare_text(ftb->charset, word.pos,word.len,
		(uchar*) ftbw->word+1,ftbw->len-1,
		(ftbw->flags&FTB_FLAG_TRUNC) ))
		(my_bool) (ftbw->flags&FTB_FLAG_TRUNC)))
		break;
		if (ftbw->docid[1] == docid)
		continue;

+8 −8

Original line number	Diff line number	Diff line
		@@ -105,6 +105,8 @@ static long thread_id=0;
		my_bool my_thread_init(void)
		{
		struct st_my_thread_var *tmp;
		my_bool error=0;

		#ifdef EXTRA_DEBUG_THREADS
		fprintf(stderr,"my_thread_init(): thread_id=%ld\n",pthread_self());
		#endif
		@@ -119,14 +121,12 @@ my_bool my_thread_init(void)
		fprintf(stderr,"my_thread_init() called more than once in thread %ld\n",
		pthread_self());
		#endif
		pthread_mutex_unlock(&THR_LOCK_lock);
		return 0; /* Safequard */
		goto end;
		}
		if (!(tmp=(struct st_my_thread_var *)
		calloc(1, sizeof(struct st_my_thread_var))))
		if (!(tmp= (struct st_my_thread_var ) calloc(1, sizeof(tmp))))
		{
		pthread_mutex_unlock(&THR_LOCK_lock);
		return 1;
		error= 1;
		goto end;
		}
		pthread_setspecific(THR_KEY_mysys,tmp);

		@@ -146,7 +146,7 @@ my_bool my_thread_init(void)
		#if !defined(__WIN__) \|\| defined(USE_TLS) \|\| ! defined(SAFE_MUTEX)
		pthread_mutex_unlock(&THR_LOCK_lock);
		#endif
		return 0;
		return error;
		}

		void my_thread_end(void)

+4 −3

Original line number	Diff line number	Diff line
		@@ -195,6 +195,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
		Item *item;
		char buff[80];
		CONVERT convert= (flag & 4) ? (CONVERT) 0 : thd->convert_set;
		DBUG_ENTER("send_fields");

		String tmp((char) buff,sizeof(buff)),res,*packet= &thd->packet;

		@@ -255,11 +256,11 @@ send_fields(THD *thd,List<Item> &list,uint flag)
		if (my_net_write(&thd->net, (char*) packet->ptr(),packet->length()))
		break; /* purecov: inspected */
		}
		send_eof(&thd->net);
		return 0;
		send_eof(&thd->net,1);
		DBUG_RETURN(0);
		err:
		send_error(&thd->net,ER_OUT_OF_RESOURCES); /* purecov: inspected */
		return 1; /* purecov: inspected */
		DBUG_RETURN(1); /* purecov: inspected */
		}