bzr push into mysql-5.1 branch (jonas:3040 to 3041)

[Jonas Oreland]

 3041 Jonas Oreland	2008-11-06
      ndb - Fix printout in locktocpu on solaris
modified:
  storage/ndb/src/kernel/vm/Configuration.cpp

 3040 Jonas Oreland	2008-11-05 [merge]
      merge 63 to 64
modified:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp

=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2008-10-29 17:02:11 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2008-11-06 08:08:28 +0000
@@ -1099,7 +1099,7 @@ Configuration::setLockCPU(NDB_TID_TYPE t
       cpu_id != NO_LOCK_CPU)
   {
     int error_no;
-    ndbout << "Lock threadId = " << threadId;
+    ndbout << "Lock threadId = " << (unsigned)threadId;
     ndbout << " to CPU id = " << cpu_id << endl;
     if ((error_no = NdbThread_LockCPU(threadId, cpu_id)))
     {