summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-08-29 21:58:02 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-08-29 21:58:02 +0300
commite634fdcd5b5ae8e8db38aa71307c59be295abc1f (patch)
tree2a5a0b13746646fd90c1fc4305eddabab0438250
parentfdbdd3b13124cda2bad2392b1bf7314cb1fdfe86 (diff)
downloadmariadb-git-e634fdcd5b5ae8e8db38aa71307c59be295abc1f.tar.gz
WL#8845: Clarify the message about redo log format incompatibility
recv_find_max_checkpoint(): Refer to MariaDB 10.2.2 instead of MySQL 5.7.9. Do not hint that a binary downgrade might be possible, because there are many changes in InnoDB 5.7 that could make downgrade impossible: a column appended to SYS_INDEXES, added SYS_* tables, undo log format changes, and so on.
-rw-r--r--storage/innobase/log/log0recv.cc6
-rw-r--r--storage/xtradb/log/log0recv.cc6
2 files changed, 4 insertions, 8 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index d128ccd26c5..5180f8b19c0 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -818,10 +818,8 @@ not_consistent:
fprintf(stderr,
"InnoDB: No valid checkpoint found.\n"
- "InnoDB: If you are attempting downgrade"
- " from MySQL 5.7.9 or later,\n"
- "InnoDB: please refer to " REFMAN
- "upgrading-downgrading.html\n"
+ "InnoDB: A downgrade from MariaDB 10.2.2"
+ " or later is not supported.\n"
"InnoDB: If this error appears when you are"
" creating an InnoDB database,\n"
"InnoDB: the problem may be that during"
diff --git a/storage/xtradb/log/log0recv.cc b/storage/xtradb/log/log0recv.cc
index 6f76d151af3..0872d231612 100644
--- a/storage/xtradb/log/log0recv.cc
+++ b/storage/xtradb/log/log0recv.cc
@@ -845,10 +845,8 @@ not_consistent:
fprintf(stderr,
"InnoDB: No valid checkpoint found.\n"
- "InnoDB: If you are attempting downgrade"
- " from MySQL 5.7.9 or later,\n"
- "InnoDB: please refer to " REFMAN
- "upgrading-downgrading.html\n"
+ "InnoDB: A downgrade from MariaDB 10.2.2"
+ " or later is not supported.\n"
"InnoDB: If this error appears when you are"
" creating an InnoDB database,\n"
"InnoDB: the problem may be that during"