bk commit into 4.1 tree (svoj:1.2583) BUG#24358

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-15 16:01:56+04:00, svoj@stripped +1 -0
  BUG#24358 - Table access crashes server
  
  Having broken .frm, particulary number of field names does
  not match number of fields, causes server crash.
  
  Refuse to open a table if number of field names in a table
  is not equal to number of fields in a table.
  
  No test case, since it requires broken .frm file.

  sql/table.cc@stripped, 2006-12-15 16:01:53+04:00, svoj@stripped +2 -0
    Refuse to open a table if number of field names in a table
    is not equal to number of fields in a table.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines

--- 1.140/sql/table.cc	2006-12-15 16:01:59 +04:00
+++ 1.141/sql/table.cc	2006-12-15 16:01:59 +04:00
@@ -373,6 +373,8 @@ int openfrm(const char *name, const char
   memcpy(comment_pos, disk_buff+read_length-com_length, com_length);
 
   fix_type_pointers(&int_array,&outparam->fieldnames,1,&names);
+  if (outparam->fieldnames.count != outparam->fields)
+    goto err_not_open;
   fix_type_pointers(&int_array,outparam->intervals,interval_count,
 		    &names);