Merge branch '10.3' into 10.4

16 files changed, 312 insertions, 139 deletions

diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 4c8835f8c08..f001ff11387 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -39,6 +39,7 @@ ELSE()
   SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
   OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON)
   MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE)
+  SET(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}")
 ENDIF()
 
 SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
@@ -270,7 +271,6 @@ IF(CMAKE_VERSION VERSION_GREATER "3.9.99")
 SET(CPACK_SOURCE_GENERATOR "RPM")
 SETA(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS
   "-DRPM=${RPM}"
-  "-DCPACK_RPM_BUILD_SOURCE_DIRS_PREFIX=/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}"
   )
 
 MACRO(ADDIF var)
diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm
index c07e2edb09e..e23d3b75490 100644
--- a/mysql-test/lib/My/Handles.pm
+++ b/mysql-test/lib/My/Handles.pm
@@ -24,8 +24,10 @@ use My::Platform;
 
 my $handle_exe;
 
-
-if (IS_WINDOWS){
+sub import {
+  my $self = shift;
+  my $params = shift;
+  return if (!IS_WINDOWS || $handle_exe);
   # Check if handle.exe is available
   # Pass switch to accept the EULA to avoid hanging
   # if the program hasn't been run before.
@@ -35,7 +37,7 @@ if (IS_WINDOWS){
     $handle_exe= "$2.$3"
       if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/);
   }
-  if ($handle_exe){
+  if ($handle_exe && (!$params || !$params->{suppress_init_messages})){
     print "Found handle.exe version $handle_exe\n";
   }
 }
diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test
index 05dc3aa39c5..4a87ecb18fe 100644
--- a/mysql-test/suite/mariabackup/big_innodb_log.test
+++ b/mysql-test/suite/mariabackup/big_innodb_log.test
@@ -76,6 +76,7 @@ rmdir $targetdir;
 
 perl;
 use lib "lib";
+use My::Handles { suppress_init_messages => 1 };
 use My::File::Path;
 my $install_db_dir = ($ENV{MTR_PARALLEL} == 1) ?
   "$ENV{'MYSQLTEST_VARDIR'}/install.db" :
diff --git a/mysql-test/suite/mariabackup/disabled.def b/mysql-test/suite/mariabackup/disabled.def
deleted file mode 100644
index 88a66df052d..00000000000
--- a/mysql-test/suite/mariabackup/disabled.def
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-#
-#  List the test cases that are to be disabled temporarily.
-#
-#  Separate the test case name and the comment with ':'.
-#
-#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-#  Do not use any TAB characters for whitespace.
-#
-##############################################################################
-big_innodb_log : MDEV-20421 2019-08-26 wlad Always fails on Windows buildbot
\ No newline at end of file
diff --git a/mysql-test/suite/vcol/r/vcol_sql_mode.result b/mysql-test/suite/vcol/r/vcol_sql_mode.result
index b1f5387507d..385939fd037 100644
--- a/mysql-test/suite/vcol/r/vcol_sql_mode.result
+++ b/mysql-test/suite/vcol/r/vcol_sql_mode.result
@@ -28,29 +28,41 @@ DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v TIME AS (a) VIRTUAL, KEY(v));
 DROP TABLE t1;
 CREATE TABLE t1 (c CHAR(8), v BINARY(8) AS (c), KEY(v));
-ERROR HY000: Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v BIT(64) AS (a) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (a) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v TEXT AS (a) VIRTUAL, KEY(v(100)));
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + TRIM resolving dependency
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (RTRIM(a)) VIRTUAL, KEY(v));
 SHOW CREATE TABLE t1;
@@ -126,67 +138,94 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + TRIM not resolving dependency
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(LEADING ' ' FROM a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v TEXT AS (TRIM(LEADING ' ' FROM a)) VIRTUAL, KEY(v(100)));
-ERROR HY000: Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(leading ' ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(TRAILING '' FROM a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'trim(trailing '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(trailing '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(trailing '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(trailing '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(BOTH '' FROM a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'trim(both '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(both '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(both '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(both '' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(TRAILING 'x' FROM a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'trim(trailing 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(trailing 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(trailing 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(trailing 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(BOTH 'x' FROM a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'trim(both 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(both 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(both 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(both 'x' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (
 a CHAR(5),
 v VARCHAR(5) AS (TRIM(TRAILING '  ' FROM a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'trim(trailing '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(trailing '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(trailing '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(trailing '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (
 a CHAR(5),
 v VARCHAR(5) AS (TRIM(BOTH '  ' FROM a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'trim(both '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(both '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(both '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(both '  ' from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + TRIM(... non_constant FROM a)
 CREATE TABLE t1 (
 a CHAR(5),
 b CHAR(5),
 v TEXT AS (TRIM(TRAILING b FROM a)) VIRTUAL, KEY(v(100)));
-ERROR HY000: Function or expression 'trim(trailing `b` from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'trim(trailing `b` from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'trim(trailing `b` from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'trim(trailing `b` from `a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + RPAD resolving dependency
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (RPAD(a,5,' ')) VIRTUAL, KEY(v));
 SHOW CREATE TABLE t1;
@@ -226,22 +265,28 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + RPAD not resolving dependency
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (RPAD(a,4,' ')) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'rpad(`a`,4,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'rpad(`a`,4,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'rpad(`a`,4,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'rpad(`a`,4,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (
 a CHAR(5),
 b CHAR(5),
 v VARCHAR(5) AS (RPAD(a,NULL,b)) VIRTUAL,
 KEY(v)
 );
-ERROR HY000: Function or expression 'rpad(`a`,NULL,`b`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'rpad(`a`,NULL,`b`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'rpad(`a`,NULL,`b`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'rpad(`a`,NULL,`b`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + comparison
 CREATE TABLE t1 (a CHAR(5), v INT AS (a='a') VIRTUAL, KEY(v));
 SHOW CREATE TABLE t1;
@@ -256,11 +301,14 @@ CREATE TABLE t1 (
 a CHAR(5) CHARACTER SET latin1 COLLATE latin1_nopad_bin,
 v INT AS (a='a') VIRTUAL, KEY(v)
 );
-ERROR HY000: Function or expression '`a` = 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a` = 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a` = 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a` = 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + LIKE
 CREATE TABLE t1 (a CHAR(5), v INT AS (a LIKE 'a%') VIRTUAL, KEY(v));
 SHOW CREATE TABLE t1;
@@ -281,18 +329,24 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v INT AS (a LIKE 'a') VIRTUAL, KEY(v));
-ERROR HY000: Function or expression '`a` like 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a` like 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a` like 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a` like 'a'' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # PAD_CHAR_TO_FULL_LENGTH + LENGTH(char_column) = hard dependency
 CREATE TABLE t1 (a CHAR(5), v INT AS (LENGTH(a)) VIRTUAL, KEY(v));
-ERROR HY000: Function or expression 'octet_length(`a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'octet_length(`a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'octet_length(`a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'octet_length(`a`)' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 #
 # Testing NO_UNSIGNED_SUBTRACTION
 #
@@ -302,33 +356,42 @@ b INT UNSIGNED,
 c INT GENERATED ALWAYS AS (a-b) VIRTUAL,
 KEY (c)
 );
-ERROR HY000: Function or expression '`a` - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warnings:
+Warning	1901	Function or expression '`a` - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a` - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warning	1901	Function or expression '`a` - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
 Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
+DROP TABLE t1;
 CREATE TABLE t1 (
 a INT UNSIGNED,
 b INT UNSIGNED,
 c INT GENERATED ALWAYS AS (CAST(a AS SIGNED)-b) VIRTUAL,
 KEY (c)
 );
-ERROR HY000: Function or expression 'cast(`a` as signed) - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warnings:
+Warning	1901	Function or expression 'cast(`a` as signed) - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'cast(`a` as signed) - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warning	1901	Function or expression 'cast(`a` as signed) - `b`' cannot be used in the GENERATED ALWAYS AS clause of `c`
 Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
+DROP TABLE t1;
 CREATE TABLE t1 (
 a INT UNSIGNED,
 b INT UNSIGNED,
 c INT GENERATED ALWAYS AS (a-CAST(b AS SIGNED)) VIRTUAL,
 KEY (c)
 );
-ERROR HY000: Function or expression '`a` - cast(`b` as signed)' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warnings:
+Warning	1901	Function or expression '`a` - cast(`b` as signed)' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a` - cast(`b` as signed)' cannot be used in the GENERATED ALWAYS AS clause of `c`
+Warning	1901	Function or expression '`a` - cast(`b` as signed)' cannot be used in the GENERATED ALWAYS AS clause of `c`
 Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
+DROP TABLE t1;
 CREATE TABLE t1 (
 a INT UNSIGNED,
 b INT UNSIGNED,
@@ -369,12 +432,16 @@ c CHAR(5),
 v VARCHAR(5) GENERATED ALWAYS AS (RPAD(c,a-b,' ')) VIRTUAL,
 KEY (v)
 );
-ERROR HY000: Function or expression 'rpad(`c`,`a` - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'rpad(`c`,`a` - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'rpad(`c`,`a` - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'rpad(`c`,`a` - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value NO_UNSIGNED_SUBTRACTION
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (
 a INT UNSIGNED,
 b INT UNSIGNED,
@@ -382,11 +449,14 @@ c CHAR(5),
 v VARCHAR(5) GENERATED ALWAYS AS (RPAD(c,CAST(a AS DECIMAL(20,1))-b,' ')) VIRTUAL,
 KEY (v)
 );
-ERROR HY000: Function or expression 'rpad(`c`,cast(`a` as decimal(20,1)) - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression 'rpad(`c`,cast(`a` as decimal(20,1)) - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression 'rpad(`c`,cast(`a` as decimal(20,1)) - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression 'rpad(`c`,cast(`a` as decimal(20,1)) - `b`,' ')' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # ALTER TABLE ADD KEY(vcol_depending_on_sql_mode) --> error
 CREATE TABLE t1 (
 a INT UNSIGNED,
@@ -395,32 +465,62 @@ c CHAR(5),
 v VARCHAR(5) GENERATED ALWAYS AS (c) VIRTUAL
 );
 ALTER TABLE t1 ADD KEY(v);
-ERROR HY000: Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+ALTER TABLE t1 DROP KEY v;
+Warnings:
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 CREATE INDEX v ON t1 (v);
-ERROR HY000: Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`c`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 DROP TABLE t1;
 # A virtual column on the second position in an index - cannot depend on sql_mode
 CREATE TABLE t1 (id int, a CHAR(5), v TEXT AS (a) VIRTUAL, KEY(id, v(100)));
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 # A persisten virtual column cannot depend on sql_mode
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (a) PERSISTENT);
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW WARNINGS;
 Level	Code	Message
-Error	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (RTRIM(a)) PERSISTENT);
 SHOW CREATE TABLE t1;
 Table	Create Table
diff --git a/mysql-test/suite/vcol/r/vcol_sql_mode_upgrade.result b/mysql-test/suite/vcol/r/vcol_sql_mode_upgrade.result
index d3954770c7b..fe1cb7b5779 100644
--- a/mysql-test/suite/vcol/r/vcol_sql_mode_upgrade.result
+++ b/mysql-test/suite/vcol/r/vcol_sql_mode_upgrade.result
@@ -52,40 +52,66 @@ Warnings:
 Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 CREATE TABLE t2 LIKE t1;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t2;
 FLUSH TABLES;
 CREATE TABLE t2 LIKE t1;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t2;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` char(5) DEFAULT NULL,
   `v` varchar(5) GENERATED ALWAYS AS (`a`) STORED
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ALTER TABLE t1 ADD b INT DEFAULT a;
 Warnings:
 Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
-ALTER TABLE t1 ADD b INT DEFAULT a;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` char(5) DEFAULT NULL,
-  `v` varchar(5) GENERATED ALWAYS AS (`a`) STORED
+  `v` varchar(5) GENERATED ALWAYS AS (`a`) STORED,
+  `b` int(11) DEFAULT `a`
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SELECT * FROM t1;
-a	v
-1	1
-2	2
-3	3
+a	v	b
+1	1	1
+2	2	2
+3	3	3
 FLUSH TABLES;
 ALTER TABLE t1 ADD c INT DEFAULT a;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SELECT * FROM t1;
-a	v
-1	1
-2	2
-3	3
+a	v	b	c
+1	1	1	1
+2	2	2	2
+3	3	3	3
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 DROP TABLE t1;
 #
 # Fixing a Maria-10.2.26 table with a stored VARCHAR column
@@ -177,10 +203,18 @@ Warnings:
 Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 CREATE TABLE t2 LIKE t1;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t2;
 FLUSH TABLES;
 CREATE TABLE t2 LIKE t1;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+DROP TABLE t2;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -188,19 +222,33 @@ t1	CREATE TABLE `t1` (
   `v` varchar(5) GENERATED ALWAYS AS (`a`) VIRTUAL,
   KEY `v` (`v`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ALTER TABLE t1 ADD b INT DEFAULT a;
 Warnings:
 Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
 Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
-ALTER TABLE t1 ADD b INT DEFAULT a;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 FLUSH TABLES;
 ALTER TABLE t1 ADD c INT DEFAULT a;
-ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 SELECT * FROM t1;
-a	v
-1	1
-2	2
-3	3
+a	v	b	c
+1	1	1	1
+2	2	2	2
+3	3	3	3
+Warnings:
+Warning	1901	Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
+Warning	1105	Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
 DROP TABLE t1;
 #
 # Fixing a Maria-10.2.26 table with a virtual VARCHAR column
diff --git a/mysql-test/suite/vcol/t/vcol_sql_mode.test b/mysql-test/suite/vcol/t/vcol_sql_mode.test
index e4cc6d21718..44d3686ac01 100644
--- a/mysql-test/suite/vcol/t/vcol_sql_mode.test
+++ b/mysql-test/suite/vcol/t/vcol_sql_mode.test
@@ -21,21 +21,25 @@ DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(5), v TIME AS (a) VIRTUAL, KEY(v));
 DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (c CHAR(8), v BINARY(8) AS (c), KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v BIT(64) AS (a) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (a) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v TEXT AS (a) VIRTUAL, KEY(v(100)));
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + TRIM resolving dependency
@@ -75,52 +79,61 @@ DROP TABLE t1;
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + TRIM not resolving dependency
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(LEADING ' ' FROM a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v TEXT AS (TRIM(LEADING ' ' FROM a)) VIRTUAL, KEY(v(100)));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(TRAILING '' FROM a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(BOTH '' FROM a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(TRAILING 'x' FROM a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (TRIM(BOTH 'x' FROM a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 # more than one space
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a CHAR(5),
   v VARCHAR(5) AS (TRIM(TRAILING '  ' FROM a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 # more than one space
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a CHAR(5),
   v VARCHAR(5) AS (TRIM(BOTH '  ' FROM a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + TRIM(... non_constant FROM a)
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a CHAR(5),
   b CHAR(5),
   v TEXT AS (TRIM(TRAILING b FROM a)) VIRTUAL, KEY(v(100)));
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + RPAD resolving dependency
@@ -144,11 +157,12 @@ DROP TABLE t1;
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + RPAD not resolving dependency
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (RPAD(a,4,' ')) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a CHAR(5),
   b CHAR(5),
@@ -156,6 +170,7 @@ CREATE TABLE t1 (
   KEY(v)
 );
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + comparison
@@ -164,12 +179,13 @@ CREATE TABLE t1 (a CHAR(5), v INT AS (a='a') VIRTUAL, KEY(v));
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
    a CHAR(5) CHARACTER SET latin1 COLLATE latin1_nopad_bin,
    v INT AS (a='a') VIRTUAL, KEY(v)
 );
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + LIKE
@@ -182,23 +198,25 @@ CREATE TABLE t1 (a CHAR(5), v INT AS (a LIKE NULL) VIRTUAL, KEY(v));
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v INT AS (a LIKE 'a') VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo # PAD_CHAR_TO_FULL_LENGTH + LENGTH(char_column) = hard dependency
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v INT AS (LENGTH(a)) VIRTUAL, KEY(v));
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo #
 --echo # Testing NO_UNSIGNED_SUBTRACTION
 --echo #
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a INT UNSIGNED,
   b INT UNSIGNED,
@@ -206,8 +224,9 @@ CREATE TABLE t1 (
   KEY (c)
 );
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a INT UNSIGNED,
   b INT UNSIGNED,
@@ -215,8 +234,9 @@ CREATE TABLE t1 (
   KEY (c)
 );
 SHOW WARNINGS;
+DROP TABLE t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a INT UNSIGNED,
   b INT UNSIGNED,
@@ -224,6 +244,7 @@ CREATE TABLE t1 (
   KEY (c)
 );
 SHOW WARNINGS;
+DROP TABLE t1;
 
 CREATE TABLE t1 (
   a INT UNSIGNED,
@@ -250,7 +271,7 @@ DROP TABLE t1;
 --echo # Comnination: PAD_CHAR_TO_FULL_LENGTH + NO_UNSIGNED_SUBTRACTION
 --echo #
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a INT UNSIGNED,
   b INT UNSIGNED,
@@ -259,13 +280,14 @@ CREATE TABLE t1 (
   KEY (v)
 );
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 # The below solves the dependency on NO_UNSIGNED_SUBTRACTION
 # but does not solve the dependency on PAD_CHAR_TO_FULL_LENGTH,
 # because the 'length' argument to RPAD() is not a constant.
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (
   a INT UNSIGNED,
   b INT UNSIGNED,
@@ -274,6 +296,7 @@ CREATE TABLE t1 (
   KEY (v)
 );
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 
@@ -291,10 +314,12 @@ CREATE TABLE t1 (
   c CHAR(5),
   v VARCHAR(5) GENERATED ALWAYS AS (c) VIRTUAL
 );
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 ALTER TABLE t1 ADD KEY(v);
 SHOW WARNINGS;
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+ALTER TABLE t1 DROP KEY v;
+
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE INDEX v ON t1 (v);
 SHOW WARNINGS;
 DROP TABLE t1;
@@ -302,16 +327,18 @@ DROP TABLE t1;
 
 --echo # A virtual column on the second position in an index - cannot depend on sql_mode
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (id int, a CHAR(5), v TEXT AS (a) VIRTUAL, KEY(id, v(100)));
 SHOW WARNINGS;
+DROP TABLE t1;
 
 
 --echo # A persisten virtual column cannot depend on sql_mode
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (a) PERSISTENT);
 SHOW WARNINGS;
+DROP TABLE t1;
 
 CREATE TABLE t1 (a CHAR(5), v VARCHAR(5) AS (RTRIM(a)) PERSISTENT);
 SHOW CREATE TABLE t1;
diff --git a/mysql-test/suite/vcol/t/vcol_sql_mode_upgrade.test b/mysql-test/suite/vcol/t/vcol_sql_mode_upgrade.test
index 71e34231ac1..26b76fbcfe1 100644
--- a/mysql-test/suite/vcol/t/vcol_sql_mode_upgrade.test
+++ b/mysql-test/suite/vcol/t/vcol_sql_mode_upgrade.test
@@ -25,19 +25,21 @@ SELECT * FROM t1;
 FLUSH TABLES;
 SELECT * FROM t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t2 LIKE t1;
+DROP TABLE t2;
 FLUSH TABLES;
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t2 LIKE t1;
+DROP TABLE t2;
 
 SHOW CREATE TABLE t1;
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 ALTER TABLE t1 ADD b INT DEFAULT a;
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 FLUSH TABLES;
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 ALTER TABLE t1 ADD c INT DEFAULT a;
 SELECT * FROM t1;
 DROP TABLE t1;
@@ -90,18 +92,20 @@ SELECT * FROM t1;
 FLUSH TABLES;
 SELECT * FROM t1;
 
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t2 LIKE t1;
+DROP TABLE t2;
 FLUSH TABLES;
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 CREATE TABLE t2 LIKE t1;
+DROP TABLE t2;
 
 
 SHOW CREATE TABLE t1;
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 ALTER TABLE t1 ADD b INT DEFAULT a;
 FLUSH TABLES;
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+#--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 ALTER TABLE t1 ADD c INT DEFAULT a;
 SELECT * FROM t1;
 DROP TABLE t1;
diff --git a/sql/table.cc b/sql/table.cc
index dbda0ced441..e608bdfcf07 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -3778,6 +3778,7 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share,
       outparam->check_constraints= check_constraint_ptr;
 
     vcol_init_mode mode= VCOL_INIT_DEPENDENCY_FAILURE_IS_WARNING;
+#if MYSQL_VERSION_ID > 100500
     switch (thd->lex->sql_command)
     {
     case SQLCOM_CREATE_TABLE:
@@ -3792,9 +3793,10 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share,
     default:
       break;
     }
+#endif
 
-    if (unlikely(parse_vcol_defs(thd, &outparam->mem_root, outparam,
-                                 &error_reported, mode)))
+    if (parse_vcol_defs(thd, &outparam->mem_root, outparam,
+                        &error_reported, mode))
     {
       error= OPEN_FRM_CORRUPTED;
       goto err;
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
index 9a395b8d0dc..1f410f7af0e 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -2758,7 +2758,6 @@ fseg_free_page_low(
 	ulint	state;
 	ib_id_t	descr_id;
 	ib_id_t	seg_id;
-	ulint	i;
 
 	ut_ad(seg_inode != NULL);
 	ut_ad(mtr != NULL);
@@ -2794,7 +2793,7 @@ fseg_free_page_low(
 	if (state != XDES_FSEG) {
 		/* The page is in the fragment pages of the segment */
 
-		for (i = 0;; i++) {
+		for (ulint i = 0;; i++) {
 			if (fseg_get_nth_frag_page_no(seg_inode, i, mtr)
 			    == offset) {
 
@@ -2954,7 +2953,6 @@ fseg_free_extent(
 	xdes_t*	descr;
 	ulint	not_full_n_used;
 	ulint	descr_n_used;
-	ulint	i;
 
 	ut_ad(mtr != NULL);
 
@@ -2970,7 +2968,7 @@ fseg_free_extent(
 
 #ifdef BTR_CUR_HASH_ADAPT
 	if (ahi) {
-		for (i = 0; i < FSP_EXTENT_SIZE; i++) {
+		for (ulint i = 0; i < FSP_EXTENT_SIZE; i++) {
 			if (!xdes_mtr_get_bit(descr, XDES_FREE_BIT, i, mtr)) {
 
 				/* Drop search system page hash index
@@ -3008,7 +3006,7 @@ fseg_free_extent(
 	fsp_free_extent(space, page, mtr);
 
 #ifdef UNIV_DEBUG
-	for (i = 0; i < FSP_EXTENT_SIZE; i++) {
+	for (ulint i = 0; i < FSP_EXTENT_SIZE; i++) {
 
 		buf_page_set_file_page_was_freed(
 			page_id_t(space->id, first_page_in_extent + i));
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result
index c66b17926b7..558924e6513 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result
@@ -76,6 +76,7 @@ select variable_value-@a from information_schema.global_status where variable_na
 variable_value-@a
 4
 DROP TABLE t1;
+set global ROCKSDB_COMPACT_CF= 'default';
 CREATE TABLE t1 (
 a int,
 b int,
diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.pm b/storage/rocksdb/mysql-test/rocksdb/suite.pm
index e4f074df471..633e883f46d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/suite.pm
+++ b/storage/rocksdb/mysql-test/rocksdb/suite.pm
@@ -11,7 +11,7 @@ use My::Find;
 use File::Basename;
 use strict;
 
-sub is_default { not $::opt_embedded_server }
+#sub is_default { not $::opt_embedded_server }
 
 my $sst_dump=
 ::mtr_exe_maybe_exists(
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test b/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test
index 4e8b081c4d5..7a7609f456e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/ttl_primary_read_filtering.test
@@ -102,6 +102,8 @@ SELECT * FROM t1;
 select variable_value-@a from information_schema.global_status where variable_name='rocksdb_rows_filtered';
 
 DROP TABLE t1;
+# Compact away the dropped data
+set global ROCKSDB_COMPACT_CF= 'default';
 
 # Read filtering index scan tests (None of these queries should return any results)
 CREATE TABLE t1 (
diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm
index 79c630f87f1..1cc123b2a2a 100644
--- a/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm
+++ b/storage/rocksdb/mysql-test/rocksdb_rpl/suite.pm
@@ -9,7 +9,7 @@ use My::Find;
 use File::Basename;
 use strict;
 
-sub is_default { not $::opt_embedded_server }
+#sub is_default { not $::opt_embedded_server }
 
 my $sst_dump=
 ::mtr_exe_maybe_exists(
diff --git a/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm b/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm
index 3423d34ded5..106a1d6a0e7 100644
--- a/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm
+++ b/storage/rocksdb/mysql-test/rocksdb_stress/suite.pm
@@ -11,7 +11,7 @@ use My::Find;
 use File::Basename;
 use strict;
 
-sub is_default { not $::opt_embedded_server }
+#sub is_default { not $::opt_embedded_server }
 
 my $sst_dump=
 ::mtr_exe_maybe_exists(
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm
index c8452b55227..5264d657ef7 100644
--- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm
+++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/suite.pm
@@ -8,7 +8,7 @@ use My::Find;
 use File::Basename;
 use strict;
 
-sub is_default { not $::opt_embedded_server }
+#sub is_default { not $::opt_embedded_server }
 
 my $sst_dump=
 ::mtr_exe_maybe_exists(