diff options
| author | unknown <joerg@mysql.com> | 2004-11-24 15:29:35 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-11-24 15:29:35 +0100 |
| commit | dcfd4e41d9c85fa94a5ad12b8e31d5126a99a48c (patch) | |
| tree | a8a005d68595c71f2f3dae7ca2b5a56f7a4c7073 /client | |
| parent | 15edb7fc15fe78041409b3512f724913f57709d9 (diff) | |
| parent | 55ea7c8b0eb65d7834995774b1607011c0fd65f1 (diff) | |
| download | mariadb-git-dcfd4e41d9c85fa94a5ad12b8e31d5126a99a48c.tar.gz | |
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1
client/mysqladmin.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqladmin.cc | 2 |
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))) |