diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-01 18:21:57 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-01 18:21:57 +0000 |
| commit | 58aaedf2b44d927edd752d433139b09fe074da72 (patch) | |
| tree | dc6f8e663ed69cd7bd91af076cf2e5e8dcd88b7e | |
| parent | 1b18225d8b503032a6fc52c8d3bc3e406750c92d (diff) | |
| download | mariadb-git-58aaedf2b44d927edd752d433139b09fe074da72.tar.gz | |
fix for solaris forte -instances=static
added libNDBT.a
removed printout
fixed error that ndb_show_tables required table name
configure.in:
fix for solaris forte -instances=static
ndb/test/run-test/Makefile.am:
added libNDBT.a
ndb/tools/drop_tab.cpp:
removed printout
ndb/tools/listTables.cpp:
removed printout
fixed error that ndb_show_tables required table name
ndb/tools/waiter.cpp:
removed printout
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | ndb/test/run-test/Makefile.am | 1 | ||||
| -rw-r--r-- | ndb/tools/drop_tab.cpp | 1 | ||||
| -rw-r--r-- | ndb/tools/listTables.cpp | 6 | ||||
| -rw-r--r-- | ndb/tools/waiter.cpp | 1 |
5 files changed, 6 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 95d241ad669..d63859720a3 100644 --- a/configure.in +++ b/configure.in @@ -974,8 +974,11 @@ case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in CFLAGS="$CFLAGS -DBIG_TABLES" CXXFLAGS="$CXXFLAGS -DBIG_TABLES" ;; + *) ;; +esac +case $SYSTEM_TYPE-$ac_cv_prog_gcc in # workaround for Sun Forte compile problem for ndb - *solaris2.*-no) + *solaris*-no) ndb_cxxflags_fix="$ndb_cxxflags_fix -instances=static" ;; *) ;; diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am index 80e9e05eef7..1eac96e7ac7 100644 --- a/ndb/test/run-test/Makefile.am +++ b/ndb/test/run-test/Makefile.am @@ -13,6 +13,7 @@ test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \ atrt_SOURCES = main.cpp INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include -I$(top_srcdir)/ndb/src/mgmclient LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o \ + $(top_builddir)/ndb/test/src/libNDBT.a \ $(top_builddir)/ndb/src/libndbclient.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ diff --git a/ndb/tools/drop_tab.cpp b/ndb/tools/drop_tab.cpp index 428730419fa..3362c7de47b 100644 --- a/ndb/tools/drop_tab.cpp +++ b/ndb/tools/drop_tab.cpp @@ -34,7 +34,6 @@ static struct my_option my_long_options[] = static void print_version() { printf("MySQL distrib %s, for %s (%s)\n",MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); - ndbPrintVersion(); } static void usage() { diff --git a/ndb/tools/listTables.cpp b/ndb/tools/listTables.cpp index 2fc34394a9c..05e864a35c4 100644 --- a/ndb/tools/listTables.cpp +++ b/ndb/tools/listTables.cpp @@ -185,7 +185,6 @@ static struct my_option my_long_options[] = static void print_version() { printf("MySQL distrib %s, for %s (%s)\n",MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); - ndbPrintVersion(); } static void usage() { @@ -226,10 +225,7 @@ int main(int argc, char** argv){ int ho_error; if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) return NDBT_ProgramExit(NDBT_WRONGARGS); - if ((_tabname = argv[0]) == 0) { - usage(); - return NDBT_ProgramExit(NDBT_WRONGARGS); - } + _tabname = argv[0]; ndb_cluster_connection = new Ndb_cluster_connection(opt_connect_str); ndb = new Ndb(ndb_cluster_connection, _dbname); diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp index 1ff852b90cb..c9e76bb8ed3 100644 --- a/ndb/tools/waiter.cpp +++ b/ndb/tools/waiter.cpp @@ -47,7 +47,6 @@ static struct my_option my_long_options[] = static void print_version() { printf("MySQL distrib %s, for %s (%s)\n",MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); - ndbPrintVersion(); } static void usage() { |