Commit d62fa4e4 authored by unknown's avatar unknown
Browse files

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

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


sql/Makefile.am:
  Auto merged
parents 56820e1c 772e03c2

sql/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEADERS) 
# this avoid the rebuild of the built files in a source dist

lex_hash.h:	gen_lex_hash.cc lex.h

		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)

		./gen_lex_hash$(EXEEXT) > $@

		./gen_lex_hash$(EXEEXT) > $@-t

		$(MV) $@-t $@



# For testing of udf_example.so

noinst_LTLIBRARIES= udf_example.la