diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-24 00:36:48 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-24 00:36:48 +0300 |
| commit | 051859aaab7122ea8d012de2f269b67382646589 (patch) | |
| tree | 1e2dbf50b719f8c4181b1e860c5432f9186545f0 /include | |
| parent | 4c1bdeaf928b1274d40df91072e85a35344184c0 (diff) | |
| parent | 7032486889f42b3f18b4a0a5be6cb97b74790ea8 (diff) | |
| download | mariadb-git-051859aaab7122ea8d012de2f269b67382646589.tar.gz | |
merge
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_list.h:
Auto merged
support-files/my-huge.cnf.sh:
Added query_cache_size
support-files/my-large.cnf.sh:
Added query_cache_size
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index b6b2dfcda32..e12a7d7273b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -850,7 +850,13 @@ typedef char bool; /* Ordinary boolean values 0 1 */ ((uint32) (uchar) (A)[0]))) #define sint4korr(A) (*((long *) (A))) #define uint2korr(A) (*((uint16 *) (A))) +#ifdef HAVE_purify +#define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ + (((uint32) ((uchar) (A)[1])) << 8) +\ + (((uint32) ((uchar) (A)[2])) << 16)) +#else #define uint3korr(A) (long) (*((unsigned long *) (A)) & 0xFFFFFF) +#endif #define uint4korr(A) (*((unsigned long *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ |