diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 8 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 1687dbed079..17e308b3324 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -82,7 +82,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/vio/libvio.a + $(top_builddir)/vio/libvio.a @NDB_SCI_LIBS@ # @@ -128,11 +128,11 @@ link_sources: for f in $(sqlsources); do \ rm -f $$f; \ if test -e $(top_srcdir)/sql/$$f ; \ - then \ + then \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ - else \ + else \ @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \ - fi ; \ + fi ; \ done; \ for f in $(libmysqlsources); do \ rm -f $$f; \ diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index f30951a5d81..e0dd8491688 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -35,7 +35,8 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ $(openssl_includes) LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) \ + @NDB_SCI_LIBS@ mysqltest_embedded_LINK = $(CXXLINK) mysqltest_embedded_SOURCES = mysqltest.c diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 26d761bf6fd..7ac663480c8 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -590,7 +590,7 @@ void *create_embedded_thd(int client_flag) thd->set_time(); thd->init_for_queries(); thd->client_capabilities= client_flag; - thd->real_id= (pthread_t) thd; + thd->real_id= (pthread_t)thd->thread_id; thd->db= NULL; thd->db_length= 0; |