diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-13 18:58:26 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-13 18:58:26 +0300 |
| commit | dc1e55f8194db83e7a40dea5bf49e9fef970826c (patch) | |
| tree | b0c44d624533c05fb3586c52901c5d00fe1f3186 /include | |
| parent | 4ccf66df87bfe9290d686e7abd585d3ffe1c1370 (diff) | |
| download | mariadb-git-dc1e55f8194db83e7a40dea5bf49e9fef970826c.tar.gz | |
Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
include/my_global.h:
Fix for QNX
mysql-test/r/union.result:
new test case
mysql-test/t/union.test:
Test of bug in union and left join
mysys/my_seek.c:
Safety fix to find out when pos gets a wrong value
sql/field.h:
Fix for UNION and LEFT JOIN
sql/mysql_priv.h:
Fix for UNION and LEFT JOIN
sql/sql_base.cc:
Fix for UNION and LEFT JOIN
sql/sql_insert.cc:
Fix for UNION and LEFT JOIN
sql/sql_parse.cc:
Fixed wrong logging of Access denied error
sql/sql_union.cc:
Fix for UNION and LEFT JOIN
sql/sql_update.cc:
Fix for UNION and LEFT JOIN
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 |
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 */ |