ndbinfo

blaudden · blaudden · commit 3cd1864016f5 · 2010-01-19T18:36:28.000+01:00
- add new function on NdbInfoRecAttr that allows direct access
   to the data pointer and use it from ha_ndbinfo
diff --git a/sql/ha_ndbinfo.cc b/sql/ha_ndbinfo.cc
@@ -377,17 +377,13 @@ ha_ndbinfo::unpack_record(uchar *dst_row)
 
       case (MYSQL_TYPE_LONG):
       {
-        Uint32 val = record->u_32_value();
-        DBUG_PRINT("info", ("val: %d", val));
-        memcpy(field->ptr, &val, sizeof (Uint32));
+        memcpy(field->ptr, record->ptr(), sizeof(Uint32));
         break;
       }
 
       case (MYSQL_TYPE_LONGLONG):
       {
-        Uint64 val = record->u_64_value();
-        DBUG_PRINT("info", ("val: %llu", val));
-        memcpy(field->ptr, &val, sizeof (Uint64));
+        memcpy(field->ptr, record->ptr(), sizeof(Uint64));
         break;
       }
 
diff --git a/storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp b/storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp
@@ -21,6 +21,10 @@
 
 class NdbInfoRecAttr {
 public:
+  const void* ptr() const {
+    return m_data;
+  }
+
   Uint32 u_32_value() const {
     assert(m_len == sizeof(Uint32));
     return *((Uint32 *) m_data);

Original file line number	Diff line number	Diff line change
`@@ -377,17 +377,13 @@ ha_ndbinfo::unpack_record(uchar *dst_row)`
`377`	`377`
`378`	`378`	`case (MYSQL_TYPE_LONG):`
`379`	`379`	`{`
`380`		`- Uint32 val = record->u_32_value();`
`381`		`- DBUG_PRINT("info", ("val: %d", val));`
`382`		`- memcpy(field->ptr, &val, sizeof (Uint32));`
	`380`	`+ memcpy(field->ptr, record->ptr(), sizeof(Uint32));`
`383`	`381`	`break;`
`384`	`382`	`}`
`385`	`383`
`386`	`384`	`case (MYSQL_TYPE_LONGLONG):`
`387`	`385`	`{`
`388`		`- Uint64 val = record->u_64_value();`
`389`		`- DBUG_PRINT("info", ("val: %llu", val));`
`390`		`- memcpy(field->ptr, &val, sizeof (Uint64));`
	`386`	`+ memcpy(field->ptr, record->ptr(), sizeof(Uint64));`
`391`	`387`	`break;`
`392`	`388`	`}`
`393`	`389`