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

merging with mysql-5.1-bugteam tree

Browse source
This commit is contained in:
Narayanan V 2009-05-29 18:36:58 +05:30
commit 90939fc50d
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/ibmdb2i/db2i_conversion.cc
View file

@ -1085,7 +1085,7 @@ int32 ha_ibmdb2i::convertMySQLtoDB2(Field* field, const DB2Field& db2Field, char
if (bytesToStore) if (bytesToStore)
memcpy(db2Buf, dataToStore, bytesToStore); memcpy(db2Buf, dataToStore, bytesToStore);
if (bytesToPad) if (bytesToPad)
wmemset((wchar_t*)(db2Buf + bytesToStore), 0x0020, bytesToPad/2); memset16((db2Buf + bytesToStore), 0x0020, bytesToPad/2);
} }
else else
{ {
@ -1108,7 +1108,7 @@ int32 ha_ibmdb2i::convertMySQLtoDB2(Field* field, const DB2Field& db2Field, char
bytesToStore = db2BytesToStore; bytesToStore = db2BytesToStore;
} }
if (db2BytesToStore < maxDb2BytesToStore) // If need to pad if (db2BytesToStore < maxDb2BytesToStore) // If need to pad
wmemset((wchar_t*)(db2Buf + db2BytesToStore), 0x0020, (maxDb2BytesToStore - db2BytesToStore)/2); memset16((db2Buf + db2BytesToStore), 0x0020, (maxDb2BytesToStore - db2BytesToStore)/2);
} }
if (db2FieldType == QMY_VARGRAPHIC) if (db2FieldType == QMY_VARGRAPHIC)

16
storage/ibmdb2i/db2i_misc.h
View file

@ -109,5 +109,21 @@ bool isOrdinaryIdentifier(const char* s)
} }
return true; return true;
} }
/**
Fill memory with a 16-bit word.
@param p Pointer to space to fill.
@param v Value to fill
@param l Length of space (in 16-bit words)
*/
void memset16(void* p, uint16 v, size_t l)
{
uint16* p2=(uint16*)p;
while (l--)
{
*(p2++) = v;
}
}
#endif #endif