diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-23 16:47:08 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-23 16:47:08 +0300 |
| commit | 832638929320aa3ebd5b2fefe75eba6f2413f1b6 (patch) | |
| tree | dabaf9b38c2c72433e000b36b0a628d9d36fbb38 /include | |
| parent | dba6991085bfeef3e0d9388ef65369fde38cbb7a (diff) | |
| download | mariadb-git-832638929320aa3ebd5b2fefe75eba6f2413f1b6.tar.gz | |
Several fixes revelaled by Intel compiler.
cmd-line-utils/readline/complete.c:
Added a cast.
dbug/my_main.c:
Added an include to avoid implicit declaration of
my_thread_global_init()
include/my_global.h:
undef cannot be used on this predefined name.
Since it is a custom fix for gcc 2.8.0, let's make it only
effective in that case.
include/my_sys.h:
Added a new type, TYPE_NOT_SET.
myisam/ft_boolean_search.c:
Added casts.
myisam/mi_key.c:
Added cast.
myisam/mi_open.c:
Added cast.
Changed function types.
myisam/mi_test1.c:
Added cast.
myisam/myisamchk.c:
Added cast.
myisam/myisamdef.h:
Changed function type.
myisam/myisampack.c:
Added casts.
myisam/sp_key.c:
Added cast.
mysys/mf_iocache.c:
Fixed invalid use of 0 to info->type. According to comment it
should not have been set, but in earlier code by setting it
to 0 would have been same as setting it to READ_CACHE. This
probably was not desired, potential bug.
server-tools/instance-manager/instance_options.cc:
Fixed a typo.
server-tools/instance-manager/protocol.cc:
Changed enum to int.
Changed char to uchar.
Added casts.
sql/mysql_priv.h:
Bit overflow.
sql/sql_base.cc:
Removed unused label. The code below label was unused too, because
there is a return just before.
sql/sql_parse.cc:
Removed unneccessary extra argument.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 48dd165dba1..b32a8fe6baa 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -238,7 +238,7 @@ C_MODE_END /* Fix a bug in gcc 2.8.0 on IRIX 6.2 */ -#if SIZEOF_LONG == 4 && defined(__LONG_MAX__) +#if SIZEOF_LONG == 4 && defined(__LONG_MAX__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 8) #undef __LONG_MAX__ /* Is a longlong value in gcc 2.8.0 ??? */ #define __LONG_MAX__ 2147483647 #endif diff --git a/include/my_sys.h b/include/my_sys.h index e21af78fcaa..ad42c99a86e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -280,7 +280,7 @@ enum loglevel { enum cache_type { - READ_CACHE,WRITE_CACHE, + TYPE_NOT_SET, READ_CACHE, WRITE_CACHE, SEQ_READ_APPEND /* sequential read or append */, READ_FIFO, READ_NET,WRITE_NET}; |