correction of manual merge

71ec671d · tomas@whalegate.ndb.mysql.com · d4982247 · 71ec671d
Commit 71ec671d authored Mar 26, 2007 by tomas@whalegate.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +8 -8

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3159,15 +3159,15 @@ void ndb_unpack_record(TABLE *table, NdbValue *value,
 #ifdef WORDS_BIGENDIAN
            /* lsw is stored first */
            Uint32 *buf= (Uint32 *)(*value).rec->aRef();
-            ((Field_bit *) *field)->store((((longlong)*buf)
-                                           & 0x000000000FFFFFFFF)
-                                          |
-                                          ((((longlong)*(buf+1)) << 32)
-                                           & 0xFFFFFFFF00000000),
-                                          TRUE);
+            field_bit->Field_bit::store((((longlong)*buf)
+                                         & 0x000000000FFFFFFFF)
+                                        |
+                                        ((((longlong)*(buf+1)) << 32)
+                                         & 0xFFFFFFFF00000000),
+                                        TRUE);
 #else
-            ((Field_bit *) *field)->store((longlong)
-                                          (*value).rec->u_64_value(), TRUE);
+            field_bit->Field_bit::store((longlong)
+                                        (*value).rec->u_64_value(), TRUE);
 #endif
          }
          /*