Commit dcfd4e41 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1 


client/mysqladmin.cc:
  Auto merged
parents 15edb7fc 55ea7c8b

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      {

	char *pos,buff[40];

	ulong sec;

	pos=strchr(status,' ');

	pos= (char*) strchr(status,' ');

	*pos++=0;

	printf("%s\t\t\t",status);			/* print label */

	if ((status=str2int(pos,10,0,LONG_MAX,(long*) &sec)))