Commit f1ecbe62 authored Aug 25, 2005 by unknown

Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0

parents 1f9f1229 0154ae54

mysql-test/t/disabled.def

+5 −2

Original line number	Diff line number	Diff line
		@@ -11,4 +11,7 @@
		##############################################################################

		sp-goto : GOTO is currently is disabled - will be fixed in the future

		rpl_relayrotate : Unstable test case, bug#12429
		rpl_until : Unstable test case, bug#12429
		rpl_deadlock : Unstable test case, bug#12429
		kill : Unstable test case, bug#9712

sql/examples/ha_tina.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -650,7 +650,9 @@ int ha_tina::rnd_init(bool scan)
		current_position= next_position= 0;
		records= 0;
		chain_ptr= chain;
		#ifdef MADV_SEQUENTIAL
		(void)madvise(share->mapped_file,share->file_stat.st_size,MADV_SEQUENTIAL);
		#endif

		DBUG_RETURN(0);
		}