diff options
| author | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
| commit | be46289855f01c0d563671beb5135c22b7bad2aa (patch) | |
| tree | dc6d00358536a5dca27f806f929ab5e25a000c92 /include/my_global.h | |
| parent | e2a5c3e4cd331d9addc2342549e2c47ac7e9cb7a (diff) | |
| download | mariadb-git-be46289855f01c0d563671beb5135c22b7bad2aa.tar.gz | |
New error messages
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/my_global.h b/include/my_global.h index 40e70c521eb..a5fe99d5271 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -51,15 +51,16 @@ #endif #endif /* _WIN32... */ -/* The macros below are borrowed from include/linux/compiler.h in the - Linux kernel. Use them to indicate the likelyhood of the truthfulness - of a condition. This serves two purposes - newer versions of gcc will be - able to optimize for branch predication, which could yield siginficant - performance gains in frequently executed sections of the code, and the - other reason to use them is for documentation +/* + The macros below are borrowed from include/linux/compiler.h in the + Linux kernel. Use them to indicate the likelyhood of the truthfulness + of a condition. This serves two purposes - newer versions of gcc will be + able to optimize for branch predication, which could yield siginficant + performance gains in frequently executed sections of the code, and the + other reason to use them is for documentation */ -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 +#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) #define __builtin_expect(x, expected_value) (x) #endif |