Commit 26f348c9 authored by unknown's avatar unknown
Browse files

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

into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysqladmin.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
parents 7efa215e d39ea1fd

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ igor@rurik.mysql.com 
ingo@mysql.com

jan@hundin.mysql.fi

jani@a80-186-24-72.elisa-laajakaista.fi

jani@a80-186-41-201.elisa-laajakaista.fi

jani@dsl-jkl1657.dial.inet.fi

jani@dsl-kpogw4gb5.dial.inet.fi

jani@hynda.(none)

client/mysqladmin.c

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <sys/stat.h>

#include <mysql.h>



#define ADMIN_VERSION "8.40"

#define ADMIN_VERSION "8.41"

#define MAX_MYSQL_VAR 256

#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */

#define MAX_TRUNC_LENGTH 3
@@ -209,6 +209,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      while (*argument) *argument++= 'x';		/* Destroy argument */

      if (*start)

	start[1]=0;				/* Cut length of argument */

      tty_password= 0;

    }

    else

      tty_password=1;

client/mysqlcheck.c

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/* By Jani Tolonen, 2001-04-20, MySQL Development Team */



#define CHECK_VERSION "2.4.3"

#define CHECK_VERSION "2.4.4"



#include "client_priv.h"

#include <m_ctype.h>
@@ -246,6 +246,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      while (*argument) *argument++= 'x';		/* Destroy argument */

      if (*start)

	start[1] = 0;                             /* Cut length of argument */

      tty_password= 0;

    }

    else

      tty_password = 1;

client/mysqldump.c

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov

*/



#define DUMP_VERSION "10.7"

#define DUMP_VERSION "10.8"



#include <my_global.h>

#include <my_sys.h>
@@ -486,6 +486,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      while (*argument) *argument++= 'x';		/* Destroy argument */

      if (*start)

	start[1]=0;				/* Cut length of argument */

      tty_password= 0;

    }

    else

      tty_password=1;

client/mysqlimport.c

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
**			   *			   *

**			   *************************

*/

#define IMPORT_VERSION "3.4"

#define IMPORT_VERSION "3.5"



#include "client_priv.h"

#include "mysql_version.h"
@@ -191,6 +191,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      while (*argument) *argument++= 'x';		/* Destroy argument */

      if (*start)

	start[1]=0;				/* Cut length of argument */

      tty_password= 0;

    }

    else

      tty_password= 1;