diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-02-08 16:01:13 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-02-08 16:01:13 -0700 |
| commit | 43ada21fe1961da0b0c6a0fcfe2040b13acd1320 (patch) | |
| tree | bf975ad89f04386e0a36ff1163782902a85ed0cf /ndb | |
| parent | 75d614e053301595a350c7ee610fd3e121ad4399 (diff) | |
| parent | 0554802f3cd52fc0241ca245d6e7d3cfc173a371 (diff) | |
| download | mariadb-git-43ada21fe1961da0b0c6a0fcfe2040b13acd1320.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/41
into siva.hindu.god:/home/tsmith/m/bk/maint/41
sql/sql_prepare.cc:
Manual merge
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/Makefile.am | 2 | ||||
| -rw-r--r-- | ndb/src/libndb.ver.in | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ndb/src/Makefile.am b/ndb/src/Makefile.am index eb1cf1c6543..056bb5a1734 100644 --- a/ndb/src/Makefile.am +++ b/ndb/src/Makefile.am @@ -6,6 +6,8 @@ ndblib_LTLIBRARIES = libndbclient.la libndbclient_la_SOURCES = +libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@ + libndbclient_la_LIBADD = \ ndbapi/libndbapi.la \ common/transporter/libtransporter.la \ diff --git a/ndb/src/libndb.ver.in b/ndb/src/libndb.ver.in new file mode 100644 index 00000000000..72bf93d196f --- /dev/null +++ b/ndb/src/libndb.ver.in @@ -0,0 +1,2 @@ +libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; }; + |