bk commit into 5.1 tree (jonas:1.2270) BUG#21172

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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@stripped, 2006-08-15 07:52:27+02:00, jonas@stripped +2 -0
  ndb - bug#21172
    Fix build failure if O_DIRECT is not defined
    Fix stack overflow by making odirect_readbuf global
    Remove soem old debug variables

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@stripped, 2006-08-15 07:52:25+02:00,
jonas@stripped +5 -6
    Fix build failure if O_DIRECT is not defined
    Fix stack overflow by making odirect_readbuf global
    Remove soem old debug variables

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp@stripped, 2006-08-15 07:52:25+02:00,
jonas@stripped +0 -17
    Fix build failure if O_DIRECT is not defined
    Fix stack overflow by making odirect_readbuf global
    Remove soem old debug variables

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.34/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2006-08-15 07:52:32 +02:00
+++ 1.35/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2006-08-15 07:52:32 +02:00
@@ -244,9 +244,9 @@
   }//while
 }//AsyncFile::run()
 
-extern bool Global_useO_SYNC;
-extern bool Global_unlinkO_CREAT;
-extern Uint32 Global_syncFreq;
+#ifdef O_DIRECT
+static char g_odirect_readbuf[2*GLOBAL_PAGE_SIZE -1];
+#endif
 
 void AsyncFile::openReq(Request* request)
 {  
@@ -346,7 +346,7 @@
   }
 #elif defined O_SYNC
   {
-    flags |= OM_SYNC;
+    flags |= FsOpenReq::OM_SYNC;
   }
 #endif
   
@@ -523,8 +523,7 @@
 #ifdef O_DIRECT
     do {
       int ret;
-      char buf[2*GLOBAL_PAGE_SIZE -1];
-      char * bufptr = (char*)((UintPtr(buf)+(GLOBAL_PAGE_SIZE - 1)) &
~(GLOBAL_PAGE_SIZE - 1));
+      char * bufptr = (char*)((UintPtr(g_odirect_readbuf)+(GLOBAL_PAGE_SIZE - 1)) &
~(GLOBAL_PAGE_SIZE - 1));
       while (((ret = ::read(theFd, bufptr, GLOBAL_PAGE_SIZE)) == -1) && (errno ==
EINTR));
       if (ret == -1)
       {

--- 1.28/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2006-08-15 07:52:32 +02:00
+++ 1.29/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2006-08-15 07:52:32 +02:00
@@ -1062,27 +1062,10 @@
    return;
 }
 
-bool Global_useO_SYNC = true;
-bool Global_unlinkO_CREAT = false;
-Uint32 Global_syncFreq = 1024 * 1024;
-
 void
 Ndbfs::execDUMP_STATE_ORD(Signal* signal)
 {
   if(signal->theData[0] == 19){
-    if(signal->length() > 1){
-      Global_useO_SYNC = signal->theData[1];
-    }
-    if(signal->length() > 2){
-      Global_syncFreq = signal->theData[2] * 1024 * 1024;
-    }
-    if(signal->length() > 3){
-      Global_unlinkO_CREAT = signal->theData[3];
-    }
-    ndbout_c("useO_SYNC = %d syncFreq = %d unlinkO_CREATE = %d",
-	     Global_useO_SYNC,
-	     Global_syncFreq,
-	     Global_unlinkO_CREAT);
     return;
   }
   if(signal->theData[0] == DumpStateOrd::NdbfsDumpFileStat){