summaryrefslogtreecommitdiff
path: root/client/mysqladmin.cc
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2004-11-24 15:29:35 +0100
committerjoerg@mysql.com <>2004-11-24 15:29:35 +0100
commitc356b37b0c3f05c62efaaef325da4f532f8f5136 (patch)
treea8a005d68595c71f2f3dae7ca2b5a56f7a4c7073 /client/mysqladmin.cc
parent003b28d04fa605c4aff9400452b6c64949ea8389 (diff)
parentcf722bc3f5040d447f657477485e362b967d1f3e (diff)
downloadmariadb-git-c356b37b0c3f05c62efaaef325da4f532f8f5136.tar.gz
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1
Diffstat (limited to 'client/mysqladmin.cc')
-rw-r--r--client/mysqladmin.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index eec0dcb90fe..8491d0df7b5 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -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)))