bzr push into mysql-5.1-telco-7.0 branch (jonas:4389 to 4390)

[jonas oreland]

 4390 jonas oreland	2011-05-18
      ndb - fix compiler warning

    modified:
      storage/ndb/test/ndbapi/testRestartGci.cpp
 4389 Frazer Clement	2011-05-18
      WL5353 Reflecting GCI
      
      Add NDB$ROW_GCI64 and NDB$ROW_AUTHOR optional pseudo columns.
      
      These pseudo columns are only present if requested at table creation time.
      Both are variable width - 1 to 31 bits.
      
      Pseudo column NDB$ROW_GCI64 gives access to a higher resolution row GCI/epoch
      value.  The number of bits used controls the resolution of the low-word of
      the GCI.  Where the bits are insufficient for an actual epoch, reading the 
      column returns a saturated value in the low-word, and the normal ROW_GCI value
      in the high-word.
      
      Pseudo column NDB$ROW_AUTHOR is automatically set to 0 on INSERT, UPDATE, WRITE
      operations.  It can be explicitly set to some other value.  The intention
      is to allow the identity of the last user/application to write to a row to be
      determined.
      
      ndb_desc is enhanced to indicate the number of bits used for each optional
      pseudo column in a table.
      
      ndb_select_all is enhanced to enable the value of these columns to be
      output.

    modified:
      mysql-test/suite/ndb/r/ndb_native_default_support.result
      storage/ndb/include/kernel/AttributeHeader.hpp
      storage/ndb/include/kernel/signaldata/CreateTab.hpp
      storage/ndb/include/kernel/signaldata/CreateTable.hpp
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
      storage/ndb/include/ndb_version.h.in
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
      storage/ndb/src/kernel/vm/LongSignal.cpp
      storage/ndb/src/kernel/vm/LongSignalImpl.hpp
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/test/ndbapi/testRestartGci.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/src/NDBT_Table.cpp
      storage/ndb/tools/select_all.cpp
=== modified file 'storage/ndb/test/ndbapi/testRestartGci.cpp'
--- a/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-05-17 23:29:55 +0000
+++ b/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-05-18 05:25:47 +0000
@@ -564,7 +564,7 @@ int runUpdateVerifyGCI(NDBT_Context* ctx
 
     /* First check the data is as expected */
     CHECK(hugoCalc.verifyRowValues(&hugoOps.get_row(0)) == 0);
-    CHECK(hugoCalc.getUpdatesValue(&hugoOps.get_row(0)) == loopCount);
+    CHECK((Uint64)hugoCalc.getUpdatesValue(&hugoOps.get_row(0)) == loopCount);
     //ndbout_c("Updates value is %u", hugoCalc.getUpdatesValue(&hugoOps.get_row(0)));
 
     Uint64 committedGCI;

No bundle (reason: useless for push emails).