Commit 727f7a85 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 55974b50 bf30b006

configure.in

+4 −1
Original line number Diff line number Diff line
@@ -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"

    ;;

  *) ;;

ndb/test/run-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -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 \

ndb/tools/drop_tab.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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()

{

ndb/tools/listTables.cpp

+1 −5
Original line number Diff line number Diff line
@@ -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);

ndb/tools/waiter.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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()

{