Commit 018d0b9f authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
parents fe966fca 9ae1145d

tests/Makefile.am

+3 −6
Original line number Diff line number Diff line
@@ -50,14 +50,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ 
LIBS =			@CLIENT_LIBS@

LDADD =			@CLIENT_EXTRA_LDFLAGS@ \

                        $(LIBMYSQLCLIENT_LA)

if HAVE_NETWARE



mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)

mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \

			../mysys/my_memmem.c

else

mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys

mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)

endif

			$(top_srcdir)/mysys/my_memmem.c



insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)

select_test_SOURCES=       select_test.c $(yassl_dummy_link_fix)

insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)