Commit 366ef4fa authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/wl2077


client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
parents 5a022e7b 5a7198f5

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

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)

client/mysqlbinlog.cc

+16 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static const char *load_default_groups[]= { "mysqlbinlog","client",0 }; 


void sql_print_error(const char *format, ...);



static bool one_database=0, to_last_remote_log= 0;

static bool one_database=0, to_last_remote_log= 0, disable_log_bin= 0;

static const char* database= 0;

static my_bool force_opt= 0, short_form= 0, remote_opt= 0;

static ulonglong offset = 0;
@@ -438,6 +438,13 @@ static struct my_option my_long_options[] = 
  {"database", 'd', "List entries for just this database (local log only).",

   (gptr*) &database, (gptr*) &database, 0, GET_STR_ALLOC, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"disable-log-bin", 'D', "Disable binary log. This is useful, if you "

    "enabled --to-last-log and are sending the output to the same MySQL server. "

    "This way you could avoid an endless loop. You would also like to use it "

    "when restoring after a crash to avoid duplication of the statements you "

    "already have. NOTE: you will need a SUPER privilege to use this option.",

   (gptr*) &disable_log_bin, (gptr*) &disable_log_bin, 0, GET_BOOL,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"force-read", 'f', "Force reading unknown binlog events.",

   (gptr*) &force_opt, (gptr*) &force_opt, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},
@@ -1068,6 +1075,11 @@ int main(int argc, char** argv) 


  fprintf(result_file,

	  "/*!40019 SET @@session.max_insert_delayed_threads=0*/;\n");



  if (disable_log_bin)

    fprintf(result_file,

            "/*!32316 SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0*/;\n");



  for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;

       (--argc >= 0) && !stop_passed ; )

  {
@@ -1082,6 +1094,9 @@ int main(int argc, char** argv) 
    start_position= BIN_LOG_HEADER_SIZE;

  }



  if (disable_log_bin)

    fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");



  if (tmpdir.list)

    free_tmpdir(&tmpdir);

  if (result_file != stdout)