summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-08-13 16:02:10 +0200
committerSergei Golubchik <sergii@pisem.net>2013-08-13 16:02:10 +0200
commitb882a3e83eba1be324f4f898ae24e78244e2378d (patch)
tree218cf5e11179ba8c0900c4c45c1c793ca5ad33ee
parentfcf87600a2d7ae03f7bda16c2f16cdec980d2a56 (diff)
downloadmariadb-git-b882a3e83eba1be324f4f898ae24e78244e2378d.tar.gz
MDEV-4492 InnoDB generates non-existing link to manual based on the server version
-rw-r--r--mysql-test/suite/innodb/r/help_url.result2
-rw-r--r--storage/innobase/include/univ.i4
2 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb/r/help_url.result b/mysql-test/suite/innodb/r/help_url.result
index 4a8fc6374a4..9a4efa3a185 100644
--- a/mysql-test/suite/innodb/r/help_url.result
+++ b/mysql-test/suite/innodb/r/help_url.result
@@ -1,4 +1,4 @@
create table innodb_table_monitor (a int) engine=InnoDB;
Warnings:
-Warning 131 Using innodb_table_monitor is deprecated and it may be removed in future releases. Please use the InnoDB INFORMATION_SCHEMA tables instead, see http://dev.mysql.com/doc/refman/10.0/en/innodb-i_s-tables.html
+Warning 131 Using innodb_table_monitor is deprecated and it may be removed in future releases. Please use the InnoDB INFORMATION_SCHEMA tables instead, see http://dev.mysql.com/doc/refman/5.6/en/innodb-i_s-tables.html
drop table innodb_table_monitor;
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index fbb62e8de01..40c1cd14e9e 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -60,9 +60,7 @@ component, i.e. we show M.N.P as M.N */
IB_TO_STR(INNODB_VERSION_MINOR) "." \
IB_TO_STR(INNODB_VERSION_BUGFIX)
-#define REFMAN "http://dev.mysql.com/doc/refman/" \
- IB_TO_STR(MYSQL_VERSION_MAJOR) "." \
- IB_TO_STR(MYSQL_VERSION_MINOR) "/en/"
+#define REFMAN "http://dev.mysql.com/doc/refman/5.6/en/"
#ifdef MYSQL_DYNAMIC_PLUGIN
/* In the dynamic plugin, redefine some externally visible symbols