Commit 2c353624 authored by unknown's avatar unknown
Browse files

fixed conflict making embedded server with libmysqld 


libmysqld/Makefile.am:
  Fixed conflict
parents e3528e0d 0310e2a7

libmysqld/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \

	spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	ha_blackhole.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)

libmysqld_a_SOURCES=