diff options
| author | unknown <istruewing@chilla.local> | 2006-12-27 21:07:31 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-27 21:07:31 +0100 |
| commit | 68de006d7e1c5d75f2df864f51585b2f67bdedc4 (patch) | |
| tree | bc068b2ff1c8ebddb4d2923d8db55f15fb3019df /sql/table.cc | |
| parent | b7fe8902b6421d82c66a405d0c882d72e7f9e92c (diff) | |
| parent | ccf6d6b16d45906ac0c854f3bbff4545d1b7e8c4 (diff) | |
| download | mariadb-git-68de006d7e1c5d75f2df864f51585b2f67bdedc4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-axmrg
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 6f8459f063f..43136af5826 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -785,6 +785,8 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, memcpy(comment_pos, disk_buff+read_length-com_length, com_length); fix_type_pointers(&interval_array, &share->fieldnames, 1, &names); + if (share->fieldnames.count != share->fields) + goto err; fix_type_pointers(&interval_array, share->intervals, interval_count, &names); |