Commit 70d80305 authored by Olivier Bertrand's avatar Olivier Bertrand

Fix swapping key numeric values on Big Endian machines.

  modified:   storage/connect/connect.cc
parent af26c366
...@@ -709,6 +709,28 @@ int CntIndexInit(PGLOBAL g, PTDB ptdb, int id, bool sorted) ...@@ -709,6 +709,28 @@ int CntIndexInit(PGLOBAL g, PTDB ptdb, int id, bool sorted)
return (tdbp->To_Kindex->IsMul()) ? 2 : 1; return (tdbp->To_Kindex->IsMul()) ? 2 : 1;
} // end of CntIndexInit } // end of CntIndexInit
#if defined(BIG_ENDIAN_ORDER)
/***********************************************************************/
/* Swap bytes of the key that are written in little endian order. */
/***********************************************************************/
static void SetSwapValue(PVAL valp, char *kp)
{
if (valp->IsTypeNum() && valp->GetType() != TYPE_DECIM) {
uchar buf[8];
int i, k= valp->GetClen();
for (i = 0; k > 0;)
buf[i++]= kp[--k];
valp->SetBinValue((void*)buf);
} else
valp->SetBinValue((void*)kp);
} // end of SetSwapValue
#endif //LITTLE ENDIAN
/***********************************************************************/ /***********************************************************************/
/* IndexRead: fetch a record having the index value. */ /* IndexRead: fetch a record having the index value. */
/***********************************************************************/ /***********************************************************************/
...@@ -797,7 +819,11 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op, ...@@ -797,7 +819,11 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
} // endif b } // endif b
} else } else
#if defined(BIG_ENDIAN_ORDER)
SetSwapValue(valp, kp);
#else // LITTLE ENDIAN
valp->SetBinValue((void*)kp); valp->SetBinValue((void*)kp);
#endif //LITTLE ENDIAN
kp+= valp->GetClen(); kp+= valp->GetClen();
...@@ -912,7 +938,11 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len, ...@@ -912,7 +938,11 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len,
} // endif b } // endif b
} else } else
valp->SetBinValue((void*)p); #if defined(BIG_ENDIAN_ORDER)
SetSwapValue(valp, (char*)kp);
#else // LITTLE ENDIAN
valp->SetBinValue((void*)kp);
#endif //LITTLE ENDIAN
if (trace) { if (trace) {
char bf[32]; char bf[32];
......
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