summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-05-29 14:16:57 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-05-29 14:37:24 +0300
commit22e5e64c0d62713b052badd87cb0910af5b67f91 (patch)
tree62b694bca0657818af95f25c579ff68ce8b1f137
parent959195e195364a40ba8ad077ce3923c5c5a4c78b (diff)
downloadmariadb-git-bb-10.2-mdev-6076.tar.gz
MDEV-11623 merge fix: Use the correct flags in an error messagebb-10.2-mdev-6076
-rw-r--r--storage/innobase/fil/fil0fil.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index 32681f2d639..966c160f4bd 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -673,7 +673,7 @@ retry:
if (cflags == ULINT_UNDEFINED) {
ib::error()
<< "Expected tablespace flags "
- << ib::hex(flags)
+ << ib::hex(space->flags)
<< " but found " << ib::hex(flags)
<< " in the file " << node->name;
return(false);