Commit cee179c1 authored by unknown's avatar unknown
Browse files

correction of merge

parent 4b1ff907

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6140,7 +6140,7 @@ void Dbdict::handleTabInfoInit(SimpleProperties::Reader & it, 
  tablePtr.p->minRowsHigh = c_tableDesc.MinRowsHigh;

  tablePtr.p->defaultNoPartFlag = c_tableDesc.DefaultNoPartFlag; 

  tablePtr.p->linearHashFlag = c_tableDesc.LinearHashFlag; 

  tablePtr.p->singleUserMode = tableDesc.SingleUserMode;

  tablePtr.p->singleUserMode = c_tableDesc.SingleUserMode;

  

  Uint64 maxRows =

    (((Uint64)tablePtr.p->maxRowsHigh) << 32) + tablePtr.p->maxRowsLow;