diff options
author | unknown <ram@gw.mysql.r18.ru> | 2004-12-02 14:34:53 +0400 |
---|---|---|
committer | unknown <ram@gw.mysql.r18.ru> | 2004-12-02 14:34:53 +0400 |
commit | a845e882fd31c1b6e52d2a19017c8a2bd6f9c66c (patch) | |
tree | 2ed178727531457e5fd3bac01e6b654c761b978c /heap | |
parent | 352ad8156cc7bd8dc728715569a3bc350108513e (diff) | |
download | mariadb-git-a845e882fd31c1b6e52d2a19017c8a2bd6f9c66c.tar.gz |
A fix (bug #6878: Crash with engine=memory).
heap/hp_open.c:
A fix (bug #6878: Crash with engine=memory).
Record length should be >= sizeof(byte*).
Diffstat (limited to 'heap')
-rw-r--r-- | heap/hp_open.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/heap/hp_open.c b/heap/hp_open.c index 3bf2881667a..9cb087e3bad 100644 --- a/heap/hp_open.c +++ b/heap/hp_open.c @@ -41,6 +41,13 @@ HP_INFO *heap_open(const char *name, int mode, uint keys, HP_KEYDEF *keydef, { DBUG_PRINT("info",("Initializing new table")); implicit_emptied= 1; + + /* + We have to store sometimes byte* del_link in records, + so the record length should be at least sizeof(byte*) + */ + set_if_bigger(reclength, sizeof (byte*)); + for (i=key_segs=max_length=0 ; i < keys ; i++) { key_segs+= keydef[i].keysegs; |