mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
ndb - bug#25001
make sure DISK flag is set on DATA column for blob table storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: maek sure DISK flag is set on DATA column fro blob table storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: maek sure DISK flag is set on DATA column fro blob table
This commit is contained in:
parent
bbb256769a
commit
5a6e23bcfa
2 changed files with 7 additions and 3 deletions
|
@ -2302,7 +2302,7 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
|
|||
}
|
||||
|
||||
// blob tables - use "t2" to get values set by kernel
|
||||
if (t2->m_noOfBlobs != 0 && createBlobTables(*t2) != 0) {
|
||||
if (t2->m_noOfBlobs != 0 && createBlobTables(t, *t2) != 0) {
|
||||
int save_code = m_error.code;
|
||||
(void)dropTableGlobal(*t2);
|
||||
m_error.code = save_code;
|
||||
|
@ -2316,7 +2316,7 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
|
|||
}
|
||||
|
||||
int
|
||||
NdbDictionaryImpl::createBlobTables(NdbTableImpl &t)
|
||||
NdbDictionaryImpl::createBlobTables(NdbTableImpl& orig, NdbTableImpl &t)
|
||||
{
|
||||
DBUG_ENTER("NdbDictionaryImpl::createBlobTables");
|
||||
for (unsigned i = 0; i < t.m_columns.size(); i++) {
|
||||
|
@ -2325,6 +2325,10 @@ NdbDictionaryImpl::createBlobTables(NdbTableImpl &t)
|
|||
continue;
|
||||
NdbTableImpl bt;
|
||||
NdbBlob::getBlobTable(bt, &t, &c);
|
||||
NdbDictionary::Column::StorageType
|
||||
d = NdbDictionary::Column::StorageTypeDisk;
|
||||
if (orig.m_columns[i]->getStorageType() == d)
|
||||
bt.getColumn("DATA")->setStorageType(d);
|
||||
if (createTable(bt) != 0) {
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
|
|
|
@ -582,7 +582,7 @@ public:
|
|||
bool setTransporter(class TransporterFacade * tf);
|
||||
|
||||
int createTable(NdbTableImpl &t);
|
||||
int createBlobTables(NdbTableImpl& t);
|
||||
int createBlobTables(NdbTableImpl& org, NdbTableImpl& created);
|
||||
int alterTable(NdbTableImpl &t);
|
||||
int dropTable(const char * name);
|
||||
int dropTable(NdbTableImpl &);
|
||||
|
|
Loading…
Reference in a new issue