bzr commit into mysql-5.1-telco-7.0 branch (jonas:3806)

[Jonas Oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 3806 Jonas Oreland	2010-09-30
      ndb - fix incorrect include and a compiler warning

    modified:
      storage/ndb/src/ndbapi/API.hpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
=== modified file 'storage/ndb/src/ndbapi/API.hpp'
--- a/storage/ndb/src/ndbapi/API.hpp	2010-09-29 13:25:19 +0000
+++ b/storage/ndb/src/ndbapi/API.hpp	2010-09-30 07:19:22 +0000
@@ -44,6 +44,6 @@
 #include <NdbInterpretedCode.hpp>
 
 #include <NdbEventOperation.hpp>
-#include <NdbEventOperationImpl.hpp>
+#include "NdbEventOperationImpl.hpp"
 
 #endif

=== modified file 'storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2010-09-29 13:25:19 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2010-09-30 07:19:22 +0000
@@ -7912,7 +7912,8 @@ NdbDictInterface::create_hashmap(const N
                                  Uint32 flags)
 {
   DictHashMapInfo::HashMap hm; hm.init();
-  BaseString::snprintf(hm.HashMapName, sizeof(hm.HashMapName), src.getName());
+  BaseString::snprintf(hm.HashMapName, sizeof(hm.HashMapName), 
+                       "%s", src.getName());
   hm.HashMapBuckets = src.getMapLen();
   for (Uint32 i = 0; i<hm.HashMapBuckets; i++)
   {


Attachment: [text/bzr-bundle] bzr/[e-mail]