From 9147ad3a8dbcc66ba967572eb4caa428635b08e5 Mon Sep 17 00:00:00 2001
From: "jani@ua141d10.elisa.omakaista.fi" <>
Date: Tue, 27 Mar 2007 18:48:05 +0300
Subject: [PATCH] Small fixes.

---
 sql/mysqld.cc   | 18 +++++++-----------
 sql/net_serv.cc |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 083f0eb1373..65c4e360c4c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -280,7 +280,11 @@ static TYPELIB tc_heuristic_recover_typelib=
 };
 
 static const char *thread_handling_names[]=
-{ "one-thread-per-connection", "no-threads", "pool-of-threads", NullS};
+{ "one-thread-per-connection", "no-threads",
+#if HAVE_POOL_OF_THREADS == 1
+  "pool-of-threads",
+#endif
+  NullS};
 
 TYPELIB thread_handling_typelib=
 {
@@ -7860,16 +7864,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   case OPT_THREAD_HANDLING:
   {
-    if ((global_system_variables.thread_handling=
-         find_type(argument, &thread_handling_typelib, 2)) <= 0 ||
-        (global_system_variables.thread_handling == SCHEDULER_POOL_OF_THREADS
-         && !HAVE_POOL_OF_THREADS))
-    {
-      /* purecov: begin tested */
-      fprintf(stderr,"Unknown/unsupported thread-handling: %s\n",argument);
-      exit(1);
-      /* purecov: end */
-    }
+    global_system_variables.thread_handling=
+      find_type_or_exit(argument, &thread_handling_typelib, opt->name);
     break;
   }
   case OPT_FT_BOOLEAN_SYNTAX:
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 2156888b8cf..041a7fb67f6 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -298,7 +298,7 @@ void net_clear(NET *net, my_bool clear_buffer)
       {
         DBUG_PRINT("info",("skipped %d bytes from file: %s",
                            count, vio_description(net->vio)));
-#if defined(EXTRA_DEBUG) && (MYSQL_VERSION_ID < 51000)
+#if defined(EXTRA_DEBUG) && (MYSQL_VERSION_ID < 50100)
         fprintf(stderr,"Error: net_clear() skipped %d bytes from file: %s\n",
                 count, vio_description(net->vio));
 #endif