summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2004-11-24 15:24:23 +0100
committerunknown <joerg@mysql.com>2004-11-24 15:24:23 +0100
commit89785675397c458b7deb77f96d877ce5553b1e0a (patch)
tree33f30ef3e376348d2daed757e9be9a33c690fbb5
parentb03daf97fd7e41cb38b370f83f6a831d43497757 (diff)
downloadmariadb-git-89785675397c458b7deb77f96d877ce5553b1e0a.tar.gz
Ensure consistent sources up to 5.0 where a C++ problem occurs.
client/mysqladmin.c: Cast to overcome a C vs. C++ signature problem, occurring in 5.0 where this is a C++ file.
-rw-r--r--client/mysqladmin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 153fcdde96d..978e0c7e88b 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -554,7 +554,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)))