mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

Browse source 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
This commit is contained in:
lars@mysql.com 2006-02-07 12:16:26 +01:00
commit b819e8e07d
2 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
sql/ha_ndbcluster.cc
View file

@ -9618,13 +9618,16 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond)
NdbDictionary::Dictionary* dict= ndb->getDictionary(); NdbDictionary::Dictionary* dict= ndb->getDictionary();
NdbDictionary::Dictionary::List dflist; NdbDictionary::Dictionary::List dflist;
NdbError ndberr; NdbError ndberr;
unsigned i;
DBUG_ENTER("ndbcluster_fill_files_table");
dict->listObjects(dflist, NdbDictionary::Object::Datafile); dict->listObjects(dflist, NdbDictionary::Object::Datafile);
ndberr= dict->getNdbError(); ndberr= dict->getNdbError();
if (ndberr.classification != ndberror_cl_none) if (ndberr.classification != NdbError::NoError)
return 0; ERR_RETURN(ndberr);
for (unsigned i= 0; i < dflist.count; i++) for (i= 0; i < dflist.count; i++)
{ {
NdbDictionary::Dictionary::List::Element& elt = dflist.elements[i]; NdbDictionary::Dictionary::List::Element& elt = dflist.elements[i];
Ndb_cluster_connection_node_iter iter; Ndb_cluster_connection_node_iter iter;
@ -9632,16 +9635,24 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond)
g_ndb_cluster_connection->init_get_next_node(iter); g_ndb_cluster_connection->init_get_next_node(iter);
while (id= g_ndb_cluster_connection->get_next_node(iter)) while ((id= g_ndb_cluster_connection->get_next_node(iter)))
{ {
NdbDictionary::Datafile df= dict->getDatafile(id, elt.name); NdbDictionary::Datafile df= dict->getDatafile(id, elt.name);
ndberr= dict->getNdbError(); ndberr= dict->getNdbError();
if(ndberr.classification != ndberror_cl_none) if(ndberr.classification != NdbError::NoError)
continue; {
if (ndberr.classification == NdbError::SchemaError)
continue;
ERR_RETURN(ndberr);
}
NdbDictionary::Tablespace ts= dict->getTablespace(df.getTablespace()); NdbDictionary::Tablespace ts= dict->getTablespace(df.getTablespace());
ndberr= dict->getNdbError(); ndberr= dict->getNdbError();
if (ndberr.classification != ndberror_cl_none) if (ndberr.classification != NdbError::NoError)
continue; {
if (ndberr.classification == NdbError::SchemaError)
continue;
ERR_RETURN(ndberr);
}
int c= 0; int c= 0;
table->field[c++]->set_null(); // FILE_ID table->field[c++]->set_null(); // FILE_ID
@ -9706,10 +9717,10 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond)
dict->listObjects(dflist, NdbDictionary::Object::Undofile); dict->listObjects(dflist, NdbDictionary::Object::Undofile);
ndberr= dict->getNdbError(); ndberr= dict->getNdbError();
if (ndberr.classification != ndberror_cl_none) if (ndberr.classification != NdbError::NoError)
return 0; ERR_RETURN(ndberr);
for (unsigned i= 0; i < dflist.count; i++) for (i= 0; i < dflist.count; i++)
{ {
NdbDictionary::Dictionary::List::Element& elt= dflist.elements[i]; NdbDictionary::Dictionary::List::Element& elt= dflist.elements[i];
Ndb_cluster_connection_node_iter iter; Ndb_cluster_connection_node_iter iter;
@ -9717,17 +9728,25 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond)
g_ndb_cluster_connection->init_get_next_node(iter); g_ndb_cluster_connection->init_get_next_node(iter);
while (id= g_ndb_cluster_connection->get_next_node(iter)) while ((id= g_ndb_cluster_connection->get_next_node(iter)))
{ {
NdbDictionary::Undofile uf= dict->getUndofile(id, elt.name); NdbDictionary::Undofile uf= dict->getUndofile(id, elt.name);
ndberr= dict->getNdbError(); ndberr= dict->getNdbError();
if (ndberr.classification != ndberror_cl_none) if (ndberr.classification != NdbError::NoError)
continue; {
if (ndberr.classification == NdbError::SchemaError)
continue;
ERR_RETURN(ndberr);
}
NdbDictionary::LogfileGroup lfg= NdbDictionary::LogfileGroup lfg=
dict->getLogfileGroup(uf.getLogfileGroup()); dict->getLogfileGroup(uf.getLogfileGroup());
ndberr= dict->getNdbError(); ndberr= dict->getNdbError();
if (ndberr.classification != ndberror_cl_none) if (ndberr.classification != NdbError::NoError)
continue; {
if (ndberr.classification == NdbError::SchemaError)
continue;
ERR_RETURN(ndberr);
}
int c= 0; int c= 0;
table->field[c++]->set_null(); // FILE_ID table->field[c++]->set_null(); // FILE_ID
@ -9788,5 +9807,5 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond)
schema_table_store_record(thd, table); schema_table_store_record(thd, table);
} }
} }
return 0; DBUG_RETURN(0);
} }

5
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
View file

@ -1114,9 +1114,12 @@ Dbtup::prepare_initial_insert(KeyReqStruct *req_struct,
ptr= ALIGN_WORD(dst->m_data_ptr+regTabPtr->m_offsets[MM].m_max_var_offset); ptr= ALIGN_WORD(dst->m_data_ptr+regTabPtr->m_offsets[MM].m_max_var_offset);
order += regTabPtr->m_attributes[MM].m_no_of_fixsize; order += regTabPtr->m_attributes[MM].m_no_of_fixsize;
Uint32 pos= 0; Uint32 pos= 0;
Uint16 *pos_ptr = req_struct->var_pos_array;
Uint16 *len_ptr = pos_ptr + cnt1;
for(Uint32 i= 0; i<cnt1; i++) for(Uint32 i= 0; i<cnt1; i++)
{ {
dst->m_offset_array_ptr[i]= pos; * pos_ptr++ = pos;
* len_ptr++ = pos;
pos += AttributeDescriptor::getSizeInBytes(tab_descr[*order++].tabDescr); pos += AttributeDescriptor::getSizeInBytes(tab_descr[*order++].tabDescr);
} }
} }