Commit 114ac656 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


configure.in:
  Auto merged
ndb/src/Makefile.am:
  Auto merged
parents b8ae1138 af3d6c48

configure.in

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ DOT_FRM_VERSION=6 
SHARED_LIB_MAJOR_VERSION=15

SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0



NDB_SHARED_LIB_MAJOR_VERSION=1

NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0





# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0
@@ -72,6 +76,9 @@ AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION], 
                   [Version of .frm files])

AC_SUBST(SHARED_LIB_MAJOR_VERSION)

AC_SUBST(SHARED_LIB_VERSION)

AC_SUBST(NDB_SHARED_LIB_MAJOR_VERSION)

AC_SUBST(NDB_SHARED_LIB_VERSION)



AC_SUBST(AVAILABLE_LANGUAGES)



AC_SUBST([NDB_VERSION_MAJOR])

ndb/src/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ ndblib_LTLIBRARIES = libndbclient.la 


libndbclient_la_SOURCES =



libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@



libndbclient_la_LIBADD =  \

              ndbapi/libndbapi.la \

              common/transporter/libtransporter.la   \