diff options
| author | unknown <joreland@mysql.com> | 2005-01-19 07:34:57 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-19 07:34:57 +0100 |
| commit | bfe74e69903583f1bb9b4ad803c137d6487afa74 (patch) | |
| tree | dc47234a96dff449dbaa9b7cb44976c9d564da35 /sql/ha_ndbcluster.cc | |
| parent | a8e5250060a5703cd01c3940abf244eab7669893 (diff) | |
| parent | 153160d1ffd9d118867c3e5c41474f435e5c981f (diff) | |
| download | mariadb-git-bfe74e69903583f1bb9b4ad803c137d6487afa74.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index aa39af5176e..a6f7630321b 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -616,7 +616,7 @@ int ha_ndbcluster::get_ndb_blobs_value(NdbBlob *last_ndb_blob) char *buf= m_blobs_buffer + offset; uint32 len= 0xffffffff; // Max uint32 DBUG_PRINT("value", ("read blob ptr=%x len=%u", - (uint)buf, (uint)blob_len)); + (UintPtr)buf, (uint)blob_len)); if (ndb_blob->readData(buf, len) != 0) DBUG_RETURN(-1); DBUG_ASSERT(len == blob_len); @@ -3222,7 +3222,7 @@ int ha_ndbcluster::start_stmt(THD *thd) #if 0 NdbTransaction *tablock_trans= (NdbTransaction*)thd->transaction.all.ndb_tid; - DBUG_PRINT("info", ("tablock_trans: %x", (uint)tablock_trans)); + DBUG_PRINT("info", ("tablock_trans: %x", (UintPtr)tablock_trans)); DBUG_ASSERT(tablock_trans); // trans= ndb->hupp(tablock_trans); #endif |