Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
31f50324
Commit
31f50324
authored
Nov 13, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove "yassl_dummy_link_fix" in 5.1 as well
parent
430b4938
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
14 deletions
+6
-14
client/Makefile.am
client/Makefile.am
+6
-14
No files found.
client/Makefile.am
View file @
31f50324
...
@@ -16,12 +16,6 @@
...
@@ -16,12 +16,6 @@
# This file is public domain and comes with NO WARRANTY of any kind
# This file is public domain and comes with NO WARRANTY of any kind
if
HAVE_YASSL
yassl_dummy_link_fix
=
$(top_srcdir)
/extra/yassl/src/dummy.cpp
else
yassl_dummy_link_fix
=
endif
if
THREAD_SAFE_CLIENT
if
THREAD_SAFE_CLIENT
LIBMYSQLCLIENT_LA
=
$(top_builddir)
/libmysql_r/libmysqlclient_r.la
LIBMYSQLCLIENT_LA
=
$(top_builddir)
/libmysql_r/libmysqlclient_r.la
else
else
...
@@ -71,19 +65,18 @@ mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS)
...
@@ -71,19 +65,18 @@ mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS)
mysqldump_SOURCES
=
mysqldump.c
\
mysqldump_SOURCES
=
mysqldump.c
\
my_user.c
\
my_user.c
\
$(top_srcdir)
/mysys/mf_getdate.c
\
$(top_srcdir)
/mysys/mf_getdate.c
$(yassl_dummy_link_fix)
mysqlimport_SOURCES
=
mysqlimport.c
$(yassl_dummy_link_fix)
mysqlimport_SOURCES
=
mysqlimport.c
mysqlimport_LDADD
=
$(CXXLDFLAGS)
$(CLIENT_THREAD_LIBS)
\
mysqlimport_LDADD
=
$(CXXLDFLAGS)
$(CLIENT_THREAD_LIBS)
\
@CLIENT_EXTRA_LDFLAGS@
\
@CLIENT_EXTRA_LDFLAGS@
\
$(LIBMYSQLCLIENT_LA)
\
$(LIBMYSQLCLIENT_LA)
\
$(top_builddir)
/mysys/libmysys.a
$(top_builddir)
/mysys/libmysys.a
mysqlshow_SOURCES
=
mysqlshow.c
$(yassl_dummy_link_fix)
mysqlshow_SOURCES
=
mysqlshow.c
mysqlslap_SOURCES
=
mysqlslap.c
$(yassl_dummy_link_fix)
mysqlslap_SOURCES
=
mysqlslap.c
mysqlslap_LDADD
=
$(CXXLDFLAGS)
$(CLIENT_THREAD_LIBS)
\
mysqlslap_LDADD
=
$(CXXLDFLAGS)
$(CLIENT_THREAD_LIBS)
\
@CLIENT_EXTRA_LDFLAGS@
\
@CLIENT_EXTRA_LDFLAGS@
\
$(LIBMYSQLCLIENT_LA)
\
$(LIBMYSQLCLIENT_LA)
\
...
@@ -91,11 +84,10 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
...
@@ -91,11 +84,10 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
mysqltest_SOURCES
=
mysqltest.c
\
mysqltest_SOURCES
=
mysqltest.c
\
$(top_srcdir)
/mysys/my_getsystime.c
\
$(top_srcdir)
/mysys/my_getsystime.c
\
$(top_srcdir)
/mysys/my_copy.c
\
$(top_srcdir)
/mysys/my_copy.c
$(yassl_dummy_link_fix)
mysqltest_LDADD
=
$(top_builddir)
/regex/libregex.a
$(LDADD)
mysqltest_LDADD
=
$(top_builddir)
/regex/libregex.a
$(LDADD)
mysql_upgrade_SOURCES
=
mysql_upgrade.c
$(yassl_dummy_link_fix)
mysql_upgrade_SOURCES
=
mysql_upgrade.c
# Fix for mit-threads
# Fix for mit-threads
DEFS
=
-DUNDEF_THREADS_HACK
\
DEFS
=
-DUNDEF_THREADS_HACK
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment