Commit bffe8fb2 authored by pekka@mysql.com's avatar pekka@mysql.com

ndb - 5.1.2 build fix: array initializer crashes gcc-2.95.3

parent 65bea6b3
...@@ -113,22 +113,25 @@ Dbtup::setUpQueryRoutines(Tablerec* const regTabPtr) ...@@ -113,22 +113,25 @@ Dbtup::setUpQueryRoutines(Tablerec* const regTabPtr)
} }
if(AttributeDescriptor::getDiskBased(attrDescr)) if(AttributeDescriptor::getDiskBased(attrDescr))
{ {
ReadFunction r[] = { // array initializer crashes gcc-2.95.3
&Dbtup::readDiskBitsNotNULL, ReadFunction r[6];
&Dbtup::readDiskBitsNULLable, {
&Dbtup::readDiskFixedSizeNotNULL, r[0] = &Dbtup::readDiskBitsNotNULL;
&Dbtup::readDiskFixedSizeNULLable, r[1] = &Dbtup::readDiskBitsNULLable;
&Dbtup::readDiskVarSizeNULLable, r[2] = &Dbtup::readDiskFixedSizeNotNULL;
&Dbtup::readDiskVarSizeNotNULL r[3] = &Dbtup::readDiskFixedSizeNULLable;
}; r[4] = &Dbtup::readDiskVarSizeNULLable;
UpdateFunction u[] = { r[5] = &Dbtup::readDiskVarSizeNotNULL;
&Dbtup::updateDiskBitsNotNULL, }
&Dbtup::updateDiskBitsNULLable, UpdateFunction u[6];
&Dbtup::updateDiskFixedSizeNotNULL, {
&Dbtup::updateDiskFixedSizeNULLable, u[0] = &Dbtup::updateDiskBitsNotNULL;
&Dbtup::updateDiskVarSizeNULLable, u[1] = &Dbtup::updateDiskBitsNULLable;
&Dbtup::updateDiskVarSizeNotNULL u[2] = &Dbtup::updateDiskFixedSizeNotNULL;
}; u[3] = &Dbtup::updateDiskFixedSizeNULLable;
u[4] = &Dbtup::updateDiskVarSizeNULLable;
u[5] = &Dbtup::updateDiskVarSizeNotNULL;
}
Uint32 a= Uint32 a=
AttributeDescriptor::getArrayType(attrDescr) == NDB_ARRAYTYPE_FIXED ? 2 : 4; AttributeDescriptor::getArrayType(attrDescr) == NDB_ARRAYTYPE_FIXED ? 2 : 4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment