diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-02-08 19:28:00 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-02-08 19:28:00 +0200 |
| commit | be01dbf5879781eb8969de73cba407eb1f90bff9 (patch) | |
| tree | ff814f5d518eaf9c141a355a470b54a53e8ce052 /storage/innobase/dict | |
| parent | 4e523ad68dce768516f58823667ce0d2484101d0 (diff) | |
| parent | 1751fd90a8d16aefcf710299537e160d1e443226 (diff) | |
| download | mariadb-git-be01dbf5879781eb8969de73cba407eb1f90bff9.tar.gz | |
Merge mysql-5.5-innodb -> mysql-5.5
Diffstat (limited to 'storage/innobase/dict')
| -rw-r--r-- | storage/innobase/dict/dict0load.c | 2 |
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; |