diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
| commit | 6db314c628b103b7c4d7fc0ba4c21eda6e6a349e (patch) | |
| tree | 8414a0bf16f74515368a6a4ebc7ea528e8f982a2 /libmysqld | |
| parent | 805e8ffb9ec3ae7b9353d65f33e4eb20284876ae (diff) | |
| parent | 6bd93f670271eaf2bd79bd7fa538e9baaa7dcb0f (diff) | |
| download | mariadb-git-6db314c628b103b7c4d7fc0ba4c21eda6e6a349e.tar.gz | |
Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01.13 2009)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 346278425a7..fa9711b54da 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -32,7 +32,7 @@ ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc TARGET_LINK_LIBRARIES(mysql_embedded debug dbug strings mysys vio yassl taocrypt regex ws2_32) ADD_DEPENDENCIES(mysql_embedded libmysqld) -ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c) +ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc) TARGET_LINK_LIBRARIES(mysqltest_embedded debug dbug strings mysys vio yassl taocrypt regex ws2_32) ADD_DEPENDENCIES(mysqltest_embedded libmysqld) diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 3425b48645f..109d33a85ae 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -41,7 +41,7 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \ @NDB_SCI_LIBS@ mysqltest_embedded_LINK = $(CXXLINK) -nodist_mysqltest_embedded_SOURCES = mysqltest.c +nodist_mysqltest_embedded_SOURCES = mysqltest.cc mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \ |