Commit b29ba228 authored by konstantin@mysql.com's avatar konstantin@mysql.com

Followup3: operator new and operator delete are defined in mysys.

The fix makes client_test.cc compile with embedded library.
parent 40d5fd01
...@@ -33,8 +33,10 @@ noinst_PROGRAMS = insert_test select_test thread_test client_test ...@@ -33,8 +33,10 @@ noinst_PROGRAMS = insert_test select_test thread_test client_test
# #
INCLUDES = -I$(top_srcdir)/include $(openssl_includes) INCLUDES = -I$(top_srcdir)/include $(openssl_includes)
LIBS = @CLIENT_LIBS@ LIBS = @CLIENT_LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la LDADD = @CLIENT_EXTRA_LDFLAGS@ \
client_test_LDADD= $(LDADD) $(CXXLDFLAGS) $(top_builddir)/libmysql/libmysqlclient.la
client_test_LDADD= $(LDADD) $(CXXLDFLAGS) \
$(top_builddir)/mysys/libmysys.a
client_test_SOURCES= client_test.cc client_test_SOURCES= client_test.cc
insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
......
...@@ -857,19 +857,6 @@ Stmt_fetch::~Stmt_fetch() ...@@ -857,19 +857,6 @@ Stmt_fetch::~Stmt_fetch()
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
} }
/* We need these to compile without libstdc++ */
void *operator new[] (size_t sz)
{
return (void *) malloc (sz ? sz : 1);
}
void operator delete[] (void *ptr) throw ()
{
if (ptr)
free(ptr);
}
/* /*
For given array of queries, open query_count cursors and fetch For given array of queries, open query_count cursors and fetch
from them in simultaneous manner. from them in simultaneous manner.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment