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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fcc53fa7
Commit
fcc53fa7
authored
Jul 10, 2012
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql_client_test did not build within limbysqld/examples
parent
db33b499
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
libmysqld/examples/CMakeLists.txt
libmysqld/examples/CMakeLists.txt
+2
-1
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+2
-1
No files found.
libmysqld/examples/CMakeLists.txt
View file @
fcc53fa7
...
@@ -18,6 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
...
@@ -18,6 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${
CMAKE_SOURCE_DIR
}
/libmysqld/include
${
CMAKE_SOURCE_DIR
}
/libmysqld/include
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/regex
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/zlib
${
CMAKE_SOURCE_DIR
}
/tests
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
${
CMAKE_SOURCE_DIR
}
/extra/yassl/include
)
# Currently does not work with DBUG, there are missing symbols reported.
# Currently does not work with DBUG, there are missing symbols reported.
...
...
libmysqld/examples/Makefile.am
View file @
fcc53fa7
...
@@ -35,7 +35,7 @@ link_sources:
...
@@ -35,7 +35,7 @@ link_sources:
DEFS
=
-DEMBEDDED_LIBRARY
DEFS
=
-DEMBEDDED_LIBRARY
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
-I
$(top_srcdir)
/regex
\
$(openssl_includes)
-I
$(top_srcdir)
/tests
$(openssl_includes)
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
$(yassl_libs)
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
$(yassl_libs)
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@
$(CXXLDFLAGS)
\
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@
$(CXXLDFLAGS)
\
@NDB_SCI_LIBS@
@NDB_SCI_LIBS@
...
@@ -51,6 +51,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
...
@@ -51,6 +51,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
mysql_client_test_embedded_LINK
=
$(CXXLINK)
mysql_client_test_embedded_LINK
=
$(CXXLINK)
nodist_mysql_client_test_embedded_SOURCES
=
mysql_client_test.c
nodist_mysql_client_test_embedded_SOURCES
=
mysql_client_test.c
mysql_client_test.o
:
$(top_srcdir)/tests/mysql_client_fw.c
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
%
::
SCCS/s.%
%
::
SCCS/s.%
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