diff options
| author | unknown <joerg@mysql.com> | 2004-11-24 17:32:11 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-11-24 17:32:11 +0100 |
| commit | a806cba3e34415c7a54b69b0c622de57f698b146 (patch) | |
| tree | fc7b1c2ed0d1ea983b8a02b9c330f830c9300b73 /client/mysqladmin.cc | |
| parent | 3392e3178a9dbf656cc8dceda760f08a73542704 (diff) | |
| parent | 55ea7c8b0eb65d7834995774b1607011c0fd65f1 (diff) | |
| download | mariadb-git-a806cba3e34415c7a54b69b0c622de57f698b146.tar.gz | |
Merge from 4.0 for immediate use in the current 5.0 builds.
client/mysqladmin.cc:
Auto merged
Build-tools/Do-compile:
Merged the default "--force" for the call to 'mysql-test-run' from 4.0, for immediate use in the current 5.0 builds.
Diffstat (limited to 'client/mysqladmin.cc')
| -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))) |