diff options
| author | unknown <ingo@mysql.com> | 2004-07-29 13:15:25 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2004-07-29 13:15:25 +0200 |
| commit | 3f4e7a910d0355e0305ac37bf4707c83d5bb3aed (patch) | |
| tree | 2fe097d8bf9e4d3de157ce7f49bb21a7d446ff57 /sql | |
| parent | 96d0e46bcb6bddac6235d7083153eaf1980b5cc2 (diff) | |
| parent | 9778a2c98d7a99310dbe5c52cb924b9e1718c76d (diff) | |
| download | mariadb-git-3f4e7a910d0355e0305ac37bf4707c83d5bb3aed.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 8 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index ec8bd035c83..2c966aab73a 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -333,11 +333,11 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, - 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) DBUG_RETURN(0); ha_ndbcluster *ha= (ha_ndbcluster *)arg; @@ -428,7 +428,7 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field, { // Set callback 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); } diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index bd8d78ec00b..31dd9a52331 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -184,7 +184,7 @@ class ha_ndbcluster: public handler uint fieldnr, const byte* field_ptr); int set_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 set_primary_key(NdbOperation *op, const byte *key); int set_primary_key(NdbOperation *op); |