mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/mysql-5.1 configure.in: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/Makefile.am: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/lock.cc: Auto merged storage/innobase/btr/btr0pcur.c: Auto merged storage/innobase/dict/dict0dict.c: Auto merged storage/innobase/dict/dict0load.c: Auto merged storage/innobase/fil/fil0fil.c: Auto merged storage/innobase/include/btr0pcur.h: Auto merged storage/innobase/include/btr0pcur.ic: Auto merged storage/innobase/include/dict0dict.h: Auto merged storage/innobase/include/dict0load.h: Auto merged storage/innobase/include/os0file.h: Auto merged storage/innobase/include/srv0srv.h: Auto merged storage/innobase/log/log0log.c: Auto merged storage/innobase/os/os0file.c: Auto merged storage/innobase/row/row0ins.c: Auto merged storage/innobase/row/row0mysql.c: Auto merged storage/innobase/row/row0sel.c: Auto merged storage/innobase/srv/srv0srv.c: Auto merged storage/innobase/srv/srv0start.c: 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_search.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/ndb/include/kernel/signaldata/BackupImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxMaint.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged storage/ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbTransaction.hpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.txt: Auto merged storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Notes.txt: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationSearch.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/src/ndbapi/Ndblist.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged storage/ndb/test/ndbapi/testBackup.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/ndbapi/testOIBasic.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/run-test/daily-devel-tests.txt: Auto merged storage/ndb/test/src/NdbBackup.cpp: Auto merged storage/ndb/tools/desc.cpp: Auto merged
This commit is contained in:
unknown
@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SEARCH_FOR_BDB], [
|
||||
dnl echo ["MYSQL_SEARCH_FOR_BDB"]
|
||||
bdb_dir_ok="no BerkeleyDB found"
|
||||
|
||||
for test_dir in $srcdir/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
|
||||
for test_dir in $srcdir/storage/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
|
||||
dnl echo "-----------> Looking at ($test_dir; `cd $test_dir && pwd`)"
|
||||
MYSQL_CHECK_BDB_DIR([$test_dir])
|
||||
if test X"$bdb_dir_ok" = Xsource || test X"$bdb_dir_ok" = Xinstalled; then
|
||||
|
||||
@ -20,45 +20,45 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
|
||||
AC_MSG_RESULT([Using Innodb])
|
||||
AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
|
||||
have_innodb="yes"
|
||||
innodb_includes="-I../innobase/include"
|
||||
innodb_includes="-I\$(top_builddir)/innobase/include"
|
||||
innodb_system_libs=""
|
||||
dnl Some libs are listed several times, in order for gcc to sort out
|
||||
dnl circular references.
|
||||
innodb_libs="\
|
||||
\$(top_builddir)/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/innobase/dict/libdict.a\
|
||||
\$(top_builddir)/innobase/que/libque.a\
|
||||
\$(top_builddir)/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/innobase/row/librow.a\
|
||||
\$(top_builddir)/innobase/pars/libpars.a\
|
||||
\$(top_builddir)/innobase/btr/libbtr.a\
|
||||
\$(top_builddir)/innobase/trx/libtrx.a\
|
||||
\$(top_builddir)/innobase/read/libread.a\
|
||||
\$(top_builddir)/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/innobase/buf/libbuf.a\
|
||||
\$(top_builddir)/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/innobase/eval/libeval.a\
|
||||
\$(top_builddir)/innobase/log/liblog.a\
|
||||
\$(top_builddir)/innobase/fsp/libfsp.a\
|
||||
\$(top_builddir)/innobase/fut/libfut.a\
|
||||
\$(top_builddir)/innobase/fil/libfil.a\
|
||||
\$(top_builddir)/innobase/lock/liblock.a\
|
||||
\$(top_builddir)/innobase/mtr/libmtr.a\
|
||||
\$(top_builddir)/innobase/page/libpage.a\
|
||||
\$(top_builddir)/innobase/rem/librem.a\
|
||||
\$(top_builddir)/innobase/thr/libthr.a\
|
||||
\$(top_builddir)/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/innobase/data/libdata.a\
|
||||
\$(top_builddir)/innobase/mach/libmach.a\
|
||||
\$(top_builddir)/innobase/ha/libha.a\
|
||||
\$(top_builddir)/innobase/dyn/libdyn.a\
|
||||
\$(top_builddir)/innobase/mem/libmem.a\
|
||||
\$(top_builddir)/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/innobase/ut/libut.a\
|
||||
\$(top_builddir)/innobase/os/libos.a\
|
||||
\$(top_builddir)/innobase/ut/libut.a"
|
||||
\$(top_builddir)/storage/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/storage/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/storage/innobase/dict/libdict.a\
|
||||
\$(top_builddir)/storage/innobase/que/libque.a\
|
||||
\$(top_builddir)/storage/innobase/srv/libsrv.a\
|
||||
\$(top_builddir)/storage/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/storage/innobase/row/librow.a\
|
||||
\$(top_builddir)/storage/innobase/pars/libpars.a\
|
||||
\$(top_builddir)/storage/innobase/btr/libbtr.a\
|
||||
\$(top_builddir)/storage/innobase/trx/libtrx.a\
|
||||
\$(top_builddir)/storage/innobase/read/libread.a\
|
||||
\$(top_builddir)/storage/innobase/usr/libusr.a\
|
||||
\$(top_builddir)/storage/innobase/buf/libbuf.a\
|
||||
\$(top_builddir)/storage/innobase/ibuf/libibuf.a\
|
||||
\$(top_builddir)/storage/innobase/eval/libeval.a\
|
||||
\$(top_builddir)/storage/innobase/log/liblog.a\
|
||||
\$(top_builddir)/storage/innobase/fsp/libfsp.a\
|
||||
\$(top_builddir)/storage/innobase/fut/libfut.a\
|
||||
\$(top_builddir)/storage/innobase/fil/libfil.a\
|
||||
\$(top_builddir)/storage/innobase/lock/liblock.a\
|
||||
\$(top_builddir)/storage/innobase/mtr/libmtr.a\
|
||||
\$(top_builddir)/storage/innobase/page/libpage.a\
|
||||
\$(top_builddir)/storage/innobase/rem/librem.a\
|
||||
\$(top_builddir)/storage/innobase/thr/libthr.a\
|
||||
\$(top_builddir)/storage/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/storage/innobase/data/libdata.a\
|
||||
\$(top_builddir)/storage/innobase/mach/libmach.a\
|
||||
\$(top_builddir)/storage/innobase/ha/libha.a\
|
||||
\$(top_builddir)/storage/innobase/dyn/libdyn.a\
|
||||
\$(top_builddir)/storage/innobase/mem/libmem.a\
|
||||
\$(top_builddir)/storage/innobase/sync/libsync.a\
|
||||
\$(top_builddir)/storage/innobase/ut/libut.a\
|
||||
\$(top_builddir)/storage/innobase/os/libos.a\
|
||||
\$(top_builddir)/storage/innobase/ut/libut.a"
|
||||
|
||||
AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
|
||||
;;
|
||||
|
||||
@ -131,10 +131,10 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
|
||||
AC_MSG_RESULT([Using NDB Cluster])
|
||||
AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
|
||||
have_ndbcluster="yes"
|
||||
ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
|
||||
ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
|
||||
ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi"
|
||||
ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
|
||||
ndbcluster_system_libs=""
|
||||
ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
|
||||
ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"
|
||||
MYSQL_CHECK_NDB_OPTIONS
|
||||
;;
|
||||
* )
|
||||
|
||||
116
configure.in
116
configure.in
@ -2461,7 +2461,7 @@ then
|
||||
if test X"$have_berkeley_db" != Xyes; then
|
||||
# we must build berkeley db from source
|
||||
sql_server_dirs="$sql_server_dirs $have_berkeley_db"
|
||||
AC_CONFIG_FILES(bdb/Makefile)
|
||||
AC_CONFIG_FILES(storage/bdb/Makefile)
|
||||
|
||||
echo "CONFIGURING FOR BERKELEY DB"
|
||||
bdb_conf_flags="--disable-shared"
|
||||
@ -2487,8 +2487,10 @@ then
|
||||
rel_srcdir=
|
||||
case "$srcdir" in
|
||||
/* ) rel_srcdir="$srcdir" ;;
|
||||
* ) rel_srcdir="../../$srcdir" ;;
|
||||
* ) rel_srcdir="../../../$srcdir" ;;
|
||||
esac
|
||||
echo $bdb/build_unix
|
||||
echo $rel_srcdir/$bdb/dist/configure
|
||||
(cd $bdb/build_unix && \
|
||||
sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \
|
||||
AC_MSG_ERROR([could not configure Berkeley DB])
|
||||
@ -2501,12 +2503,12 @@ dnl echo "bdb = '$bdb'; inc = '$bdb_includes', lib = '$bdb_libs'"
|
||||
else
|
||||
if test -d bdb; then :
|
||||
else
|
||||
mkdir bdb && mkdir bdb/build_unix
|
||||
mkdir storage/bdb && mkdir storage/bdb/build_unix
|
||||
fi
|
||||
|
||||
if test -r bdb/build_unix/db.h; then :
|
||||
if test -r storage/bdb/build_unix/db.h; then :
|
||||
else
|
||||
cat <<EOF > bdb/build_unix/db.h
|
||||
cat <<EOF > storage/bdb/build_unix/db.h
|
||||
|
||||
This file is a placeholder to fool make. The way that automake
|
||||
and GNU make work together causes some files to depend on this
|
||||
@ -2529,8 +2531,8 @@ EOF
|
||||
if test X"$have_innodb" = Xyes
|
||||
then
|
||||
innodb_conf_flags=""
|
||||
sql_server_dirs="$sql_server_dirs innobase"
|
||||
AC_CONFIG_SUBDIRS(innobase)
|
||||
sql_server_dirs="$sql_server_dirs storage/innobase"
|
||||
AC_CONFIG_SUBDIRS(storage/innobase)
|
||||
fi
|
||||
|
||||
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
|
||||
@ -2552,12 +2554,12 @@ esac
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
sql_server_dirs="$sql_server_dirs ndb"
|
||||
sql_server_dirs="$sql_server_dirs storage/ndb"
|
||||
fi
|
||||
#
|
||||
# END of configuration for optional table handlers
|
||||
#
|
||||
sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
|
||||
sql_server_dirs="$sql_server_dirs storage/myisam storage/myisammrg storage/heap vio sql"
|
||||
|
||||
fi
|
||||
|
||||
@ -2690,51 +2692,53 @@ AC_SUBST([NDB_SIZEOF_INT])
|
||||
AC_SUBST([NDB_SIZEOF_LONG])
|
||||
AC_SUBST([NDB_SIZEOF_LONG_LONG])
|
||||
|
||||
AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
|
||||
ndb/src/Makefile ndb/src/common/Makefile dnl
|
||||
ndb/docs/Makefile dnl
|
||||
ndb/tools/Makefile dnl
|
||||
ndb/src/common/debugger/Makefile dnl
|
||||
ndb/src/common/debugger/signaldata/Makefile dnl
|
||||
ndb/src/common/portlib/Makefile dnl
|
||||
ndb/src/common/util/Makefile dnl
|
||||
ndb/src/common/logger/Makefile dnl
|
||||
ndb/src/common/transporter/Makefile dnl
|
||||
ndb/src/common/mgmcommon/Makefile dnl
|
||||
ndb/src/kernel/Makefile dnl
|
||||
ndb/src/kernel/error/Makefile dnl
|
||||
ndb/src/kernel/blocks/Makefile dnl
|
||||
ndb/src/kernel/blocks/cmvmi/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbacc/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbdict/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbdih/Makefile dnl
|
||||
ndb/src/kernel/blocks/dblqh/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbtc/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbtup/Makefile dnl
|
||||
ndb/src/kernel/blocks/ndbfs/Makefile dnl
|
||||
ndb/src/kernel/blocks/ndbcntr/Makefile dnl
|
||||
ndb/src/kernel/blocks/qmgr/Makefile dnl
|
||||
ndb/src/kernel/blocks/trix/Makefile dnl
|
||||
ndb/src/kernel/blocks/backup/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbutil/Makefile dnl
|
||||
ndb/src/kernel/blocks/suma/Makefile dnl
|
||||
ndb/src/kernel/blocks/grep/Makefile dnl
|
||||
ndb/src/kernel/blocks/dbtux/Makefile dnl
|
||||
ndb/src/kernel/vm/Makefile dnl
|
||||
ndb/src/mgmapi/Makefile dnl
|
||||
ndb/src/ndbapi/Makefile dnl
|
||||
ndb/src/mgmsrv/Makefile dnl
|
||||
ndb/src/mgmclient/Makefile dnl
|
||||
ndb/src/cw/Makefile dnl
|
||||
ndb/src/cw/cpcd/Makefile dnl
|
||||
ndb/test/Makefile dnl
|
||||
ndb/test/src/Makefile dnl
|
||||
ndb/test/ndbapi/Makefile dnl
|
||||
ndb/test/ndbapi/bank/Makefile dnl
|
||||
ndb/test/tools/Makefile dnl
|
||||
ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
|
||||
ndb/include/ndb_version.h ndb/include/ndb_global.h dnl
|
||||
ndb/include/ndb_types.h dnl
|
||||
AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl
|
||||
storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
|
||||
storage/ndb/docs/Makefile dnl
|
||||
storage/ndb/tools/Makefile dnl
|
||||
storage/ndb/src/common/debugger/Makefile dnl
|
||||
storage/ndb/src/common/debugger/signaldata/Makefile dnl
|
||||
storage/ndb/src/common/portlib/Makefile dnl
|
||||
storage/ndb/src/common/util/Makefile dnl
|
||||
storage/ndb/src/common/logger/Makefile dnl
|
||||
storage/ndb/src/common/transporter/Makefile dnl
|
||||
storage/ndb/src/common/mgmcommon/Makefile dnl
|
||||
storage/ndb/src/kernel/Makefile dnl
|
||||
storage/ndb/src/kernel/error/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/cmvmi/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbacc/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbtc/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/ndbfs/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/ndbcntr/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/qmgr/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/trix/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/backup/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbutil/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/suma/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/grep/Makefile dnl
|
||||
storage/ndb/src/kernel/blocks/dbtux/Makefile dnl
|
||||
storage/ndb/src/kernel/vm/Makefile dnl
|
||||
storage/ndb/src/mgmapi/Makefile dnl
|
||||
storage/ndb/src/ndbapi/Makefile dnl
|
||||
storage/ndb/src/mgmsrv/Makefile dnl
|
||||
storage/ndb/src/mgmclient/Makefile dnl
|
||||
storage/ndb/src/cw/Makefile dnl
|
||||
storage/ndb/src/cw/cpcd/Makefile dnl
|
||||
storage/ndb/test/Makefile dnl
|
||||
storage/ndb/test/src/Makefile dnl
|
||||
storage/ndb/test/ndbapi/Makefile dnl
|
||||
storage/ndb/test/ndbapi/bank/Makefile dnl
|
||||
storage/ndb/test/tools/Makefile dnl
|
||||
storage/ndb/test/run-test/Makefile dnl
|
||||
storage/ndb/include/ndb_version.h dnl
|
||||
storage/ndb/include/ndb_global.h dnl
|
||||
storage/ndb/include/ndb_types.h dnl
|
||||
mysql-test/ndb/Makefile dnl
|
||||
)
|
||||
fi
|
||||
|
||||
@ -2742,8 +2746,8 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
|
||||
|
||||
# Output results
|
||||
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
|
||||
strings/Makefile regex/Makefile heap/Makefile dnl
|
||||
myisam/Makefile myisammrg/Makefile dnl
|
||||
strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
|
||||
storage/myisam/Makefile storage/myisammrg/Makefile dnl
|
||||
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
|
||||
man/Makefile BUILD/Makefile vio/Makefile dnl
|
||||
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#include <errno.h>
|
||||
#include <my_getopt.h>
|
||||
#ifdef HAVE_NDBCLUSTER_DB
|
||||
#include "../ndb/src/ndbapi/ndberror.c"
|
||||
#include "../storage/ndb/src/ndbapi/ndberror.c"
|
||||
#endif
|
||||
|
||||
static my_bool verbose, print_all_codes;
|
||||
|
||||
@ -73,9 +73,9 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
|
||||
|
||||
# The following libraries should be included in libmysqld.a
|
||||
INC_LIB= $(top_builddir)/regex/libregex.a \
|
||||
$(top_builddir)/myisam/libmyisam.a \
|
||||
$(top_builddir)/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/heap/libheap.a \
|
||||
$(top_builddir)/storage/myisam/libmyisam.a \
|
||||
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/storage/heap/libheap.a \
|
||||
@innodb_libs@ @bdb_libs_with_path@ \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a \
|
||||
|
||||
@ -582,8 +582,8 @@ if [ x$SOURCE_DIST = x1 ] ; then
|
||||
CHARSETSDIR="$BASEDIR/sql/share/charsets"
|
||||
INSTALL_DB="./install_test_db"
|
||||
MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
|
||||
NDB_TOOLS_DIR="$BASEDIR/ndb/tools"
|
||||
NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
|
||||
NDB_TOOLS_DIR="$BASEDIR/storage/ndb/tools"
|
||||
NDB_MGM="$BASEDIR/storage/ndb/src/mgmclient/ndb_mgm"
|
||||
|
||||
if [ -n "$USE_PURIFY" ] ; then
|
||||
PSUP="$MYSQL_TEST_DIR/purify.suppress"
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/src/kernel/vm \
|
||||
-I$(top_srcdir)/ndb/src/kernel/error \
|
||||
-I$(top_srcdir)/ndb/src/kernel \
|
||||
-I$(top_srcdir)/ndb/include/kernel \
|
||||
-I$(top_srcdir)/ndb/include/transporter \
|
||||
-I$(top_srcdir)/ndb/include/debugger \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
||||
|
||||
#AM_LDFLAGS = @ndb_ldflags@
|
||||
@ -1,2 +0,0 @@
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi
|
||||
@ -1,12 +0,0 @@
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/kernel \
|
||||
-I$(top_srcdir)/ndb/include/transporter \
|
||||
-I$(top_srcdir)/ndb/include/debugger \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
||||
@ -1,2 +0,0 @@
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/ndbapi
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
|
||||
$(top_builddir)/ndb/src/libndbclient.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
|
||||
|
||||
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/test/include \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi
|
||||
@ -1,15 +0,0 @@
|
||||
|
||||
LDADD += \
|
||||
$(top_builddir)/ndb/src/libndbclient.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
|
||||
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/ndbapi \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/test/include \
|
||||
-I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/include/kernel
|
||||
@ -1,6 +0,0 @@
|
||||
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
-I$(top_srcdir)/ndb/include/util \
|
||||
-I$(top_srcdir)/ndb/include/portlib \
|
||||
-I$(top_srcdir)/ndb/include/logger
|
||||
@ -1,33 +0,0 @@
|
||||
SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
|
||||
ndblib_LTLIBRARIES = libndbclient.la
|
||||
|
||||
libndbclient_la_SOURCES =
|
||||
|
||||
libndbclient_la_LIBADD = \
|
||||
ndbapi/libndbapi.la \
|
||||
common/transporter/libtransporter.la \
|
||||
common/debugger/libtrace.la \
|
||||
common/debugger/signaldata/libsignaldataprint.la \
|
||||
mgmapi/libmgmapi.la \
|
||||
common/mgmcommon/libmgmsrvcommon.la \
|
||||
common/logger/liblogger.la \
|
||||
common/portlib/libportlib.la \
|
||||
common/util/libgeneral.la
|
||||
|
||||
windoze-dsp: libndbclient.dsp
|
||||
|
||||
libndbclient.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ dummy.cpp
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
|
||||
@touch dummy.cpp
|
||||
@ -1,25 +0,0 @@
|
||||
SUBDIRS = signaldata
|
||||
|
||||
noinst_LTLIBRARIES = libtrace.la
|
||||
|
||||
libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp GrepError.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libtrace.dsp
|
||||
|
||||
libtrace.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,25 +0,0 @@
|
||||
|
||||
noinst_LTLIBRARIES = liblogger.la
|
||||
|
||||
SOURCE_WIN = Logger.cpp LogHandlerList.cpp LogHandler.cpp \
|
||||
ConsoleLogHandler.cpp FileLogHandler.cpp
|
||||
liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
windoze-dsp: liblogger.dsp
|
||||
|
||||
liblogger.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(SOURCE_WIN)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,28 +0,0 @@
|
||||
noinst_LTLIBRARIES = libmgmsrvcommon.la
|
||||
|
||||
libmgmsrvcommon_la_SOURCES = \
|
||||
ConfigRetriever.cpp \
|
||||
IPCConfig.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/src/mgmsrv
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libmgmsrvcommon.dsp
|
||||
|
||||
libmgmsrvcommon.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmsrvcommon_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,36 +0,0 @@
|
||||
|
||||
noinst_LTLIBRARIES = libtransporter.la
|
||||
|
||||
libtransporter_la_SOURCES = \
|
||||
Transporter.cpp \
|
||||
SendBuffer.cpp \
|
||||
TCP_Transporter.cpp \
|
||||
TransporterRegistry.cpp \
|
||||
Packer.cpp
|
||||
|
||||
EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp SCI_Transporter.cpp
|
||||
|
||||
libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
|
||||
libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_util.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libtransporter.dsp
|
||||
|
||||
libtransporter.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libtransporter_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,24 +0,0 @@
|
||||
|
||||
noinst_LIBRARIES = libbackup.a
|
||||
|
||||
libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libbackup.dsp
|
||||
|
||||
libbackup.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,24 +0,0 @@
|
||||
|
||||
noinst_LIBRARIES = libcmvmi.a
|
||||
|
||||
libcmvmi_a_SOURCES = Cmvmi.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libcmvmi.dsp
|
||||
|
||||
libcmvmi.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,26 +0,0 @@
|
||||
|
||||
noinst_LIBRARIES = libdbacc.a
|
||||
|
||||
libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbacc.dsp
|
||||
|
||||
libdbacc.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,25 +0,0 @@
|
||||
#SUBDIRS = printSchemafile
|
||||
|
||||
noinst_LIBRARIES = libdbdict.a
|
||||
|
||||
libdbdict_a_SOURCES = Dbdict.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbdict.dsp
|
||||
|
||||
libdbdict.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,23 +0,0 @@
|
||||
noinst_LIBRARIES = libdbdih.a
|
||||
|
||||
libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbdih.dsp
|
||||
|
||||
libdbdih.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,25 +0,0 @@
|
||||
#SUBDIRS = redoLogReader
|
||||
|
||||
noinst_LIBRARIES = libdblqh.a
|
||||
|
||||
libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdblqh.dsp
|
||||
|
||||
libdblqh.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,23 +0,0 @@
|
||||
noinst_LIBRARIES = libdbtc.a
|
||||
|
||||
libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbtc.dsp
|
||||
|
||||
libdbtc.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,41 +0,0 @@
|
||||
noinst_LIBRARIES = libdbtup.a
|
||||
|
||||
libdbtup_a_SOURCES = \
|
||||
DbtupExecQuery.cpp \
|
||||
DbtupBuffer.cpp \
|
||||
DbtupRoutines.cpp \
|
||||
DbtupCommit.cpp \
|
||||
DbtupFixAlloc.cpp \
|
||||
DbtupTrigger.cpp \
|
||||
DbtupAbort.cpp \
|
||||
DbtupLCP.cpp \
|
||||
DbtupUndoLog.cpp \
|
||||
DbtupPageMap.cpp \
|
||||
DbtupPagMan.cpp \
|
||||
DbtupStoredProcDef.cpp \
|
||||
DbtupMeta.cpp \
|
||||
DbtupTabDesMan.cpp \
|
||||
DbtupGen.cpp \
|
||||
DbtupSystemRestart.cpp \
|
||||
DbtupIndex.cpp \
|
||||
DbtupDebug.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbtup.dsp
|
||||
|
||||
libdbtup.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,34 +0,0 @@
|
||||
noinst_LIBRARIES = libdbtux.a
|
||||
|
||||
libdbtux_a_SOURCES = \
|
||||
DbtuxGen.cpp \
|
||||
DbtuxMeta.cpp \
|
||||
DbtuxMaint.cpp \
|
||||
DbtuxNode.cpp \
|
||||
DbtuxTree.cpp \
|
||||
DbtuxScan.cpp \
|
||||
DbtuxSearch.cpp \
|
||||
DbtuxCmp.cpp \
|
||||
DbtuxDebug.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbtux.dsp
|
||||
|
||||
libdbtux.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,23 +0,0 @@
|
||||
noinst_LIBRARIES = libdbutil.a
|
||||
|
||||
libdbutil_a_SOURCES = DbUtil.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libdbutil.dsp
|
||||
|
||||
libdbutil.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,23 +0,0 @@
|
||||
noinst_LIBRARIES = libgrep.a
|
||||
|
||||
libgrep_a_SOURCES = Grep.cpp GrepInit.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libgrep.dsp
|
||||
|
||||
libgrep.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libgrep_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,26 +0,0 @@
|
||||
noinst_LIBRARIES = libndbcntr.a
|
||||
|
||||
libndbcntr_a_SOURCES = \
|
||||
NdbcntrInit.cpp \
|
||||
NdbcntrSysTable.cpp \
|
||||
NdbcntrMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libndbcntr.dsp
|
||||
|
||||
libndbcntr.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbcntr_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,27 +0,0 @@
|
||||
noinst_LIBRARIES = libndbfs.a
|
||||
|
||||
libndbfs_a_SOURCES = \
|
||||
AsyncFile.cpp \
|
||||
Ndbfs.cpp VoidFs.cpp \
|
||||
Filename.cpp \
|
||||
CircularIndex.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libndbfs.dsp
|
||||
|
||||
libndbfs.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbfs_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,25 +0,0 @@
|
||||
noinst_LIBRARIES = libqmgr.a
|
||||
|
||||
libqmgr_a_SOURCES = \
|
||||
QmgrInit.cpp \
|
||||
QmgrMain.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libqmgr.dsp
|
||||
|
||||
libqmgr.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,23 +0,0 @@
|
||||
noinst_LIBRARIES = libsuma.a
|
||||
|
||||
libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libsuma.dsp
|
||||
|
||||
libsuma.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,23 +0,0 @@
|
||||
noinst_LIBRARIES = libtrix.a
|
||||
|
||||
libtrix_a_SOURCES = Trix.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libtrix.dsp
|
||||
|
||||
libtrix.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,25 +0,0 @@
|
||||
noinst_LIBRARIES = liberror.a
|
||||
|
||||
liberror_a_SOURCES = TimeModule.cpp \
|
||||
ErrorReporter.cpp \
|
||||
ErrorMessages.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: liberror.dsp
|
||||
|
||||
liberror.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(liberror_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,43 +0,0 @@
|
||||
#SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection
|
||||
#ifneq ($(USE_EDITLINE), N)
|
||||
#DIRS += testLongSig
|
||||
#endif
|
||||
|
||||
noinst_LIBRARIES = libkernel.a
|
||||
|
||||
libkernel_a_SOURCES = \
|
||||
SimulatedBlock.cpp \
|
||||
FastScheduler.cpp \
|
||||
TimeQueue.cpp \
|
||||
VMSignal.cpp \
|
||||
ThreadConfig.cpp \
|
||||
TransporterCallback.cpp \
|
||||
Emulator.cpp \
|
||||
Configuration.cpp \
|
||||
WatchDog.cpp \
|
||||
SimplePropertiesSection.cpp \
|
||||
SectionReader.cpp \
|
||||
MetaData.cpp \
|
||||
Mutex.cpp SafeCounter.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_kernel.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libkernel.dsp
|
||||
|
||||
libkernel.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,30 +0,0 @@
|
||||
|
||||
noinst_LTLIBRARIES = libmgmapi.la
|
||||
|
||||
libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi
|
||||
|
||||
DEFS_LOC = -DNO_DEBUG_MESSAGES -DNDB_PORT="\"@ndb_port@\""
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_util.mk.am
|
||||
|
||||
#ndbtest_PROGRAMS = ndb_test_mgmapi
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libmgmapi.dsp
|
||||
|
||||
libmgmapi.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmapi_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
|
||||
@ -1,58 +0,0 @@
|
||||
|
||||
noinst_LTLIBRARIES = libndbmgmclient.la
|
||||
ndbtools_PROGRAMS = ndb_mgm
|
||||
|
||||
libndbmgmclient_la_SOURCES = CommandInterpreter.cpp
|
||||
libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \
|
||||
../common/logger/liblogger.la \
|
||||
../common/portlib/libportlib.la \
|
||||
../common/util/libgeneral.la \
|
||||
../common/portlib/libportlib.la
|
||||
|
||||
|
||||
ndb_mgm_SOURCES = main.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \
|
||||
-I$(top_srcdir)/ndb/src/common/mgmcommon
|
||||
|
||||
LDADD_LOC = $(noinst_LTLIBRARIES) \
|
||||
../common/portlib/libportlib.la \
|
||||
@readline_link@ \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a \
|
||||
@TERMCAP_LIB@ @NDB_SCI_LIBS@
|
||||
|
||||
ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
|
||||
|
||||
ndb_mgm.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
libndbmgmclient.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB
|
||||
@ -1,60 +0,0 @@
|
||||
MYSQLDATAdir = $(localstatedir)
|
||||
MYSQLSHAREdir = $(pkgdatadir)
|
||||
MYSQLBASEdir= $(prefix)
|
||||
#MYSQLCLUSTERdir= $(prefix)/mysql-cluster
|
||||
MYSQLCLUSTERdir= .
|
||||
|
||||
ndbbin_PROGRAMS = ndb_mgmd
|
||||
|
||||
ndb_mgmd_SOURCES = \
|
||||
MgmtSrvr.cpp \
|
||||
MgmtSrvrGeneralSignalHandling.cpp \
|
||||
main.cpp \
|
||||
Services.cpp \
|
||||
convertStrToInt.cpp \
|
||||
SignalQueue.cpp \
|
||||
MgmtSrvrConfig.cpp \
|
||||
ConfigInfo.cpp \
|
||||
InitConfigFileParser.cpp \
|
||||
Config.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
|
||||
-I$(top_srcdir)/ndb/src/mgmapi \
|
||||
-I$(top_srcdir)/ndb/src/common/mgmcommon \
|
||||
-I$(top_srcdir)/ndb/src/mgmclient
|
||||
|
||||
LDADD_LOC = $(top_srcdir)/ndb/src/mgmclient/CommandInterpreter.o \
|
||||
$(top_builddir)/ndb/src/libndbclient.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a \
|
||||
@readline_link@ \
|
||||
@NDB_SCI_LIBS@ \
|
||||
@TERMCAP_LIB@
|
||||
|
||||
DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
|
||||
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
||||
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
||||
-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||
|
||||
ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: ndb_mgmd.dsp
|
||||
|
||||
ndb_mgmd.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
@ -1,159 +0,0 @@
|
||||
|
||||
SUBDIRS = bank
|
||||
|
||||
ndbtest_PROGRAMS = \
|
||||
flexBench \
|
||||
drop_all_tabs \
|
||||
create_all_tabs \
|
||||
create_tab \
|
||||
flexAsynch \
|
||||
flexBench \
|
||||
flexHammer \
|
||||
flexTT \
|
||||
testBackup \
|
||||
testBasic \
|
||||
testBasicAsynch \
|
||||
testBlobs \
|
||||
testDataBuffers \
|
||||
testDict \
|
||||
testIndex \
|
||||
testMgm \
|
||||
testNdbApi \
|
||||
testNodeRestart \
|
||||
testOIBasic \
|
||||
testOperations \
|
||||
testRestartGci \
|
||||
testScan \
|
||||
testScanInterpreter \
|
||||
testScanPerf \
|
||||
testSystemRestart \
|
||||
testTimeout \
|
||||
testTransactions \
|
||||
testDeadlock \
|
||||
test_event ndbapi_slow_select testReadPerf testLcp \
|
||||
testPartitioning \
|
||||
testBitfield \
|
||||
DbCreate DbAsyncGenerator \
|
||||
test_event_multi_table
|
||||
|
||||
#flexTimedAsynch
|
||||
#testBlobs
|
||||
#flex_bench_mysql
|
||||
|
||||
create_all_tabs_SOURCES = create_all_tabs.cpp
|
||||
create_tab_SOURCES = create_tab.cpp
|
||||
drop_all_tabs_SOURCES = drop_all_tabs.cpp
|
||||
flexAsynch_SOURCES = flexAsynch.cpp
|
||||
flexBench_SOURCES = flexBench.cpp
|
||||
flexHammer_SOURCES = flexHammer.cpp
|
||||
flexTT_SOURCES = flexTT.cpp
|
||||
#flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
|
||||
#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp
|
||||
testBackup_SOURCES = testBackup.cpp
|
||||
testBasic_SOURCES = testBasic.cpp
|
||||
testBasicAsynch_SOURCES = testBasicAsynch.cpp
|
||||
testBlobs_SOURCES = testBlobs.cpp
|
||||
testDataBuffers_SOURCES = testDataBuffers.cpp
|
||||
testDict_SOURCES = testDict.cpp
|
||||
testIndex_SOURCES = testIndex.cpp
|
||||
testMgm_SOURCES = testMgm.cpp
|
||||
testNdbApi_SOURCES = testNdbApi.cpp
|
||||
testNodeRestart_SOURCES = testNodeRestart.cpp
|
||||
testOIBasic_SOURCES = testOIBasic.cpp
|
||||
testOperations_SOURCES = testOperations.cpp
|
||||
testRestartGci_SOURCES = testRestartGci.cpp
|
||||
testScan_SOURCES = testScan.cpp ScanFunctions.hpp
|
||||
testScanInterpreter_SOURCES = testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp
|
||||
testScanPerf_SOURCES = testScanPerf.cpp
|
||||
testSystemRestart_SOURCES = testSystemRestart.cpp
|
||||
testTimeout_SOURCES = testTimeout.cpp
|
||||
testTransactions_SOURCES = testTransactions.cpp
|
||||
testDeadlock_SOURCES = testDeadlock.cpp
|
||||
test_event_SOURCES = test_event.cpp
|
||||
ndbapi_slow_select_SOURCES = slow_select.cpp
|
||||
testReadPerf_SOURCES = testReadPerf.cpp
|
||||
testLcp_SOURCES = testLcp.cpp
|
||||
testPartitioning_SOURCES = testPartitioning.cpp
|
||||
testBitfield_SOURCES = testBitfield.cpp
|
||||
DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
|
||||
DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
|
||||
test_event_multi_table_SOURCES = test_event_multi_table.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
|
||||
|
||||
##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
|
||||
testBackup_LDADD = $(LDADD) bank/libbank.a
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
|
||||
|
||||
windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
|
||||
testScan.dsp
|
||||
|
||||
flexBench.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ flexBench
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(flexBench_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testBasic.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testBasic
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testBasic_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testOIBasic.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testOIBasic
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testBlobs.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testBlobs
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testBlobs_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
testScan.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ testScan
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
@ -1,35 +0,0 @@
|
||||
|
||||
noinst_LIBRARIES = libNDBT.a
|
||||
|
||||
libNDBT_a_SOURCES = \
|
||||
NDBT_ReturnCodes.cpp \
|
||||
NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \
|
||||
NDBT_Test.cpp HugoCalculator.cpp \
|
||||
HugoOperations.cpp HugoTransactions.cpp \
|
||||
HugoAsynchTransactions.cpp UtilTransactions.cpp \
|
||||
NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
|
||||
NdbBackup.cpp NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp \
|
||||
NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c \
|
||||
CpcClient.cpp
|
||||
|
||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/src/mgmapi
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: libNDBT.dsp
|
||||
|
||||
libNDBT.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-lib.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-lib.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LIB
|
||||
@ -1,156 +0,0 @@
|
||||
|
||||
ndbtools_PROGRAMS = \
|
||||
ndb_test_platform \
|
||||
ndb_waiter \
|
||||
ndb_drop_table \
|
||||
ndb_delete_all \
|
||||
ndb_desc \
|
||||
ndb_drop_index \
|
||||
ndb_show_tables \
|
||||
ndb_select_all \
|
||||
ndb_select_count \
|
||||
ndb_restore
|
||||
|
||||
tools_common_sources = ../test/src/NDBT_ReturnCodes.cpp \
|
||||
../test/src/NDBT_Table.cpp \
|
||||
../test/src/NDBT_Output.cpp
|
||||
|
||||
ndb_test_platform_SOURCES = ndb_test_platform.cpp
|
||||
ndb_waiter_SOURCES = waiter.cpp $(tools_common_sources)
|
||||
ndb_delete_all_SOURCES = delete_all.cpp $(tools_common_sources)
|
||||
ndb_desc_SOURCES = desc.cpp $(tools_common_sources)
|
||||
ndb_drop_index_SOURCES = drop_index.cpp $(tools_common_sources)
|
||||
ndb_drop_table_SOURCES = drop_tab.cpp $(tools_common_sources)
|
||||
ndb_show_tables_SOURCES = listTables.cpp $(tools_common_sources)
|
||||
ndb_select_all_SOURCES = select_all.cpp \
|
||||
../test/src/NDBT_ResultRow.cpp \
|
||||
$(tools_common_sources)
|
||||
ndb_select_count_SOURCES = select_count.cpp $(tools_common_sources)
|
||||
ndb_restore_SOURCES = restore/restore_main.cpp \
|
||||
restore/consumer.cpp \
|
||||
restore/consumer_restore.cpp \
|
||||
restore/consumer_printer.cpp \
|
||||
restore/Restore.cpp
|
||||
|
||||
include $(top_srcdir)/ndb/config/common.mk.am
|
||||
include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am
|
||||
|
||||
ndb_test_platform_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_waiter_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_drop_table_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_delete_all_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_desc_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_drop_index_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_show_tables_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_select_all_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
windoze-dsp: \
|
||||
ndb_waiter.dsp \
|
||||
ndb_drop_table.dsp \
|
||||
ndb_delete_all.dsp \
|
||||
ndb_desc.dsp \
|
||||
ndb_drop_index.dsp \
|
||||
ndb_show_tables.dsp \
|
||||
ndb_select_all.dsp \
|
||||
ndb_select_count.dsp
|
||||
|
||||
ndb_waiter.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_waiter
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_drop_table.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_table
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_delete_all.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_delete_all
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_desc.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_desc
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_drop_index.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_index
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_show_tables.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_show_tables
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_select_all.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_select_all
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
|
||||
ndb_select_count.dsp: Makefile \
|
||||
$(top_srcdir)/ndb/config/win-prg.am \
|
||||
$(top_srcdir)/ndb/config/win-name \
|
||||
$(top_srcdir)/ndb/config/win-includes \
|
||||
$(top_srcdir)/ndb/config/win-sources \
|
||||
$(top_srcdir)/ndb/config/win-libraries
|
||||
cat $(top_srcdir)/ndb/config/win-prg.am > $@
|
||||
@$(top_srcdir)/ndb/config/win-name $@ ndb_select_count
|
||||
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
|
||||
@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
|
||||
@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
|
||||
@ -29,9 +29,9 @@ libexec_PROGRAMS = mysqld
|
||||
noinst_PROGRAMS = gen_lex_hash
|
||||
bin_PROGRAMS = mysql_tzinfo_to_sql
|
||||
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
|
||||
LDADD = $(top_builddir)/myisam/libmyisam.a \
|
||||
$(top_builddir)/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/heap/libheap.a \
|
||||
LDADD = $(top_builddir)/storage/myisam/libmyisam.a \
|
||||
$(top_builddir)/storage/myisammrg/libmyisammrg.a \
|
||||
$(top_builddir)/storage/heap/libheap.a \
|
||||
$(top_builddir)/vio/libvio.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
|
||||
@ -59,28 +59,28 @@ typedef byte mysql_byte;
|
||||
|
||||
/* Include necessary InnoDB headers */
|
||||
extern "C" {
|
||||
#include "../innobase/include/univ.i"
|
||||
#include "../innobase/include/os0file.h"
|
||||
#include "../innobase/include/os0thread.h"
|
||||
#include "../innobase/include/srv0start.h"
|
||||
#include "../innobase/include/srv0srv.h"
|
||||
#include "../innobase/include/trx0roll.h"
|
||||
#include "../innobase/include/trx0trx.h"
|
||||
#include "../innobase/include/trx0sys.h"
|
||||
#include "../innobase/include/mtr0mtr.h"
|
||||
#include "../innobase/include/row0ins.h"
|
||||
#include "../innobase/include/row0mysql.h"
|
||||
#include "../innobase/include/row0sel.h"
|
||||
#include "../innobase/include/row0upd.h"
|
||||
#include "../innobase/include/log0log.h"
|
||||
#include "../innobase/include/lock0lock.h"
|
||||
#include "../innobase/include/dict0crea.h"
|
||||
#include "../innobase/include/btr0cur.h"
|
||||
#include "../innobase/include/btr0btr.h"
|
||||
#include "../innobase/include/fsp0fsp.h"
|
||||
#include "../innobase/include/sync0sync.h"
|
||||
#include "../innobase/include/fil0fil.h"
|
||||
#include "../innobase/include/trx0xa.h"
|
||||
#include "../storage/innobase/include/univ.i"
|
||||
#include "../storage/innobase/include/os0file.h"
|
||||
#include "../storage/innobase/include/os0thread.h"
|
||||
#include "../storage/innobase/include/srv0start.h"
|
||||
#include "../storage/innobase/include/srv0srv.h"
|
||||
#include "../storage/innobase/include/trx0roll.h"
|
||||
#include "../storage/innobase/include/trx0trx.h"
|
||||
#include "../storage/innobase/include/trx0sys.h"
|
||||
#include "../storage/innobase/include/mtr0mtr.h"
|
||||
#include "../storage/innobase/include/row0ins.h"
|
||||
#include "../storage/innobase/include/row0mysql.h"
|
||||
#include "../storage/innobase/include/row0sel.h"
|
||||
#include "../storage/innobase/include/row0upd.h"
|
||||
#include "../storage/innobase/include/log0log.h"
|
||||
#include "../storage/innobase/include/lock0lock.h"
|
||||
#include "../storage/innobase/include/dict0crea.h"
|
||||
#include "../storage/innobase/include/btr0cur.h"
|
||||
#include "../storage/innobase/include/btr0btr.h"
|
||||
#include "../storage/innobase/include/fsp0fsp.h"
|
||||
#include "../storage/innobase/include/sync0sync.h"
|
||||
#include "../storage/innobase/include/fil0fil.h"
|
||||
#include "../storage/innobase/include/trx0xa.h"
|
||||
}
|
||||
|
||||
#define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */
|
||||
|
||||
@ -27,8 +27,8 @@
|
||||
#ifndef MASTER
|
||||
#include "../srclib/myisam/myisamdef.h"
|
||||
#else
|
||||
#include "../myisam/myisamdef.h"
|
||||
#include "../myisam/rt_index.h"
|
||||
#include "../storage/myisam/myisamdef.h"
|
||||
#include "../storage/myisam/rt_index.h"
|
||||
#endif
|
||||
|
||||
ulong myisam_recover_options= HA_RECOVER_NONE;
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#ifndef MASTER
|
||||
#include "../srclib/myisammrg/myrg_def.h"
|
||||
#else
|
||||
#include "../myisammrg/myrg_def.h"
|
||||
#include "../storage/myisammrg/myrg_def.h"
|
||||
#endif
|
||||
|
||||
/*****************************************************************************
|
||||
|
||||
@ -72,7 +72,7 @@ TODO:
|
||||
#ifndef MASTER
|
||||
#include "../srclib/myisammrg/myrg_def.h"
|
||||
#else
|
||||
#include "../myisammrg/myrg_def.h"
|
||||
#include "../storage/myisammrg/myrg_def.h"
|
||||
#endif
|
||||
|
||||
static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table,uint count,
|
||||
|
||||
@ -304,7 +304,7 @@ TODO list:
|
||||
#ifndef MASTER
|
||||
#include "../srclib/myisammrg/myrg_def.h"
|
||||
#else
|
||||
#include "../myisammrg/myrg_def.h"
|
||||
#include "../storage/myisammrg/myrg_def.h"
|
||||
#endif
|
||||
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user