Commit 2d0011fc authored by unknown's avatar unknown
Browse files

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

into mysql.com:/orca/space/pekka/ndb/version/my41
parents 13f07cf2 3507a52e

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ pem@mysql.com 
peter@linux.local

peter@mysql.com

peterg@mysql.com

petr@mysql.com

pgulutzan@linux.local

ram@deer.(none)

ram@gw.mysql.r18.ru

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ 
      ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"

      ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"

      ndbcluster_system_libs=""

      ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la \$(top_builddir)/mysys/libmysys.a"

      ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"

      MYSQL_CHECK_NDB_OPTIONS

      ;;

    * )

client/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				@ndb_mgmclient_libs@ \

				../libmysql/libmysqlclient.la

DEPLIB=				../libmysql/libmysqlclient.la

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

client/mysql.cc

+3 −3
Original line number Diff line number Diff line
@@ -1676,8 +1676,8 @@ static int com_server_help(String *buffer __attribute__((unused)), 


      if (num_fields == 2)

      {

	put_info("Many help items for your request exist", INFO_INFO);

	put_info("To make a more specific request, please type 'help <item>',\nwhere item is one of next", INFO_INFO);

	put_info("Many help items for your request exist.", INFO_INFO);

	put_info("To make a more specific request, please type 'help <item>',\nwhere item is one of the following", INFO_INFO);

	num_name= 0;

	num_cat= 1;

	last_char= '_';

client/mysqladmin.cc

+6 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <sys/stat.h>

#include <mysql.h>



#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

#include "../ndb/src/mgmclient/ndb_mgmclient.h"

#endif
@@ -45,7 +45,7 @@ static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations, 
            opt_count_iterations= 0;

static ulong opt_connect_timeout, opt_shutdown_timeout;

static my_string unix_port=0;

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

static my_bool opt_ndbcluster=0;

static char *opt_ndb_connectstring=0;

#endif
@@ -101,7 +101,7 @@ enum commands { 
  ADMIN_PING,             ADMIN_EXTENDED_STATUS, ADMIN_FLUSH_STATUS,

  ADMIN_FLUSH_PRIVILEGES, ADMIN_START_SLAVE,     ADMIN_STOP_SLAVE,

  ADMIN_FLUSH_THREADS,    ADMIN_OLD_PASSWORD

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

  ,ADMIN_NDB_MGM

#endif

};
@@ -114,7 +114,7 @@ static const char *command_names[]= { 
  "ping",                 "extended-status",     "flush-status",

  "flush-privileges",     "start-slave",         "stop-slave",

  "flush-threads","old-password",

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

  "ndb-mgm",

#endif

  NullS
@@ -197,7 +197,7 @@ static struct my_option my_long_options[] = 
  {"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", (gptr*) &opt_shutdown_timeout,

   (gptr*) &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,

   SHUTDOWN_DEF_TIMEOUT, 0, 3600*12, 0, 1, 0},

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

  {"ndbcluster", OPT_NDBCLUSTER, ""

   "", (gptr*) &opt_ndbcluster,

   (gptr*) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -903,7 +903,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      }

      mysql->reconnect=1;	/* Automatic reconnect is default */

      break;

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

    case ADMIN_NDB_MGM:

    {

      if (argc < 2)