diff options
| author | unknown <istruewing@chilla.local> | 2006-12-27 19:24:08 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-27 19:24:08 +0100 |
| commit | 79a1be4a228cef137649f74c74e0254d87fa09a9 (patch) | |
| tree | 3d4ae633aa001ab5da4cde82664ded0fe59f6b59 /sql/table.cc | |
| parent | 5d68cff03a464571b5a9460c0b20edc559cd14db (diff) | |
| parent | 1da6e6fed1a12d291e13eff4b48b11780f24afff (diff) | |
| download | mariadb-git-79a1be4a228cef137649f74c74e0254d87fa09a9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into chilla.local:/home/mydev/mysql-5.0-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 9ca6e3e22da..424f59766a1 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -452,6 +452,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); |