Commit b6c8c68e authored Mar 16, 2006 by unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged

parents 2d360cd0 36432606

include/config-win.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -429,8 +429,8 @@ inline double ulonglong2double(ulonglong value)
		#define HAVE_RTREE_KEYS 1
		#define HAVE_ROW_BASED_REPLICATION 1

		/* #undef HAVE_OPENSSL */
		/* #undef HAVE_YASSL */
		#define HAVE_OPENSSL 1
		#define HAVE_YASSL 1

		/* Define charsets you want */
		/* #undef HAVE_CHARSET_armscii8 */

mysql-test/t/rpl_ndb_multi_update2.test

+5 −0

Original line number	Diff line number	Diff line
		@@ -3,5 +3,10 @@
		# to reuse test code between engine runs #
		############################################################
		-- source include/have_ndb.inc

		# Run this only for row based replication, as replication of
		# auto_increment values are not supported with NDB as storage engine
		-- source include/have_binlog_format_row.inc

		let $engine_type=NDB;
		--source extra/rpl_tests/rpl_multi_update2.test