Commit f9146c15 authored by unknown's avatar unknown
Browse files

Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


ndb/src/Makefile.am:
  Auto merged
configure.in:
  Difficult merge - will do by hand.
parents 90387cd4 8f16a255

ndb/src/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ ndblib_LTLIBRARIES = libndbclient.la 


libndbclient_la_SOURCES =



libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@

libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@



libndbclient_la_LIBADD =  \

              ndbapi/libndbapi.la \

ndb/src/libndb.ver.in

0 → 100644
+2 −0
Original line number Diff line number Diff line 
libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; };