diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2006-12-27 15:50:45 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2006-12-27 15:50:45 +0400 |
| commit | 1da6e6fed1a12d291e13eff4b48b11780f24afff (patch) | |
| tree | f0d8616d791e997333201f22e37120b6a39bd1f8 /sql | |
| parent | f63d8c8d0c4a57b9f77a1c190cde4de7ad91bf81 (diff) | |
| parent | 285dac3fd3cd1f784c34d963c3c24aa542c39495 (diff) | |
| download | mariadb-git-1da6e6fed1a12d291e13eff4b48b11780f24afff.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines
sql/table.cc:
Manual merge.
Diffstat (limited to 'sql')
| -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 1305ed9cc24..2d3cae89598 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -453,6 +453,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, memcpy(comment_pos, disk_buff+read_length-com_length, com_length); fix_type_pointers(&int_array, &share->fieldnames, 1, &names); + if (share->fieldnames.count != share->fields) + goto err; fix_type_pointers(&int_array, share->intervals, interval_count, &names); |