summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2005-02-08 19:49:40 +0200
committerunknown <jani@ua141d10.elisa.omakaista.fi>2005-02-08 19:49:40 +0200
commitffe417fddeb68274166153a357d9d534675d1823 (patch)
tree4338fea9b6b3d68a483f4423cc725a68305a2900 /sql/mysqld.cc
parent30e89d0a48a7bf875b485f8b5987a5ef1bc4bf56 (diff)
downloadmariadb-git-ffe417fddeb68274166153a357d9d534675d1823.tar.gz
Applied a patch for Netware.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 503fb5bfb99..53dca59bc92 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -147,6 +147,10 @@ int deny_severity = LOG_WARNING;
#include <sys/mman.h>
#endif
+#define zVOLSTATE_ACTIVE 6
+#define zVOLSTATE_DEACTIVE 2
+#define zVOLSTATE_MAINTENANCE 3
+
#ifdef __NETWARE__
#include <nks/vm.h>
#include <library.h>
@@ -1667,7 +1671,9 @@ ulong neb_event_callback(struct EventBlock *eblock)
voldata= (EventChangeVolStateEnter_s *)eblock->EBEventData;
/* Deactivation of a volume */
- if ((voldata->oldState == 6 && voldata->newState == 2))
+ if ((voldata->oldState == zVOLSTATE_ACTIVE &&
+ voldata->newState == zVOLSTATE_DEACTIVE ||
+ voldata->newState == zVOLSTATE_MAINTENANCE))
{
/*
Ensure that we bring down MySQL server only for MySQL data