bzr push into mysql-6.0 branch (dlenev:2726 to 2727) Bug#42858, Bug#42754

[Dmitry Lenev]

 2727 Dmitry Lenev	2009-02-16
      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 (see mysql-6.1-fk tree).
      
      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.
modified:
  sql/table.cc

 2726 Alexander Nozdrin	2009-02-14
      Disable rpl_log_pos due to Bug#42858.
modified:
  mysql-test/suite/rpl/t/disabled.def

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2009-02-05 12:49:39 +0000
+++ b/sql/table.cc	2009-02-16 12:22:31 +0000
@@ -1087,7 +1087,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