summaryrefslogtreecommitdiff
path: root/mysys/my_static.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-17 15:00:14 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-17 15:00:14 +0200
commit1af1c70d711d1934dad41cec1d5dc55c4fdb4d71 (patch)
tree7f95675b3decc36faca63e90ee99ac223133c290 /mysys/my_static.c
parent640bd5699ca01d1ab7408759f413d95085b204ae (diff)
downloadmariadb-git-1af1c70d711d1934dad41cec1d5dc55c4fdb4d71.tar.gz
Portability fixes
include/my_pthread.h: Fix for HPUX mysql-test/mysql-test-run.sh: Wait for socket instead of pid file mysys/my_static.c: Portability fix (for OSF1) mysys/raid.cc: Portability fix (for OSF1) sql/mysqld.cc: Fixed typo for FreeBSD. strings/bcmp.c: Fix for purify
Diffstat (limited to 'mysys/my_static.c')
-rw-r--r--mysys/my_static.c7
1 files changed, 7 insertions, 0 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 */