diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-05-27 15:42:19 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-05-27 15:42:19 +0500 |
| commit | c8a7b7914203a95c30ce45e800f7676744248bf7 (patch) | |
| tree | 4007055b2807d30f793f20e8d986f32a0332b570 /sql/table.cc | |
| parent | d31b6e47844bb277c69eb9a8993a1024cbdca629 (diff) | |
| parent | f54beb2dccb921296a4c0bec1aa45e5dd6e53a69 (diff) | |
| download | mariadb-git-c8a7b7914203a95c30ce45e800f7676744248bf7.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index d24ee4c6a27..066bbc953fa 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -779,7 +779,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, strpos=disk_buff+6; if (!(rec_per_key= (ulong*) alloc_root(&share->mem_root, - sizeof(ulong*)*key_parts))) + sizeof(ulong)*key_parts))) goto err; for (i=0 ; i < keys ; i++, keyinfo++) |