bk commit into 5.1 tree (mskold:1.2581) BUG#35708

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of mskold.  When mskold 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, 2008-04-07 16:28:07+02:00, mskold@stripped +1 -0
  table.cc:
    bug#35708 SIGABRT after mysql_upgrade and REPAIR table: Removed checks that block
upgrade

  sql/table.cc@stripped, 2008-04-07 16:26:22+02:00, mskold@stripped +0 -8
    bug#35708 SIGABRT after mysql_upgrade and REPAIR table: Removed checks that block
upgrade

diff -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2008-02-11 15:41:57 +01:00
+++ b/sql/table.cc	2008-04-07 16:26:22 +02:00
@@ -984,7 +984,6 @@ static int open_binary_frm(THD *thd, TAB
         }
       }
     }
-    DBUG_ASSERT (next_chunk <= buff_end);
     if (share->mysql_version >= MYSQL_VERSION_TABLESPACE_IN_FRM)
     {
       /*
@@ -996,7 +995,6 @@ static int open_binary_frm(THD *thd, TAB
       if (next_chunk >= buff_end)
       {
         DBUG_PRINT("error", ("Found no field extra info"));
-        goto err;
       }
       else
       {
@@ -1021,12 +1019,6 @@ static int open_binary_frm(THD *thd, TAB
         field_extra_info= next_chunk + format_section_header_size + tablespace_len + 1;
         next_chunk+= format_section_len;
       }
-    }
-    DBUG_ASSERT (next_chunk <= buff_end);
-    if (next_chunk > buff_end)
-    {
-      DBUG_PRINT("error", ("Buffer overflow in field extra info"));
-      goto err;
     }
   }
   share->key_block_size= uint2korr(head+62);