diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-05 17:17:22 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-05 17:17:22 +0300 |
| commit | d99cab040c90913cc5186702166d3b91f58ef42a (patch) | |
| tree | d450d537ab0f508355515286214ee0df908984e5 /libmysqld | |
| parent | 60d9eb907244483e82b67cd920e03d4147bac349 (diff) | |
| parent | 8f2482d283646d61c6614df39d252e1fd3713f7c (diff) | |
| download | mariadb-git-d99cab040c90913cc5186702166d3b91f58ef42a.tar.gz | |
Merge
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/examples/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 98d38531f64..2b52b133133 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -8,8 +8,8 @@ link_sources: done; DEFS = -DEMBEDDED_LIBRARY -INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) \ - -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client +INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \ + -I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes) LIBS = @LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) |