mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +01:00
05fc3f10c9
into chilla.local:/home/mydev/mysql-5.1-amain configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/key.test: Auto merged mysql-test/t/myisam.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_sum.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: Auto merged sql/sql_select.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged support-files/mysql.spec.sh: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Manual merge include/my_sys.h: Manual merge mysql-test/t/federated.test: Manual merge sql/ha_federated.cc: Manual merge tests/Makefile.am: Manual merge
73 lines
2.5 KiB
Makefile
73 lines
2.5 KiB
Makefile
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Library General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Library General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Library General Public
|
|
# License along with this library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
# MA 02111-1307, USA
|
|
|
|
## Process this file with automake to create Makefile.in
|
|
|
|
if HAVE_YASSL
|
|
yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
|
|
else
|
|
yassl_dummy_link_fix=
|
|
endif
|
|
|
|
if THREAD_SAFE_CLIENT
|
|
LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la
|
|
else
|
|
LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la
|
|
endif
|
|
|
|
EXTRA_DIST = auto_increment.res auto_increment.tst \
|
|
function.res function.tst lock_test.pl lock_test.res \
|
|
export.pl big_record.pl \
|
|
fork2_test.pl fork_big.pl \
|
|
insert_and_repair.pl \
|
|
grant.pl grant.res test_delayed_insert.pl \
|
|
pmail.pl mail_to_db.pl table_types.pl \
|
|
udf_test udf_test.res myisam-big-rows.tst \
|
|
CMakeLists.txt
|
|
|
|
bin_PROGRAMS = mysql_client_test
|
|
noinst_PROGRAMS = insert_test select_test thread_test
|
|
|
|
#
|
|
# C Test for 4.1 protocol
|
|
#
|
|
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
$(openssl_includes)
|
|
LIBS = @CLIENT_LIBS@
|
|
LDADD = @CLIENT_EXTRA_LDFLAGS@ \
|
|
$(LIBMYSQLCLIENT_LA)
|
|
if HAVE_NETWARE
|
|
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
|
|
mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \
|
|
../mysys/my_memmem.c
|
|
else
|
|
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
|
|
mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)
|
|
endif
|
|
insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix)
|
|
select_test_SOURCES= select_test.c $(yassl_dummy_link_fix)
|
|
insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
|
|
select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
|
|
|
|
# Fix for mit-threads
|
|
DEFS = -DUNDEF_THREADS_HACK
|
|
|
|
thread_test.o: thread_test.c
|
|
$(COMPILE) -c $(INCLUDES) $<
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|