summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2006-11-30 18:25:05 +0200
committermonty@mysql.com/narttu.mysql.fi <>2006-11-30 18:25:05 +0200
commit3d4095603952aca95892d55fb1ef435132de1197 (patch)
tree66e16346c4fdfa20f915fdf53ea1f9419c07331c /strings
parent0bee93e038edf9a70ffe9d10cd93883a3288802f (diff)
downloadmariadb-git-3d4095603952aca95892d55fb1ef435132de1197.tar.gz
Fixed portability issue in my_thr_init.c (was added in my last push)
Fixed compiler warnings (detected by VC++): - Removed not used variables - Added casts - Fixed wrong assignments to bool - Fixed wrong calls with bool arguments - Added missing argument to store(longlong), which caused wrong store method to be called.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-simple.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 7484f3c0d92..fc9cbfc9d21 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -1503,7 +1503,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)),
else
{
*error= 0;
- return (ulonglong) (longlong) (long) -ul;
+ return (ulonglong) (longlong) -(long) ul;
}
}
else
@@ -1654,7 +1654,7 @@ ret_sign:
return (ulonglong) LONGLONG_MIN;
}
*error= 0;
- return (ulonglong) -ull;
+ return (ulonglong) -(longlong) ull;
}
else
{