Commit 75431a2e authored by unknown's avatar unknown
Browse files

fix for mysqladmin link problem 

     .c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin



client/Makefile.am:
  fix for mysqladmin link problem
   .c -> .cc
client/mysqladmin.cc:
  fix for mysqladmin link problem
   .c -> .cc
configure.in:
  fix for mysqladmin link problem
   .c -> .cc
ndb/include/Makefile.am:
  fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
  fix type check problem
parent 283592b7

client/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ 
 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysqladmin_SOURCES =		mysqladmin.cc

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

client/mysqladmin.c→client/mysqladmin.cc

+0 −3
Original line number Diff line number Diff line
@@ -1287,9 +1287,6 @@ static my_bool wait_pidfile(char *pidfile, time_t last_modified, 
  }

  DBUG_RETURN(error);

}

#ifdef HAVE_NDBCLUSTER_DB

/* lib linked in contains c++ code */

#ifdef __GNUC__

FIX_GCC_LINKING_PROBLEM

#endif
 
#endif

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ then 
  then

    if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1

    then

      CFLAGS="$CFLAGS -DDEFINE_CXA_PURE_VIRTUAL"

      CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"

    fi

  fi

ndb/include/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ ndbapi/NdbIndexScanOperation.hpp \ 
ndbapi/ndberror.h



mgmapiinclude_HEADERS = \

mgmapi/LocalConfig.hpp \

mgmapi/mgmapi.h \

mgmapi/mgmapi_debug.h

ndb/src/mgmclient/CommandInterpreter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ extern "C" { 
  {

    return (Ndb_mgmclient_handle) new Ndb_mgmclient(connect_string);

  }

  int ndb_mgmclient_execute(Ndb_mgmclient_handle h, int argc, const char** argv)

  int ndb_mgmclient_execute(Ndb_mgmclient_handle h, int argc, char** argv)

  {

    return ((Ndb_mgmclient*)h)->execute(argc, argv, 1);

  }
@@ -226,7 +226,7 @@ extern "C" { 
#include <util/InputStream.hpp>

#include <util/OutputStream.hpp>



int Ndb_mgmclient::execute(int argc, const char** argv, int _try_reconnect)

int Ndb_mgmclient::execute(int argc, char** argv, int _try_reconnect)

{

  if (argc <= 0)

    return 0;