bzr push into mysql-5.5-innodb branch (kevin.lewis:3302 to 3303) Bug#59699

[kevin.lewis]

 3303 kevin.lewis@stripped	2011-02-04
      Bug#59699 - Hidden bug would cause a crash for unknown tablespace flags.
      
      The bug would cause a crash of InnoDB if a non-standard or unknown table
      flags existed in a SYS_TABLES record. This is important because the next
      file version, Cheetah, will identify itself by expanding this field.  So
      unless this is fixed, an older engine that tries to open a table in a
      tablespace with a newer file version will crash instead of report an error
      and refuse to open the table, as it should do.
      
      Reviewed at RB://583.    Approved by Marko.

    modified:
      storage/innobase/dict/dict0load.c
 3302 Marko Mäkelä	2011-02-02 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0cur.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/univ.i
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0purge.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0upd.c
=== modified file 'storage/innobase/dict/dict0load.c'
--- a/storage/innobase/dict/dict0load.c	revid:marko.makela@stripped
+++ b/storage/innobase/dict/dict0load.c	revid:[e-mail]-20110204145930-jcymzrhjn0czsqww
@@ -1552,7 +1552,7 @@ err_len:
 				"InnoDB: in InnoDB data dictionary"
 				" has unknown type %lx.\n",
 				(ulong) flags);
-			return(NULL);
+			return("incorrect flags in SYS_TABLES");
 		}
 	} else {
 		flags = 0;

No bundle (reason: useless for push emails).