bk commit into 4.0 tree (pkarthick:1.2136)

[pkarthick]

Below is the list of changes that have just been committed into a local
4.0 repository of prem. When prem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2136 05/08/22 14:55:49 pkarthick@stripped +1 -0
  NetWare specific change to prevent hangs when volume is under maintainance.

  sql/mysqld.cc
    1.525 05/08/22 14:55:27 pkarthick@stripped +2 -1
    NetWare specific change to prevent hangs when volume is under maintainance.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-4.0-17082005

--- 1.524/sql/mysqld.cc	2005-03-04 03:40:10 +05:30
+++ 1.525/sql/mysqld.cc	2005-08-22 14:55:27 +05:30
@@ -1586,7 +1586,8 @@
   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_MAINTAINANCE)
   {
     /*
       Ensure that we bring down MySQL server only for MySQL data