Commit 8bd205c8 authored by pekka@mysql.com's avatar pekka@mysql.com

ha_ndbcluster.h, ha_ndbcluster.cc:

  compile fix for gcc-2.95
parent 88f6267b
...@@ -333,11 +333,11 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, ...@@ -333,11 +333,11 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field,
- TODO allocate blob part aligned buffers - TODO allocate blob part aligned buffers
*/ */
NdbBlob::ActiveHook get_ndb_blobs_value; NdbBlob::ActiveHook g_get_ndb_blobs_value;
int get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg) int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg)
{ {
DBUG_ENTER("get_ndb_blobs_value [callback]"); DBUG_ENTER("g_get_ndb_blobs_value");
if (ndb_blob->blobsNextBlob() != NULL) if (ndb_blob->blobsNextBlob() != NULL)
DBUG_RETURN(0); DBUG_RETURN(0);
ha_ndbcluster *ha= (ha_ndbcluster *)arg; ha_ndbcluster *ha= (ha_ndbcluster *)arg;
...@@ -428,7 +428,7 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field, ...@@ -428,7 +428,7 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field,
{ {
// Set callback // Set callback
void *arg= (void *)this; void *arg= (void *)this;
DBUG_RETURN(ndb_blob->setActiveHook(::get_ndb_blobs_value, arg) != 0); DBUG_RETURN(ndb_blob->setActiveHook(g_get_ndb_blobs_value, arg) != 0);
} }
DBUG_RETURN(1); DBUG_RETURN(1);
} }
......
...@@ -184,7 +184,7 @@ class ha_ndbcluster: public handler ...@@ -184,7 +184,7 @@ class ha_ndbcluster: public handler
uint fieldnr, const byte* field_ptr); uint fieldnr, const byte* field_ptr);
int set_ndb_value(NdbOperation*, Field *field, uint fieldnr); int set_ndb_value(NdbOperation*, Field *field, uint fieldnr);
int get_ndb_value(NdbOperation*, Field *field, uint fieldnr); int get_ndb_value(NdbOperation*, Field *field, uint fieldnr);
friend int ::get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg); friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg);
int get_ndb_blobs_value(NdbBlob *last_ndb_blob); int get_ndb_blobs_value(NdbBlob *last_ndb_blob);
int set_primary_key(NdbOperation *op, const byte *key); int set_primary_key(NdbOperation *op, const byte *key);
int set_primary_key(NdbOperation *op); int set_primary_key(NdbOperation *op);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment