bk commit into 5.1 tree (istruewing:1.2502)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-01 21:00:07+02:00, istruewing@stripped +1 -0
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Fixed compiler warnings

  sql/mysqld.cc@stripped, 2007-05-01 21:00:03+02:00, istruewing@stripped +4 -2
    WL#2936 - Falcon & MySQL plugin interface: server variables
    Fixed compiler warnings

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-wl2936-two

--- 1.641/sql/mysqld.cc	2007-05-01 21:00:20 +02:00
+++ 1.642/sql/mysqld.cc	2007-05-01 21:00:20 +02:00
@@ -1331,6 +1331,7 @@ static void clean_up_mutexes()
 ** Init IP and UNIX socket
 ****************************************************************************/
 
+#ifndef EMBEDDED_LIBRARY
 static void set_ports()
 {
   char	*env;
@@ -1355,7 +1356,6 @@ static void set_ports()
   }
 }
 
-#ifndef EMBEDDED_LIBRARY
 /* Change to run as another user if started with --user */
 
 static struct passwd *check_user(const char *user)
@@ -2614,16 +2614,18 @@ int STDCALL handle_kill(ulong ctrl_type)
 }
 #endif
 
+#if !defined(EMBEDDED_LIBRARY)
 static const char *load_default_groups[]= {
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 "mysql_cluster",
 #endif
 "mysqld","server", MYSQL_BASE_VERSION, 0, 0};
 
-#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY)
+#if defined(__WIN__)
 static const int load_default_groups_sz=
 sizeof(load_default_groups)/sizeof(load_default_groups[0]);
 #endif
+#endif /*!EMBEDDED_LIBRARY*/
 
 
 /*