summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-05-13 18:58:26 +0300
committermonty@narttu.mysql.fi <>2003-05-13 18:58:26 +0300
commit13530887cb09194adbe89d65277c59ffb71fdd15 (patch)
treeb0c44d624533c05fb3586c52901c5d00fe1f3186 /include
parentaa9bc9d0a031cd7bff7ffcff54049717787441f8 (diff)
downloadmariadb-git-13530887cb09194adbe89d65277c59ffb71fdd15.tar.gz
Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 98034fc1cff..0cd1352a290 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -361,7 +361,7 @@ typedef unsigned short ushort;
#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))
#define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0])))
#ifndef HAVE_RINT
-#define rint(A) floor((A)+0.5)
+#define rint(A) floor((A)+((A) < 0) -0.5 : 0.5)
#endif
/* Define some general constants */