bzr commit into mysql-6.1-fk branch (dlenev:2709) Bug#42754

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-6.1-bg42754/

 2709 Dmitry Lenev	2009-02-12
      Fix for bug #42754 "Foreign keys: ndb_alter_table_backup test
      crashes".
      
      Server failed due to assertion failure caused by the fact that
      it mixed up information about tablespace and column storage
      types in .FRM coming from MySQL Cluster/CGE with description
      of new foreign keys.
      
      This issue has been caused by the wrong merge which removed
      code providing compatibility with such FRMs. This merge
      occured on 2008-08-18 and replaced code from 2007-11-20
      with older code from 2007-05-23.
      
      This fix simply reverts wrong merge.
      
      The suggestion is to push it into 6.0.
modified:
  sql/table.cc

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2009-02-11 08:51:44 +0000
+++ b/sql/table.cc	2009-02-12 17:56:19 +0000
@@ -1092,7 +1092,7 @@ static int open_binary_frm(THD *thd, TAB
       next_chunk+= 2 + share->comment.length;
     }
     DBUG_ASSERT (next_chunk <= buff_end);
-    if (share->mysql_version >= MYSQL_VERSION_TABLESPACE_IN_FRM)
+    if (share->mysql_version >= MYSQL_VERSION_TABLESPACE_IN_FRM_CGE)
     {
       /*
        New frm format in mysql_version 5.2.5 (originally in