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

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

Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines
c72d93b0 · svoj@mysql.com/june.mysql.com · 591712f5 · 28b1bb36 · c72d93b0
Commit c72d93b0 authored Dec 27, 2006 by svoj@mysql.com/june.mysql.com
Show 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
@@ -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);