From 4351bedba7fb4d1ed2f9a7c8c89c015c596badf2 Mon Sep 17 00:00:00 2001
From: marko <Unknown>
Date: Thu, 5 Oct 2006 11:00:06 +0000
Subject: [PATCH] Merge changes from MySQL AB.

dict_col_copy_type_noninline(): Remove the return statement.
Some compilers do not allow return expressions of void type.

innobase_start_or_create_for_mysql(): Do not cap srv_max_threads to 1000
on Windows.

Makefile.am (EXTRA_DIST): Add plug.in
---
 Makefile.am      | 2 +-
 dict/dict0dict.c | 2 +-
 srv/srv0start.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bdab35f1dc0..f2b5e5f4bfc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,7 @@ EXTRA_DIST = 	include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr
 		include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic include/ha_prototypes.h \
 		include/ut0list.h include/ut0list.ic \
 		include/ut0wqueue.h \
-		CMakeLists.txt
+		CMakeLists.txt plug.in
 
 noinst_LIBRARIES =	libinnobase.a
 libinnobase_a_LIBADD =	usr/libusr.a srv/libsrv.a dict/libdict.a \
diff --git a/dict/dict0dict.c b/dict/dict0dict.c
index 209054151f4..44a374fe550 100644
--- a/dict/dict0dict.c
+++ b/dict/dict0dict.c
@@ -334,7 +334,7 @@ dict_col_copy_type_noninline(
 	const dict_col_t*	col,	/* in: column */
 	dtype_t*		type)	/* out: data type */
 {
-	return(dict_col_copy_type(col, type));
+	dict_col_copy_type(col, type);
 }
 
 /************************************************************************
diff --git a/srv/srv0start.c b/srv/srv0start.c
index d5b44fac3fa..5eaea26b75d 100644
--- a/srv/srv0start.c
+++ b/srv/srv0start.c
@@ -1163,7 +1163,7 @@ innobase_start_or_create_for_mysql(void)
 	maximum number of threads that can wait in the 'srv_conc array' for
 	their time to enter InnoDB. */
 
-#if defined(__WIN__) || defined(__NETWARE__)
+#if defined(__NETWARE__)
 
 	/* Create less event semaphores because Win 98/ME had
 	difficulty creating 40000 event semaphores.  Comment from