Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines

into mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.1-engines sql/table.cc: Manual merge.

Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.1-engines sql/table.cc: Manual merge.
b8a714da · unknown · 6659b12b · 396b3aba · b8a714da
Commit b8a714da authored Dec 27, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/table.cc sql/table.cc +2 -0

No files found.
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -786,6 +786,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);