summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kevin.lewis@oracle.com>2011-02-04 08:59:30 -0600
committerunknown <kevin.lewis@oracle.com>2011-02-04 08:59:30 -0600
commitaff195eb5a9f3250d8ebf140400bfa5068050ccb (patch)
tree53097ac5d4f9e1721eead59efe60032457ab9114
parentee486208cd72ac10f6e8ec17cf2f390e45bd7f3f (diff)
downloadmariadb-git-aff195eb5a9f3250d8ebf140400bfa5068050ccb.tar.gz
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.
-rw-r--r--storage/innobase/dict/dict0load.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c
index 3252e85b358..3561e7220ab 100644
--- a/storage/innobase/dict/dict0load.c
+++ b/storage/innobase/dict/dict0load.c
@@ -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;