bzr commit into mysql-5.1 branch (stewart:2967)

[Stewart Smith]

#At file:///C:/cygwin/home/stewart/mysql/win-ndbwin32/

 2967 Stewart Smith	2008-10-09
       warnings: empty conditional block (without debug, TRACENR macro), use explicit uint32 cast when 1xuint64 -> 2xuint32
modified:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-10-02 21:58:44 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-10-08 14:01:16 +0000
@@ -163,7 +163,7 @@ static int TRACENR_FLAG = 0;
 #define CLEAR_TRACENR_FLAG TRACENR_FLAG = 0
 #else
 #define TRACENR_FLAG 0
-#define TRACENR(x)
+#define TRACENR(x) do { } while(0)
 #define SET_TRACENR_FLAG
 #define CLEAR_TRACENR_FLAG
 #endif
@@ -14031,8 +14031,8 @@ void Dblqh::openFileRw(Signal* signal, L
   req->auto_sync_size = MAX_REDO_PAGES_WITHOUT_SYNCH * sizeof(LogPageRecord);
   Uint64 sz = clogFileSize;
   sz *= 1024; sz *= 1024;
-  req->file_size_hi = sz >> 32;
-  req->file_size_lo = sz & 0xFFFFFFFF;
+  req->file_size_hi = (Uint32)(sz >> 32);
+  req->file_size_lo = (Uint32)(sz & 0xFFFFFFFF);
   sendSignal(NDBFS_REF, GSN_FSOPENREQ, signal, FsOpenReq::SignalLength, JBA);
 }//Dblqh::openFileRw()
 
@@ -14095,8 +14095,8 @@ void Dblqh::openNextLogfile(Signal* sign
     req->auto_sync_size = MAX_REDO_PAGES_WITHOUT_SYNCH * sizeof(LogPageRecord);
     Uint64 sz = clogFileSize;
     sz *= 1024; sz *= 1024;
-    req->file_size_hi = sz >> 32;
-    req->file_size_lo = sz & 0xFFFFFFFF;
+    req->file_size_hi = (Uint32)(sz >> 32);
+    req->file_size_lo = (Uint32)(sz & 0xFFFFFFFF);
     sendSignal(NDBFS_REF, GSN_FSOPENREQ, signal, FsOpenReq::SignalLength, JBA);
   }//if
 }//Dblqh::openNextLogfile()