Merge with 5.1 to get in changes from MySQL 5.1.55

3 files changed, 11 insertions, 2 deletions

diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index b628bff9a3f..af10794f693 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -41,7 +41,7 @@ link_sources:
 	  ms=`echo $(mysysobjects) | sed "s;\.lo;.c;g"`; \
 	  vs=`echo $(vio_objects) | sed "s;\.lo;.c;g"`; \
 	  scs=`echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"`; \
-	  for f in $$ss; do \
+	  for f in $$ss $(mystringsheaders); do \
 	    rm -f $$f; \
 	    @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
 	  done; \
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 706feef8df3..41590815bcb 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -51,6 +51,7 @@ mystringsobjects =	strmov.lo strxmov.lo strxnmov.lo strnmov.lo \
                         strmov_overlapp.lo
 
 mystringsextra= 	strto.c
+mystringsheaders=	strings_def.h
 dbugobjects =		dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo
 mysysheaders =		mysys_priv.h my_static.h
 vioheaders =		vio_priv.h
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 87aede33224..51ddc0ec951 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -133,7 +133,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
       mysql_port = MYSQL_PORT;
 #ifndef MSDOS
       {
-	char	*env;
+	char *env;
 
         /*
           if builder specifically requested a default port, use that
@@ -213,11 +213,19 @@ void STDCALL mysql_server_end()
   {
     my_end(0);
   }
+#ifdef NOT_NEEDED
+  /*
+    The following is not needed as if the program explicitely called
+    my_init() then we can assume it will also call my_end().
+    The reason to not also do it here is in that case we can't get
+    statistics from my_end() to debug log.
+  */
   else
   {
     free_charsets();
     mysql_thread_end();
   }
+#endif
 
   mysql_client_init= org_my_init_done= 0;
 #ifdef EMBEDDED_SERVER