mysqladmin.c 29.2 KB
Newer Older
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
1 2
/* Copyright (C) 2000 MySQL AB

bk@work.mysql.com's avatar
bk@work.mysql.com committed
3 4 5 6
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
7

bk@work.mysql.com's avatar
bk@work.mysql.com committed
8 9 10 11
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
12

bk@work.mysql.com's avatar
bk@work.mysql.com committed
13 14 15 16 17 18 19
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

/* maintaince of mysql databases */


monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
20
#include "client_priv.h"
bk@work.mysql.com's avatar
bk@work.mysql.com committed
21
#include <signal.h>
22
#include <my_getopt.h>
bk@work.mysql.com's avatar
bk@work.mysql.com committed
23 24 25 26
#ifdef THREAD
#include <my_pthread.h>				/* because of signal()	*/
#endif

27
#define ADMIN_VERSION "8.32"
bk@work.mysql.com's avatar
bk@work.mysql.com committed
28
#define MAX_MYSQL_VAR 64
29
#define SHUTDOWN_DEF_TIMEOUT 3600		/* Wait for shutdown */
bk@work.mysql.com's avatar
bk@work.mysql.com committed
30 31
#define MAX_TRUNC_LENGTH 3

32
char *host= NULL, *user= 0, *opt_password= 0;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
33 34 35 36
char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH];
char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN];
ulonglong last_values[MAX_MYSQL_VAR];
static int interval=0;
monty@donna.mysql.com's avatar
monty@donna.mysql.com committed
37
static my_bool option_force=0,interrupted=0,new_line=0,
38 39
               opt_compress=0, opt_relative=0, opt_verbose=0, opt_vertical=0,
               tty_password=0;
monty@donna.mysql.com's avatar
monty@donna.mysql.com committed
40
static uint tcp_port = 0, option_wait = 0, option_silent=0;
41
static ulong opt_connect_timeout, opt_shutdown_timeout;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
42 43 44 45 46 47 48 49 50 51 52 53 54
static my_string unix_port=0;

/* When using extended-status relatively, ex_val_max_len is the estimated
   maximum length for any relative value printed by extended-status. The
   idea is to try to keep the length of output as short as possible. */
static uint ex_val_max_len[MAX_MYSQL_VAR];
static my_bool ex_status_printed = 0; /* First output is not relative. */
static uint ex_var_count, max_var_length, max_val_length;

#include "sslopt-vars.h"

static void print_version(void);
static void usage(void);
55
static my_bool sql_connect(MYSQL *mysql, uint wait);
56
static int execute_commands(MYSQL *mysql,int argc, char **argv);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
static int drop_db(MYSQL *mysql,const char *db);
static sig_handler endprog(int signal_number);
static void nice_time(ulong sec,char *buff);
static void print_header(MYSQL_RES *result);
static void print_top(MYSQL_RES *result);
static void print_row(MYSQL_RES *result,MYSQL_ROW cur, uint row);
static void print_relative_row(MYSQL_RES *result, MYSQL_ROW cur, uint row);
static void print_relative_row_vert(MYSQL_RES *result, MYSQL_ROW cur, uint row);
static void print_relative_header();
static void print_relative_line();
static void truncate_names();
static my_bool get_pidfile(MYSQL *mysql, char *pidfile);
static void wait_pidfile(char *pidfile);
static void store_values(MYSQL_RES *result);

/*
  The order of commands must be the same as command_names,
  except ADMIN_ERROR
*/
76 77 78 79 80 81 82 83 84 85
enum commands { 
  ADMIN_ERROR, 
  ADMIN_CREATE,           ADMIN_DROP,            ADMIN_SHUTDOWN,
  ADMIN_RELOAD,           ADMIN_REFRESH,         ADMIN_VER, 
  ADMIN_PROCESSLIST,      ADMIN_STATUS,          ADMIN_KILL, 
  ADMIN_DEBUG,            ADMIN_VARIABLES,       ADMIN_FLUSH_LOGS, 
  ADMIN_FLUSH_HOSTS,      ADMIN_FLUSH_TABLES,    ADMIN_PASSWORD, 
  ADMIN_PING,             ADMIN_EXTENDED_STATUS, ADMIN_FLUSH_STATUS, 
  ADMIN_FLUSH_PRIVILEGES, ADMIN_START_SLAVE,     ADMIN_STOP_SLAVE, 
  ADMIN_FLUSH_THREADS
bk@work.mysql.com's avatar
bk@work.mysql.com committed
86
};
87 88 89 90 91 92 93 94 95 96 97 98
static const char *command_names[]= {
  "create",               "drop",                "shutdown",
  "reload",               "refresh",             "version",
  "processlist",          "status",              "kill",
  "debug",                "variables",           "flush-logs",
  "flush-hosts",          "flush-tables",        "password",
  "ping",                 "extended-status",     "flush-status",
  "flush-privileges",     "start-slave",         "stop-slave",  
  "flush-threads", 
  NullS
};

bk@work.mysql.com's avatar
bk@work.mysql.com committed
99 100 101
static TYPELIB command_typelib=
{ array_elements(command_names)-1,"commands", command_names};

102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
static struct my_option my_long_options[] =
{
  {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'",
   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
  {"force", 'f',
   "Don't ask for confirmation on drop database; with multiple commands, continue even if an error occurs.",
   (gptr*) &option_force, (gptr*) &option_force, 0, GET_BOOL, NO_ARG, 0, 0,
   0, 0, 0, 0},
  {"compress", 'C', "Use compression in server/client protocol",
   (gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
   0, 0, 0},
  {"character-sets-dir", OPT_CHARSETS_DIR,
   "Directory where character sets are.", (gptr*) &charsets_dir,
   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
   NO_ARG, 0, 0, 0, 0, 0, 0},
  {"host", 'h', "Connect to host", (gptr*) &host, (gptr*) &host, 0, GET_STR,
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
  {"password", 'p',
   "Password to use when connecting to server. If password is not given it's asked from the tty.",
   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
bk@work.mysql.com's avatar
bk@work.mysql.com committed
123
#ifdef __WIN__
124 125
  {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
   NO_ARG, 0, 0, 0, 0, 0, 0},
bk@work.mysql.com's avatar
bk@work.mysql.com committed
126
#endif
127 128
  {"port", 'P', "Port number to use for connection.", (gptr*) &tcp_port,
   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
129 130 131 132 133 134 135 136 137 138
  {"relative", 'r',
   "Show difference between current and previous values when used with -i. Currently works only with extended-status.",
   (gptr*) &opt_relative, (gptr*) &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
  0, 0, 0},
  {"set-variable", 'O',
   "Change the value of a variable. Please note that this option is depricated; you can set variables directly with --variable-name=value.",
   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
  {"silent", 's', "Silently exit if one can't connect to server",
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
  {"socket", 'S', "Socket file to use for connection.",
139 140
   (gptr*) &unix_port, (gptr*) &unix_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
   0, 0, 0},
141
  {"sleep", 'i', "Execute commands again and again with a sleep between.",
142 143
   (gptr*) &interval, (gptr*) &interval, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0,
   0, 0},
bk@work.mysql.com's avatar
bk@work.mysql.com committed
144 145
#include "sslopt-longopts.h"
#ifndef DONT_ALLOW_USER_CHANGE
146
  {"user", 'u', "User for login if not current user.", (gptr*) &user,
147
   (gptr*) &user, 0, GET_STRALC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
bk@work.mysql.com's avatar
bk@work.mysql.com committed
148
#endif
149 150 151 152 153 154 155 156 157 158 159
  {"verbose", 'v', "Write more information.", (gptr*) &opt_verbose,
   (gptr*) &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
  {"version", 'V', "Output version information and exit", 0, 0, 0, GET_NO_ARG,
   NO_ARG, 0, 0, 0, 0, 0, 0},
  {"vertical", 'E', 
   "Print output vertically. Is similar to --relative, but prints output vertically.",
   (gptr*) &opt_vertical, (gptr*) &opt_vertical, 0, GET_BOOL, NO_ARG, 0, 0, 0,
   0, 0, 0},
  {"wait", 'w', "Wait and retry if connection is down", 0, 0, 0, GET_NO_ARG,
   NO_ARG, 0, 0, 0, 0, 0, 0},
  {"connect_timeout", OPT_CONNECT_TIMEOUT, "", (gptr*) &opt_connect_timeout,
160
   (gptr*) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 3600*12, 0,
161 162
   3600*12, 0, 1, 0},
  {"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", (gptr*) &opt_shutdown_timeout,
163
   (gptr*) &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,
164 165
   SHUTDOWN_DEF_TIMEOUT, 0, 3600*12, 0, 1, 0},
  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
bk@work.mysql.com's avatar
bk@work.mysql.com committed
166 167
};

168

bk@work.mysql.com's avatar
bk@work.mysql.com committed
169 170
static const char *load_default_groups[]= { "mysqladmin","client",0 };

171 172 173
static my_bool
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
	       char *argument)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
174
{
175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194
  int error = 0;

  switch(optid) {
  case 'p':
    if (argument)
    {
      char *start=argument;
      my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));
      opt_password=my_strdup(argument,MYF(MY_FAE));
      while (*argument) *argument++= 'x';		/* Destroy argument */
      if (*start)
	start[1]=0;				/* Cut length of argument */
    }
    else
      tty_password=1;
    break;
  case 's':
    option_silent++;
    break;
  case 'W':
bk@work.mysql.com's avatar
bk@work.mysql.com committed
195
#ifdef __WIN__
196
    unix_port=MYSQL_NAMEDPIPE;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
197
#endif
198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214
    break;
  case '#':
    DBUG_PUSH(argument ? argument : "d:t:o,/tmp/mysqladmin.trace");
    break;
  case 'V':
    print_version();
    exit(0);
    break;
  case 'w':
    if (argument)
    {
      if ((option_wait=atoi(argument)) <= 0)
	option_wait=1;
    }
    else
      option_wait= ~0;
    break;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
215
#include "sslopt-case.h"
216 217 218 219 220
  case '?':
  case 'I':					/* Info */
    error++;
    break;
  case OPT_CHARSETS_DIR:
bk@work.mysql.com's avatar
bk@work.mysql.com committed
221
#if MYSQL_VERSION_ID > 32300
222
    charsets_dir = argument;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
223
#endif
224
    break;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
225
  }
226
  if (error)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
227 228 229 230
  {
    usage();
    exit(1);
  }
231 232 233 234 235 236 237 238 239
  return 0;
}


int main(int argc,char *argv[])
{
  int error, ho_error;
  MYSQL mysql;
  char **commands;
240
  char** save_argv;
241 242 243
  MY_INIT(argv[0]);
  mysql_init(&mysql);
  load_defaults("my",load_default_groups,&argc,&argv);
244 245 246 247 248 249
  save_argv = argv;
  /* Sasha: with the change to handle_options() we now need to do this fix
     with save_argv in all client utilities. The problem is that
     handle_options may modify argv, and that wreaks havoc with
     free_defaults()
  */
250 251 252 253 254 255 256 257 258 259 260 261
  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
  {
    printf("%s: handle_options() failed with error %d\n", my_progname,
	   ho_error);
    exit(1);
  }
  if (argc == 0)
  {
    usage();
    exit(1);
  }
  commands = argv;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
262
  if (tty_password)
263
    opt_password = get_tty_password(NullS);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
264 265 266 267 268 269

  VOID(signal(SIGINT,endprog));			/* Here if abort */
  VOID(signal(SIGTERM,endprog));		/* Here if abort */

  if (opt_compress)
    mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
270 271 272 273 274
  if (opt_connect_timeout)
  {
    uint tmp=opt_connect_timeout;
    mysql_options(&mysql,MYSQL_OPT_CONNECT_TIMEOUT, (char*) &tmp);
  }
bk@work.mysql.com's avatar
bk@work.mysql.com committed
275 276 277
#ifdef HAVE_OPENSSL
  if (opt_use_ssl)
    mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
278
		  opt_ssl_capath, opt_ssl_cipher);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
279
#endif /* HAVE_OPENSSL */
280
  if (sql_connect(&mysql, option_wait))
bk@work.mysql.com's avatar
bk@work.mysql.com committed
281 282 283 284 285 286 287
    error = 1;
  else
  {
    error = 0;
    while (!interrupted)
    {
      new_line = 0;
288
      if ((error=execute_commands(&mysql,argc,commands)))
bk@work.mysql.com's avatar
bk@work.mysql.com committed
289
      {
290 291 292
	if (error > 0)
	  break;				/* Wrong command error */
	if (!option_force)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
293
	{
294 295 296
	  if (option_wait && !interrupted)
	  {
	    mysql_close(&mysql);
297
	    if (!sql_connect(&mysql, option_wait))
298 299 300 301 302 303 304
	    {
	      sleep(1);				/* Don't retry too rapidly */
	      continue;				/* Retry */
	    }
	  }
	  error=1;
	  break;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
305 306 307 308 309 310 311 312 313 314 315 316 317
	}
      }
      if (interval)
      {
	sleep(interval);
	if (new_line)
	  puts("");
      }
      else
	break;
    }
    mysql_close(&mysql);
  }
318
  my_free(opt_password,MYF(MY_ALLOW_ZERO_PTR));
bk@work.mysql.com's avatar
bk@work.mysql.com committed
319
  my_free(user,MYF(MY_ALLOW_ZERO_PTR));
320
  free_defaults(save_argv);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
321
  my_end(0);
322
  exit(error ? 1 : 0);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
323 324 325 326 327 328 329 330 331 332
  return 0;
}


static sig_handler endprog(int signal_number __attribute__((unused)))
{
  interrupted=1;
}


333
static my_bool sql_connect(MYSQL *mysql, uint wait)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
334 335 336 337 338
{
  my_bool info=0;

  for (;;)
  {
339 340
    if (mysql_real_connect(mysql,host,user,opt_password,NullS,tcp_port,
			   unix_port, 0))
bk@work.mysql.com's avatar
bk@work.mysql.com committed
341 342 343 344 345 346 347 348
    {
      if (info)
      {
	fputs("\n",stderr);
	(void) fflush(stderr);
      }
      return 0;
    }
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
349

bk@work.mysql.com's avatar
bk@work.mysql.com committed
350 351 352 353 354
    if (!wait)
    {
      if (!option_silent)
      {
	if (!host)
355
	  host= (char*) LOCAL_HOST;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384
	my_printf_error(0,"connect to server at '%s' failed\nerror: '%s'",
			MYF(ME_BELL), host, mysql_error(mysql));
	if (mysql_errno(mysql) == CR_CONNECTION_ERROR)
	{
	  fprintf(stderr,
		  "Check that mysqld is running and that the socket: '%s' exists!\n",
		  unix_port ? unix_port : mysql_unix_port);
	}
	else if (mysql_errno(mysql) == CR_CONN_HOST_ERROR ||
		 mysql_errno(mysql) == CR_UNKNOWN_HOST)
	{
	  fprintf(stderr,"Check that mysqld is running on %s",host);
	  fprintf(stderr," and that the port is %d.\n",
		  tcp_port ? tcp_port: mysql_port);
	  fprintf(stderr,"You can check this by doing 'telnet %s %d'\n",
		  host, tcp_port ? tcp_port: mysql_port);
	}
      }
      return 1;
    }
    if (wait != (uint) ~0)
      wait--;				/* One less retry */
    if ((mysql_errno(mysql) != CR_CONN_HOST_ERROR) &&
	(mysql_errno(mysql) != CR_CONNECTION_ERROR))
    {	 
      fprintf(stderr,"Got error: %s\n", mysql_error(mysql));
      if (!option_force)
	return 1;
    }
monty@donna.mysql.com's avatar
monty@donna.mysql.com committed
385
    else if (!option_silent)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
386
    {
monty@donna.mysql.com's avatar
monty@donna.mysql.com committed
387 388 389 390 391 392 393 394 395 396 397
      if (!info)
      {
	info=1;
	fputs("Waiting for MySQL server to answer",stderr);
	(void) fflush(stderr);
      }
      else
      {
	putc('.',stderr); 
	(void) fflush(stderr);
      }
bk@work.mysql.com's avatar
bk@work.mysql.com committed
398
    }
monty@donna.mysql.com's avatar
monty@donna.mysql.com committed
399
    sleep(5);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
400 401 402
  }
}

403 404 405 406 407 408
/*
  Execute a command.
  Return 0 on ok
	 -1 on retryable error
	 1 on fatal error
*/
bk@work.mysql.com's avatar
bk@work.mysql.com committed
409

410
static int execute_commands(MYSQL *mysql,int argc, char **argv)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
411
{
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
412
  const char *status;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
413 414 415 416 417 418 419 420 421 422 423 424

  for (; argc > 0 ; argv++,argc--)
  {
    switch (find_type(argv[0],&command_typelib,2)) {
    case ADMIN_CREATE:
    {
      char buff[FN_REFLEN+20];
      if (argc < 2)
      {
	my_printf_error(0,"Too few arguments to create",MYF(ME_BELL));
	return 1;
      }
425
      sprintf(buff,"create database `%.*s`",FN_REFLEN,argv[1]);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
426
      if (mysql_query(mysql,buff))
427
      {
428 429
	my_printf_error(0,"CREATE DATABASE failed; error: '%-.200s'",
			MYF(ME_BELL), mysql_error(mysql));
430
	return -1;
431
      }
432
      argc--; argv++;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
433 434 435 436 437 438 439 440 441
      break;
    }
    case ADMIN_DROP:
    {
      if (argc < 2)
      {
	my_printf_error(0,"Too few arguments to drop",MYF(ME_BELL));
	return 1;
      }
442
      if (drop_db(mysql,argv[1]))
443
	return -1;
444
      argc--; argv++;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
445 446 447 448 449 450 451 452 453 454 455 456 457 458
      break;
    }
    case ADMIN_SHUTDOWN:
    {
      char pidfile[FN_REFLEN];
      my_bool got_pidfile=0;
      /* Only wait for pidfile on local connections */
      /* If pidfile doesn't exist, continue without pid file checking */
      if (mysql->unix_socket)
	got_pidfile= !get_pidfile(mysql, pidfile);
      if (mysql_shutdown(mysql))
      {
	my_printf_error(0,"shutdown failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
459
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475
      }
      mysql_close(mysql);	/* Close connection to avoid error messages */
      if (got_pidfile)
      {
	if (opt_verbose)
	  printf("Shutdown signal sent to server;  Waiting for pid file to disappear\n");
	wait_pidfile(pidfile); /* Wait until pid file is gone */
      }
      break;
    }
    case ADMIN_FLUSH_PRIVILEGES:
    case ADMIN_RELOAD:
      if (mysql_refresh(mysql,REFRESH_GRANT) < 0)
      {
	my_printf_error(0,"reload failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
476
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
477 478 479 480 481
      }
      break;
    case ADMIN_REFRESH:
      if (mysql_refresh(mysql,
			(uint) ~(REFRESH_GRANT | REFRESH_STATUS |
482 483
				 REFRESH_READ_LOCK | REFRESH_SLAVE |
				 REFRESH_MASTER)) < 0)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
484 485 486
      {
	my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
487
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
488 489 490 491 492 493 494
      }
      break;
    case ADMIN_FLUSH_THREADS:
      if (mysql_refresh(mysql,(uint) REFRESH_THREADS) < 0)
      {
	my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
495
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
496 497 498 499 500
      }
      break;
    case ADMIN_VER:
      new_line=1;
      print_version();
501 502
      puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
      puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
bk@work.mysql.com's avatar
bk@work.mysql.com committed
503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538
      printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
      printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
      printf("Connection\t\t%s\n",mysql_get_host_info(mysql));
      if (mysql->unix_socket)
	printf("UNIX socket\t\t%s\n", mysql->unix_socket);
      else
	printf("TCP port\t\t%d\n", mysql->port);
      status=mysql_stat(mysql);
      {
	char *pos,buff[40];
	ulong sec;
	pos=strchr(status,' ');
	*pos++=0;
	printf("%s\t\t\t",status);			/* print label */
	if ((status=str2int(pos,10,0,LONG_MAX,(long*) &sec)))
	{
	  nice_time(sec,buff);
	  puts(buff);				/* print nice time */
	  while (*status == ' ') status++;	/* to next info */
	}
      }
      putc('\n',stdout);
      if (status)
	puts(status);
      break;
    case ADMIN_PROCESSLIST:
    {
      MYSQL_RES *result;
      MYSQL_ROW row;

      if (mysql_query(mysql, (opt_verbose ? "show full processlist" :
			      "show processlist")) ||
	  !(result = mysql_store_result(mysql)))
      {
	my_printf_error(0,"process list failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
539
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577
      }
      print_header(result);
      while ((row=mysql_fetch_row(result)))
	print_row(result,row,0);
      print_top(result);
      mysql_free_result(result);
      new_line=1;
      break;
    }
    case ADMIN_STATUS:
      status=mysql_stat(mysql);
      if (status)
	puts(status);
      break;
    case ADMIN_KILL:
      {
	uint error=0;
	char *pos;
	if (argc < 2)
	{
	  my_printf_error(0,"Too few arguments to 'kill'",MYF(ME_BELL));
	  return 1;
	}
	pos=argv[1];
	for (;;)
	{
	  if (mysql_kill(mysql,(ulong) atol(pos)))
	  {
	    my_printf_error(0,"kill failed on %ld; error: '%s'",MYF(ME_BELL),
			    atol(pos), mysql_error(mysql));
	    error=1;
	  }
	  if (!(pos=strchr(pos,',')))
	    break;
	  pos++;
	}
	argc--; argv++;
	if (error)
578
	  return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
579 580 581 582 583 584 585
	break;
      }
    case ADMIN_DEBUG:
      if (mysql_dump_debug_info(mysql))
      {
	my_printf_error(0,"debug failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
586
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
587 588 589 590 591 592 593 594 595 596 597 598 599
      }
      break;
    case ADMIN_VARIABLES:
    {
      MYSQL_RES *res;
      MYSQL_ROW row;

      new_line=1;
      if (mysql_query(mysql,"show variables") ||
	  !(res=mysql_store_result(mysql)))
      {
	my_printf_error(0,"unable to show variables; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
600
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621
      }
      print_header(res);
      while ((row=mysql_fetch_row(res)))
	print_row(res,row,0);
      print_top(res);
      mysql_free_result(res);
      break;
    }
    case ADMIN_EXTENDED_STATUS:
    {
      MYSQL_RES *res;
      MYSQL_ROW row;
      uint rownr = 0;
      void (*func) (MYSQL_RES*, MYSQL_ROW, uint); 

      new_line = 1;
      if (mysql_query(mysql, "show status") ||
	  !(res = mysql_store_result(mysql)))
      {
	my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL),
			mysql_error(mysql));
622
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660
      }
      if (!opt_vertical)
	print_header(res);
      else
      {
	if (!ex_status_printed)
	{
	  store_values(res);
	  truncate_names();   /* Does some printing also */
	}
	else
	{
	  print_relative_line();
	  print_relative_header();
	  print_relative_line();
	}
      }

      /*      void (*func) (MYSQL_RES*, MYSQL_ROW, uint); */
      if (opt_relative && !opt_vertical)
	func = print_relative_row;
      else if (opt_vertical)
	func = print_relative_row_vert;
      else
	func = print_row;

      while ((row = mysql_fetch_row(res)))
	(*func)(res, row, rownr++);
      if (opt_vertical)
      {
	if (ex_status_printed)
	{
	  putchar('\n');
	  print_relative_line();
	}
      }
      else
	print_top(res);
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
661

bk@work.mysql.com's avatar
bk@work.mysql.com committed
662 663 664 665 666 667 668 669 670 671
      ex_status_printed = 1; /* From now on the output will be relative */
      mysql_free_result(res);
      break;
    }
    case ADMIN_FLUSH_LOGS:
    {
      if (mysql_refresh(mysql,REFRESH_LOG))
      {
	my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
672
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
673 674 675 676 677 678 679 680 681
      }
      break;
    }
    case ADMIN_FLUSH_HOSTS:
    {
      if (mysql_refresh(mysql,REFRESH_HOSTS))
      {
	my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
682
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
683 684 685 686 687 688 689 690 691
      }
      break;
    }
    case ADMIN_FLUSH_TABLES:
    {
      if (mysql_refresh(mysql,REFRESH_TABLES))
      {
	my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
692
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
693 694 695 696 697 698 699 700 701
      }
      break;
    }
    case ADMIN_FLUSH_STATUS:
    {
      if (mysql_refresh(mysql,REFRESH_STATUS))
      {
	my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL),
			mysql_error(mysql));
702
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
703 704 705 706 707 708 709
      }
      break;
    }
    case ADMIN_PASSWORD:
    {
      char buff[128],crypted_pw[33];

710
      if (argc < 2)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
711 712 713 714 715 716 717 718 719 720 721 722 723 724
      {
	my_printf_error(0,"Too few arguments to change password",MYF(ME_BELL));
	return 1;
      }
      if (argv[1][0])
	make_scrambled_password(crypted_pw,argv[1]);
      else
	crypted_pw[0]=0;			/* No password */
      sprintf(buff,"set password='%s',sql_log_off=0",crypted_pw);

      if (mysql_query(mysql,"set sql_log_off=1"))
      {
	my_printf_error(0, "Can't turn off logging; error: '%s'",
			MYF(ME_BELL),mysql_error(mysql));
725
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
726 727 728 729 730
      }
      if (mysql_query(mysql,buff))
      {
	my_printf_error(0,"unable to change password; error: '%s'",
			MYF(ME_BELL),mysql_error(mysql));
731
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
732 733 734 735 736 737 738 739 740 741
      }
      argc--; argv++;
      break;
    }

    case ADMIN_START_SLAVE:
      if (mysql_query(mysql, "SLAVE START"))
      {
	my_printf_error(0, "Error starting slave: %s", MYF(ME_BELL),
			mysql_error(mysql));
742
	return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
743 744 745 746 747 748 749 750 751
      }
      else
	puts("Slave started");
      break;
    case ADMIN_STOP_SLAVE:
      if (mysql_query(mysql, "SLAVE STOP"))
      {
	  my_printf_error(0, "Error stopping slave: %s", MYF(ME_BELL),
			  mysql_error(mysql));
752
	  return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
753 754 755 756
      }
      else
	puts("Slave stopped");
      break;
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
757

bk@work.mysql.com's avatar
bk@work.mysql.com committed
758 759 760
    case ADMIN_PING:
      mysql->reconnect=0;	/* We want to know of reconnects */
      if (!mysql_ping(mysql))
monty@donna.mysql.com's avatar
monty@donna.mysql.com committed
761 762 763 764
      {
	if (option_silent < 2)
	  puts("mysqld is alive");
      }
bk@work.mysql.com's avatar
bk@work.mysql.com committed
765 766 767 768 769 770 771 772 773 774 775 776
      else
      {
	if (mysql_errno(mysql) == CR_SERVER_GONE_ERROR)
	{
	  mysql->reconnect=1;
	  if (!mysql_ping(mysql))
	    puts("connection was down, but mysqld is now alive");
	}
	else
	{
	  my_printf_error(0,"mysqld doesn't answer to ping, error: '%s'",
			  MYF(ME_BELL),mysql_error(mysql));
777
	  return -1;
bk@work.mysql.com's avatar
bk@work.mysql.com committed
778 779 780 781 782
	}
      }
      mysql->reconnect=1;	/* Automatic reconnect is default */
      break;
    default:
783
      my_printf_error(0,"Unknown command: '%-.60s'",MYF(ME_BELL),argv[0]);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802
      return 1;
    }
  }
  return 0;
}


static void print_version(void)
{
  printf("%s  Ver %s Distrib %s, for %s on %s\n",my_progname,ADMIN_VERSION,
	 MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
}


static void usage(void)
{
  print_version();
  puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
  puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
803
  puts("Administration program for the mysqld daemon.");
bk@work.mysql.com's avatar
bk@work.mysql.com committed
804
  printf("Usage: %s [OPTIONS] command command....\n", my_progname);
805 806
  my_print_help(my_long_options);
  my_print_variables(my_long_options);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829
  print_defaults("my",load_default_groups);
  puts("\nWhere command is a one or more of: (Commands may be shortened)\n\
  create databasename	Create a new database\n\
  drop databasename	Delete a database and all its tables\n\
  extended-status       Gives an extended status message from the server\n\
  flush-hosts           Flush all cached hosts\n\
  flush-logs            Flush all logs\n\
  flush-status		Clear status variables\n\
  flush-tables          Flush all tables\n\
  flush-threads         Flush the thread cache\n\
  flush-privileges      Reload grant tables (same as reload)\n\
  kill id,id,...	Kill mysql threads");
#if MYSQL_VERSION_ID >= 32200
  puts("\
  password new-password Change old password to new-password");
#endif
  puts("\
  ping			Check if mysqld is alive\n\
  processlist		Show list of active threads in server\n\
  reload		Reload grant tables\n\
  refresh		Flush all tables and close and open logfiles\n\
  shutdown		Take server down\n\
  status		Gives a short status message from the server\n\
830 831
  start-slave		Start slave\n\
  stop-slave		Stop slave\n\
bk@work.mysql.com's avatar
bk@work.mysql.com committed
832 833 834 835 836 837 838 839 840 841 842
  variables             Prints variables available\n\
  version		Get version info from server");
}

static int drop_db(MYSQL *mysql, const char *db)
{
  char name_buff[FN_REFLEN+20], buf[10];
  if (!option_force)
  {
    puts("Dropping the database is potentially a very bad thing to do.");
    puts("Any data stored in the database will be destroyed.\n");
843 844
    printf("Do you really want to drop the '%s' database [y/N] ",db);
    fflush(stdout);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
845 846 847 848 849 850 851
    VOID(fgets(buf,sizeof(buf)-1,stdin));
    if ((*buf != 'y') && (*buf != 'Y'))
    {
      puts("\nOK, aborting database drop!");
      return -1;
    }
  }
852
  sprintf(name_buff,"drop database `%.*s`",FN_REFLEN,db);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
853 854
  if (mysql_query(mysql,name_buff))
  {
855
    my_printf_error(0,"DROP DATABASE %s failed;\nerror: '%s'",MYF(ME_BELL),
bk@work.mysql.com's avatar
bk@work.mysql.com committed
856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901
		    db,mysql_error(mysql));
    return 1;
  }
  printf("Database \"%s\" dropped\n",db);
  return 0;
}


static void nice_time(ulong sec,char *buff)
{
  ulong tmp;

  if (sec >= 3600L*24)
  {
    tmp=sec/(3600L*24);
    sec-=3600L*24*tmp;
    buff=int2str(tmp,buff,10);
    buff=strmov(buff,tmp > 1 ? " days " : " day ");
  }
  if (sec >= 3600L)
  {
    tmp=sec/3600L;
    sec-=3600L*tmp;
    buff=int2str(tmp,buff,10);
    buff=strmov(buff,tmp > 1 ? " hours " : " hour ");
  }
  if (sec >= 60)
  {
    tmp=sec/60;
    sec-=60*tmp;
    buff=int2str(tmp,buff,10);
    buff=strmov(buff," min ");
  }
  strmov(int2str(sec,buff,10)," sec");
}


static void print_header(MYSQL_RES *result)
{
  MYSQL_FIELD *field;

  print_top(result);
  mysql_field_seek(result,0);
  putchar('|');
  while ((field = mysql_fetch_field(result)))
  {
902
    printf(" %-*s|",(int) field->max_length+1,field->name);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
903 904 905 906 907 908 909 910 911 912 913 914 915 916 917
  }
  putchar('\n');
  print_top(result);
}


static void print_top(MYSQL_RES *result)
{
  uint i,length;
  MYSQL_FIELD *field;

  putchar('+');
  mysql_field_seek(result,0);
  while((field = mysql_fetch_field(result)))
  {
918
    if ((length=(uint) strlen(field->name)) > field->max_length)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956
      field->max_length=length;
    else
      length=field->max_length;
    for (i=length+2 ; i--> 0 ; )
      putchar('-');
    putchar('+');
  }
  putchar('\n');
}


/* 3.rd argument, uint row, is not in use. Don't remove! */
static void print_row(MYSQL_RES *result, MYSQL_ROW cur,
		      uint row __attribute__((unused)))
{
  uint i,length;
  MYSQL_FIELD *field;

  putchar('|');
  mysql_field_seek(result,0);
  for (i=0 ; i < mysql_num_fields(result); i++)
  {
    field = mysql_fetch_field(result);
    length=field->max_length;
    printf(" %-*s|",length+1,cur[i] ? (char*) cur[i] : "");
  }
  putchar('\n');
}


static void print_relative_row(MYSQL_RES *result, MYSQL_ROW cur, uint row)
{
  ulonglong tmp;
  char buff[22];
  MYSQL_FIELD *field;

  mysql_field_seek(result, 0);
  field = mysql_fetch_field(result);
957
  printf("| %-*s|", (int) field->max_length + 1, cur[0]);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
958 959 960

  field = mysql_fetch_field(result);
  tmp = cur[1] ? strtoull(cur[1], NULL, 0) : (ulonglong) 0;
961
  printf(" %-*s|\n", (int) field->max_length + 1,
bk@work.mysql.com's avatar
bk@work.mysql.com committed
962 963 964 965 966 967 968 969 970 971 972 973
	 llstr((tmp - last_values[row]), buff));
  last_values[row] = tmp;
}


static void print_relative_row_vert(MYSQL_RES *result __attribute__((unused)),
				    MYSQL_ROW cur,
				    uint row __attribute__((unused)))
{
  uint length;
  ulonglong tmp;
  char buff[22];
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
974

bk@work.mysql.com's avatar
bk@work.mysql.com committed
975 976 977 978 979 980 981 982
  if (!row)
    putchar('|');

  tmp = cur[1] ? strtoull(cur[1], NULL, 0) : (ulonglong) 0;
  printf(" %-*s|", ex_val_max_len[row] + 1, 
	 llstr((tmp - last_values[row]), buff));

  /* Find the minimum row length needed to output the relative value */
983
  if ((length=(uint) strlen(buff) > ex_val_max_len[row]) && ex_status_printed)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052
    ex_val_max_len[row] = length;
  last_values[row] = tmp;
}


static void store_values(MYSQL_RES *result)
{
  uint i;
  MYSQL_ROW row;
  MYSQL_FIELD *field;

  field = mysql_fetch_field(result);
  max_var_length = field->max_length;
  field = mysql_fetch_field(result);
  max_val_length = field->max_length;

  for (i = 0; (row = mysql_fetch_row(result)); i++)
  {
    strmov(ex_var_names[i], row[0]);
    last_values[i]=strtoull(row[1],NULL,10);
    ex_val_max_len[i]=2;		/* Default print width for values */
  }
  ex_var_count = i;
  return;
}


static void print_relative_header()
{
  uint i;

  putchar('|');
  for (i = 0; i < ex_var_count; i++)
    printf(" %-*s|", ex_val_max_len[i] + 1, truncated_var_names[i]);
  putchar('\n');
}


static void print_relative_line()
{
  uint i;

  putchar('+');
  for (i = 0; i < ex_var_count; i++)
  {
    uint j;
    for (j = 0; j < ex_val_max_len[i] + 2; j++)
      putchar('-');
    putchar('+');
  }
  putchar('\n');
}


static void truncate_names()
{
  uint i;
  char *ptr,top_line[MAX_TRUNC_LENGTH+4+NAME_LEN+22+1],buff[22];

  ptr=top_line;
  *ptr++='+';
  ptr=strfill(ptr,max_var_length+2,'-');
  *ptr++='+';
  ptr=strfill(ptr,MAX_TRUNC_LENGTH+2,'-');
  *ptr++='+';
  ptr=strfill(ptr,max_val_length+2,'-');
  *ptr++='+';
  *ptr=0;
  puts(top_line);
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
1053

bk@work.mysql.com's avatar
bk@work.mysql.com committed
1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085
  for (i = 0 ; i < ex_var_count; i++)
  {
    uint sfx=1,j;
    printf("| %-*s|", max_var_length + 1, ex_var_names[i]);
    ptr = ex_var_names[i];
    /* Make sure no two same truncated names will become */
    for (j = 0; j < i; j++)
      if (*truncated_var_names[j] == *ptr)
	sfx++;

    truncated_var_names[i][0]= *ptr;		/* Copy first var char */
    int10_to_str(sfx, truncated_var_names[i]+1,10);
    printf(" %-*s|", MAX_TRUNC_LENGTH + 1, truncated_var_names[i]);
    printf(" %-*s|\n", max_val_length + 1, llstr(last_values[i],buff));
  }
  puts(top_line);
  return;
}


static my_bool get_pidfile(MYSQL *mysql, char *pidfile)
{
  MYSQL_RES* result;

  if (mysql_query(mysql, "SHOW VARIABLES LIKE 'pid_file'"))
  {
    my_printf_error(0,"query failed; error: '%s'",MYF(ME_BELL),
		    mysql_error(mysql));
  }
  result = mysql_store_result(mysql);
  if (result)
  {
1086 1087 1088
    MYSQL_ROW row=mysql_fetch_row(result);
    if (row)
      strmov(pidfile, row[1]);
bk@work.mysql.com's avatar
bk@work.mysql.com committed
1089
    mysql_free_result(result);
1090
    return row == 0;				/* Error if row = 0 */
bk@work.mysql.com's avatar
bk@work.mysql.com committed
1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102
  }
  return 1;					/* Error */
}


static void wait_pidfile(char *pidfile)
{
  char buff[FN_REFLEN];
  int fd;
  uint count=0;

  system_filename(buff,pidfile);
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
1103
  while ((fd = my_open(buff, O_RDONLY, MYF(0))) >= 0 &&
1104
	 count++ < opt_shutdown_timeout && !interrupted)
bk@work.mysql.com's avatar
bk@work.mysql.com committed
1105
  {
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
1106
    my_close(fd,MYF(0));
bk@work.mysql.com's avatar
bk@work.mysql.com committed
1107 1108 1109 1110
    sleep(1);
  }
  if (fd >= 0)
  {
monty@hundin.mysql.fi's avatar
monty@hundin.mysql.fi committed
1111
    my_close(fd,MYF(0));
bk@work.mysql.com's avatar
bk@work.mysql.com committed
1112 1113 1114 1115 1116
    fprintf(stderr,
	    "Warning;  Aborted waiting on pid file: '%s' after %d seconds\n",
	    buff, count-1);
  }
}