Merge with 5.1

Fixed a couple of compilation failures that was not detected before merge.

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; \

libmysql/Makefile.shared

@@ -50,6 +50,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