Merge neptunus.(none):/home/msvensson/mysql/work/my41-work

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


sql/Makefile.am:
  Auto merged

sql/Makefile.am

@@ -27,7 +27,7 @@ INCLUDES =		@ZLIB_INCLUDES@ \
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
-noinst_PROGRAMS =	gen_lex_hash
+EXTRA_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			$(top_builddir)/myisam/libmyisam.a \