Merge dev:/data0/mysqldev/my/build-200706140748-5.0.44/mysql-5.0-release

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged

5 files changed, 32 insertions, 6 deletions

diff --git a/configure.in b/configure.in
index 5f02b5eae63..2bf3e43caae 100644
--- a/configure.in
+++ b/configure.in
@@ -100,14 +100,22 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"],
 
 
 # Canonicalize the configuration name.
-SYSTEM_TYPE="$host_vendor-$host_os"
-MACHINE_TYPE="$host_cpu"
+
+# Check whether --with-system-type or --without-system-type was given.
+AC_ARG_WITH(system-type,
+    [  --with-system-type      Set the system type, like "sun-solaris10"],
+    [SYSTEM_TYPE="$withval"],
+    [SYSTEM_TYPE="$host_vendor-$host_os"])
+AC_ARG_WITH(machine-type,
+    [  --with-machine-type     Set the machine type, like "powerpc"],
+    [MACHINE_TYPE="$withval"],
+    [MACHINE_TYPE="$host_cpu"])
 AC_SUBST(SYSTEM_TYPE)
 AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"],
-                   [Name of system, eg solaris])
+                   [Name of system, eg sun-solaris])
 AC_SUBST(MACHINE_TYPE)
 AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],
-                   [Machine type name, eg sun10])
+                   [Machine type name, eg sparc])
 
 # Detect intel x86 like processor
 BASE_MACHINE_TYPE=$MACHINE_TYPE
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index cb60fb20863..72bc4445d83 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
 }
 
 
+/*
+  Free all memory and resources used by the client library
+
+  NOTES
+    When calling this there should not be any other threads using
+    the library.
+
+    To make things simpler when used with windows dll's (which calls this
+    function automaticly), it's safe to call this function multiple times.
+*/
+
+
 void STDCALL mysql_server_end()
 {
+  if (!mysql_client_init)
+    return;
+
 #ifdef EMBEDDED_LIBRARY
   end_embedded_server();
 #endif
diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc
index a055d98656c..a950ecf4ed3 100644
--- a/server-tools/instance-manager/listener.cc
+++ b/server-tools/instance-manager/listener.cc
@@ -67,7 +67,7 @@ public:
   ~Listener_thread();
   void run();
 private:
-  static const int LISTEN_BACK_LOG_SIZE= 5;     /* standard backlog size */
+  static const int LISTEN_BACK_LOG_SIZE;
   ulong total_connection_count;
   Thread_info thread_info;
 
@@ -80,6 +80,8 @@ private:
   int   create_unix_socket(struct sockaddr_un &unix_socket_address);
 };
 
+const int Listener_thread::LISTEN_BACK_LOG_SIZE = 5; /* standard backlog size */
+
 
 Listener_thread::Listener_thread(const Listener_thread_args &args) :
   Listener_thread_args(args.thread_registry, args.options, args.user_map,
diff --git a/sql/field.cc b/sql/field.cc
index f81b1c33fa7..bde1760a94d 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -6268,6 +6268,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
   is 2.
 ****************************************************************************/
 
+const uint Field_varstring::MAX_SIZE= UINT_MAX16;
 
 int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
 {
diff --git a/sql/field.h b/sql/field.h
index fb6534b7b55..fbf402ab5c3 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1116,7 +1116,7 @@ public:
     The maximum space available in a Field_varstring, in bytes. See
     length_bytes.
   */
-  static const uint MAX_SIZE= UINT_MAX16;
+  static const uint MAX_SIZE;
   /* Store number of bytes used to store length (1 or 2) */
   uint32 length_bytes;
   Field_varstring(char *ptr_arg,