diff options
author | unknown <pekka@mysql.com> | 2006-02-20 12:07:12 +0100 |
---|---|---|
committer | unknown <pekka@mysql.com> | 2006-02-20 12:07:12 +0100 |
commit | 2ce03bb5baaa893febd49a35597eb027f0c6546a (patch) | |
tree | 1e0ce2ac75c5ae223d465d5701cbad4e86270365 /storage/ndb/src/ndbapi/NdbBlob.cpp | |
parent | f8ddd2b243e916f2d31826dbd74b14dc5eee7294 (diff) | |
download | mariadb-git-2ce03bb5baaa893febd49a35597eb027f0c6546a.tar.gz |
ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB
storage/ndb/src/ndbapi/NdbBlob.cpp:
DBUG
storage/ndb/include/ndbapi/Ndb.hpp:
method to set db/schema from table name + format check in internalize_table_name
storage/ndb/include/ndbapi/NdbDictionary.hpp:
method to set db/schema from table name + format check in internalize_table_name
storage/ndb/src/ndbapi/Ndb.cpp:
method to set db/schema from table name + format check in internalize_table_name
sql/ha_ndbcluster_binlog.cc:
set injector_ndb db/schema before calling NDB (may be more cases..). only place to get it is table internal name
Diffstat (limited to 'storage/ndb/src/ndbapi/NdbBlob.cpp')
-rw-r--r-- | storage/ndb/src/ndbapi/NdbBlob.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/storage/ndb/src/ndbapi/NdbBlob.cpp b/storage/ndb/src/ndbapi/NdbBlob.cpp index 695781bddb9..663d346c8ef 100644 --- a/storage/ndb/src/ndbapi/NdbBlob.cpp +++ b/storage/ndb/src/ndbapi/NdbBlob.cpp @@ -61,22 +61,26 @@ NdbBlob::setState(State newState) int NdbBlob::getBlobTableName(char* btname, Ndb* anNdb, const char* tableName, const char* columnName) { + DBUG_ENTER("NdbBlob::getBlobTableName"); NdbTableImpl* t = anNdb->theDictionary->m_impl.getTable(tableName); if (t == NULL) - return -1; + DBUG_RETURN(-1); NdbColumnImpl* c = t->getColumn(columnName); if (c == NULL) - return -1; + DBUG_RETURN(-1); getBlobTableName(btname, t, c); - return 0; + DBUG_RETURN(0); } void NdbBlob::getBlobTableName(char* btname, const NdbTableImpl* t, const NdbColumnImpl* c) { - assert(t != 0 && c != 0 && c->getBlobType()); + DBUG_ENTER("NdbBlob::getBlobTableName"); + assert(t != 0 && c != 0 && c->getBlobType() && c->getPartSize() != 0); memset(btname, 0, NdbBlobImpl::BlobTableNameSize); sprintf(btname, "NDB$BLOB_%d_%d", (int)t->m_id, (int)c->m_column_no); + DBUG_PRINT("info", ("blob table name: %s", btname)); + DBUG_VOID_RETURN; } void |