bzr commit into mysql-trunk-innodb branch (kevin.lewis:3478)

[kevin.lewis]

#At file:///Users/kevinlewis/Work/Mysql/Bug59699/mysql-trunk-innodb/ based on revid:kevin.lewis@stripped

 3478 kevin.lewis@stripped	2011-02-04 [merge]
      Merge from mysql-5.5-innodb

    modified:
      storage/innobase/dict/dict0load.c
=== modified file 'storage/innobase/dict/dict0load.c'
--- a/storage/innobase/dict/dict0load.c	revid:kevin.lewis@stripped
+++ b/storage/innobase/dict/dict0load.c	revid:kevin.lewis@stripped
@@ -1550,7 +1550,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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).