diff --git a/config.h.cmake b/config.h.cmake index 803a21ee74f..31475fa43ad 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -619,8 +619,8 @@ #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@" -#define MYSQL_MAJOR_VERSION @MAJOR_VERSION@ -#define MYSQL_MINOR_VERSION @MINOR_VERSION@ +#define MYSQL_VERSION_MAJOR @MAJOR_VERSION@ +#define MYSQL_VERSION_MINOR @MINOR_VERSION@ #define MYSQL_VERSION_PATCH @PATCH_VERSION@ #define MYSQL_VERSION_EXTRA "@EXTRA_VERSION@" diff --git a/mysql-test/suite/innodb/r/help_url.result b/mysql-test/suite/innodb/r/help_url.result new file mode 100644 index 00000000000..214bf9f4e22 --- /dev/null +++ b/mysql-test/suite/innodb/r/help_url.result @@ -0,0 +1,9 @@ +call mtr.add_suppression('InnoDB: Error'); +set global innodb_file_per_table=1, innodb_file_format=Barracuda; +create table t1 (i int) engine=InnoDB; +alter table t1 discard tablespace; +select * from t1; +ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine +InnoDB: http://dev.mysql.com/doc/refman/10.0/en/innodb-troubleshooting.html +drop table t1; +set global innodb_file_per_table=default, innodb_file_format=default; diff --git a/mysql-test/suite/innodb/t/help_url.test b/mysql-test/suite/innodb/t/help_url.test new file mode 100644 index 00000000000..2c70cd296cc --- /dev/null +++ b/mysql-test/suite/innodb/t/help_url.test @@ -0,0 +1,21 @@ +# +# MDEV-4273 MYSQL_VERSION_MAJOR.MYSQL_VERSION_MINOR not replaced +# +--source include/have_innodb.inc + +call mtr.add_suppression('InnoDB: Error'); + +set global innodb_file_per_table=1, innodb_file_format=Barracuda; + +create table t1 (i int) engine=InnoDB; +alter table t1 discard tablespace; +--error ER_GET_ERRNO +select * from t1; +perl; +@ARGV = ("$ENV{MYSQLTEST_VARDIR}/log/mysqld.1.err"); +print ((grep {/innodb-troubleshooting/} <>)[-1]); +EOF + +drop table t1; + +set global innodb_file_per_table=default, innodb_file_format=default;