diff options
| author | monty@hundin.mysql.fi <> | 2001-12-17 15:00:14 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-12-17 15:00:14 +0200 |
| commit | 1904d7a88d977047c513f81ed36f2070a493de37 (patch) | |
| tree | 7f95675b3decc36faca63e90ee99ac223133c290 /mysys | |
| parent | 7d6e8ee7b4d93120283b4a1138a8b9ecbf0f5b2a (diff) | |
| download | mariadb-git-1904d7a88d977047c513f81ed36f2070a493de37.tar.gz | |
Portability fixes
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_static.c | 7 | ||||
| -rw-r--r-- | mysys/raid.cc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index 61c719bcb81..1eb6220f185 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -82,6 +82,13 @@ struct remember *pRememberRoot = NULL; int volatile my_have_got_alarm=0; /* declare variable to reset */ ulong my_time_to_wait_for_lock=2; /* In seconds */ + /* + We need to have this define here as otherwise linking will fail + on OSF1 when compiling --without-raid --with-debug + */ + +const char *raid_type_string[]={"none","striped"}; + /* from errors.c */ #ifdef SHARED_LIBRARY char * NEAR globerrs[GLOBERRS]; /* my_error_messages is here */ diff --git a/mysys/raid.cc b/mysys/raid.cc index 9809086a622..72d3b2074be 100644 --- a/mysys/raid.cc +++ b/mysys/raid.cc @@ -79,8 +79,6 @@ #include <m_string.h> #include <assert.h> -const char *raid_type_string[]={"none","striped"}; - #if defined(USE_RAID) && !defined(MYSQL_CLIENT) #define RAID_SEEK_DONE ~(off_t) 0 |