Commit 642e4522 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

parents 6bcf266d c2f5a652
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -142,13 +142,13 @@ void FreeArrayMemory(T* ptr)



static void* GetMemory(size_t bytes)
inline void* GetMemory(size_t bytes)
{
    return GetArrayMemory<unsigned char>(bytes);
}


static void FreeMemory(void* ptr)
inline void FreeMemory(void* ptr)
{
    FreeArrayMemory(ptr);
}