diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3da365843f4..02e34ec119f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -447,7 +447,8 @@ fedora install:
       - installed-database.sql
       - upgraded-database.sql
 
-cppcheck: 
+cppcheck:
+  allow_failure: true
   stage: sast
   needs: []
   variables:
@@ -455,33 +456,57 @@ cppcheck:
     GIT_SUBMODULE_STRATEGY: normal
   script:
     - yum install -y cppcheck diffutils
-    # --template: use a single-line template
+    # --template: output format
     # --force: check large directories without warning
     # -i<directory>: ignore this directory when scanning
+    # -I<directory>: include path, reduces false positives 
+    #                related to inability to resolve symbols
     # -j: run multiple cppcheck threads
     # Use newline to escape colon in yaml
     - >
-      cppcheck --template="{file}:{line}: {severity}: {message}" --force
+      cppcheck --template="{file}:{line}\n{code}\n{severity}: {message}" --force --check-level=exhaustive
       client dbug extra include libmariadb libmysqld libservices mysql-test mysys mysys_ssl pcre plugin
       strings tests unittest vio wsrep-lib sql sql-common storage
       -istorage/mroonga -istorage/tokudb -istorage/spider -istorage/rocksdb -iextra/ -ilibmariadb/ -istorage/columnstore
-      --output-file=cppcheck.txt -j $(nproc)
-    # Parallel jobs may output findings in an nondeterministic order. Sort to match ignorelist.
-    - cat cppcheck.txt | sort > cppcheck_sorted.txt
-    # Remove line numbers for diff
-    - sed 's/:[^:]*:/:/' cppcheck_sorted.txt > cppcheck_sorted_no_line_numbers.txt
+      -Iinclude -Istorage/innobase/include
+      --output-file=initial-cppcheck_output.txt -j $(nproc)
+    # when including {code} in the cppcheck template, some more pre-processing needs to be done
+    #
+    # sample cppcheck finding: <file>:<line>
+    #                          foo.bar()
+    #                          ^
+    #                          <severity>: <message>
+    #
+    # 1. remove all lines with "^"
+    # 2. merge every 3 lines into 1 so it can be sorted (example: <file> foo.bar() <severity>: <message>)
+    # 3. sort to match ignorelist since parallel jobs may output findings in an nondeterministic order
+    # 4. remove findings likely to be false positives (i.e, "unknown macros")
+    # 5. remove line numbers for diffing against ignorelist
+    - |
+      cat initial-cppcheck_output.txt | grep -v '\^$' > preprocessed-cppcheck_circumflex_removed.txt
+      cat preprocessed-cppcheck_circumflex_removed.txt | awk 'NR%3==1 {printf "%s", (NR==1) ? "" : "\n"; printf "%s", $0} NR%3!=1 {printf " %s", $0}' > preprocessed-cppcheck_oneline.txt
+      cat preprocessed-cppcheck_oneline.txt | sort > preprocessed-cppcheck_sorted.txt
+      cat preprocessed-cppcheck_sorted.txt | grep -v "There is an unknown macro here somewhere" > results-cppcheck_all_findings.txt
+      sed 's/:[0-9]\+//' results-cppcheck_all_findings.txt > preprocessed_final-cppcheck_no_line_nums.txt
     # Only print new issues not found in ignore list
     - echo "Problems found in ignore list that were not discovered by cppcheck (may have been fixed)."
-    - diff --changed-group-format='%>' --unchanged-group-format='' cppcheck_sorted_no_line_numbers.txt tests/code_quality/cppcheck_ignorelist.txt || true
+    - diff --changed-group-format='%>' --unchanged-group-format='' preprocessed_final-cppcheck_no_line_nums.txt tests/code_quality/cppcheck_ignorelist.txt || true
     - echo "Problems found by cppcheck that were not in ignore list."
-    - diff --changed-group-format='%<' --unchanged-group-format='' cppcheck_sorted_no_line_numbers.txt tests/code_quality/cppcheck_ignorelist.txt > lines_not_ignored.txt || true
-    - cat lines_not_ignored.txt && test ! -s lines_not_ignored.txt
+    - diff --changed-group-format='%<' --unchanged-group-format='' preprocessed_final-cppcheck_no_line_nums.txt tests/code_quality/cppcheck_ignorelist.txt > results-cppcheck_new_findings.txt || true
+    - cat results-cppcheck_new_findings.txt && test ! -s results-cppcheck_new_findings.txt
   artifacts:
     when: always
     paths:
-      - cppcheck_sorted.txt
+      # save all steps of pre-processing in-case it ever breaks
+      - initial-cppcheck_output.txt
+      - preprocessed-cppcheck_circumflex_removed.txt
+      - preprocessed-cppcheck_sorted.txt
+      - preprocessed_final-cppcheck_no_line_nums.txt
+      - results-cppcheck_all_findings.txt
+      - results-cppcheck_new_findings.txt
 
 flawfinder: 
+  allow_failure: true
   stage: sast
   needs: []
   variables:
@@ -503,11 +528,12 @@ flawfinder:
     - echo "Problems found in ignore list that were not discovered by flawfinder (may have been fixed)."
     - diff --changed-group-format='%>' --unchanged-group-format='' flawfinder-min-level5.json tests/code_quality/flawfinder_ignorelist.json || true
     - echo "Problems found by flawfinder that were not in ignore list."
-    - diff --changed-group-format='%<' --unchanged-group-format='' flawfinder-min-level5.json tests/code_quality/flawfinder_ignorelist.json > lines_not_ignored.txt || true
-    - cat lines_not_ignored.txt && test ! -s lines_not_ignored.txt
+    - diff --changed-group-format='%<' --unchanged-group-format='' flawfinder-min-level5.json tests/code_quality/flawfinder_ignorelist.json > flawfinder_new_findings.txt || true
+    - cat flawfinder_new_findings.txt && test ! -s flawfinder_new_findings.txt
   artifacts:
     when: always
     paths:
+      - flawfinder_new_findings.txt
       - flawfinder-all-vulnerabilities.html
       - flawfinder-min-level5.json
       
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a555aa27fd..74fdbcbc0c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,13 +193,20 @@ ELSE()
   SET (SKIP_COMPONENTS "N-O-N-E")
 ENDIF()
 
-OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF)
+
+IF("${MYSQL_NO_DASH_VERSION}" VERSION_LESS 11.2)
+  SET(MEMPROTECT_DEFAULT ON)
+ELSE()
+  SET(MEMPROTECT_DEFAULT OFF)
+ENDIF()
+
+OPTION(WITH_PROTECT_STATEMENT_MEMROOT "Enable protection of statement's memory root after first SP/PS execution. Turned into account only for debug build"
+${MEMPROTECT_DEFAULT})
 
 #
 #  Enable protection of statement's memory root after first SP/PS execution.
 #  Can be switched on only for debug build.
 #
-OPTION(WITH_PROTECT_STATEMENT_MEMROOT "Enable protection of statement's memory root after first SP/PS execution. Turned into account only for debug build" OFF)
 IF (WITH_PROTECT_STATEMENT_MEMROOT)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DPROTECT_STATEMENT_MEMROOT")
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DPROTECT_STATEMENT_MEMROOT")
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
index 5143e745ac6..176bf05e361 100644
--- a/cmake/maintainer.cmake
+++ b/cmake/maintainer.cmake
@@ -27,6 +27,7 @@ SET(MY_WARNING_FLAGS
   -Wenum-conversion
   -Wextra
   -Wformat-security
+  -Winconsistent-missing-override
   -Wmissing-braces
   -Wno-format-truncation
   -Wno-init-self
@@ -34,8 +35,8 @@ SET(MY_WARNING_FLAGS
   -Wno-null-conversion
   -Wno-unused-parameter
   -Wno-unused-private-field
-  -Woverloaded-virtual
   -Wnon-virtual-dtor
+  -Woverloaded-virtual
   -Wvla
   -Wwrite-strings
   )
@@ -44,7 +45,7 @@ FOREACH(F ${MY_WARNING_FLAGS})
   MY_CHECK_AND_SET_COMPILER_FLAG(${F} DEBUG RELWITHDEBINFO)
 ENDFOREACH()
 
-SET(MY_ERROR_FLAGS -Werror -fno-operator-names)
+SET(MY_ERROR_FLAGS -Werror -fno-operator-names -Wsuggest-override)
 
 IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
   SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=maybe-uninitialized)
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index 368ae61d1d3..a01a1d68f64 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -17,7 +17,9 @@
 #
 # Galera library does not compile with windows
 #
-IF (NOT WITHOUT_SERVER)
+IF(WITHOUT_SERVER)
+  OPTION(WITH_WSREP "Galera server compatibility in build client utilities" ON)
+ELSE()
 IF(UNIX)
   SET(with_wsrep_default ON)
 ELSE()
@@ -67,4 +69,4 @@ ENDIF()
 IF (NOT WIN32)
   ADD_FEATURE_INFO(WSREP WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)")
 ENDIF()
-ENDIF(NOT WITHOUT_SERVER)
+ENDIF(WITHOUT_SERVER)
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 65c1b3ca084..fa21607a9e4 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1336,7 +1336,7 @@ enum options_xtrabackup
   OPT_INNODB_DATA_FILE_BUFFERING,
   OPT_INNODB_DATA_FILE_WRITE_THROUGH,
   OPT_INNODB_LOG_FILE_SIZE,
-  OPT_INNODB_LOG_FILES_IN_GROUP,
+  OPT_INNODB_LOG_WRITE_AHEAD_SIZE,
   OPT_INNODB_OPEN_FILES,
   OPT_XTRA_DEBUG_SYNC,
   OPT_INNODB_CHECKSUM_ALGORITHM,
@@ -1918,6 +1918,10 @@ struct my_option xb_server_options[] =
   {"innodb_log_group_home_dir", OPT_INNODB_LOG_GROUP_HOME_DIR,
    "Path to InnoDB log files.", &srv_log_group_home_dir,
    &srv_log_group_home_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"innodb_log_write_ahead_size", OPT_INNODB_LOG_WRITE_AHEAD_SIZE,
+   "ib_logfile0 write size",
+   (G_PTR*) &log_sys.write_size, (G_PTR*) &srv_log_file_size, 0,
+   GET_UINT, REQUIRED_ARG, 512, 512, 4096, 0, 1, 0},
   {"innodb_max_dirty_pages_pct", OPT_INNODB_MAX_DIRTY_PAGES_PCT,
    "Percentage of dirty pages allowed in bufferpool.",
    (G_PTR*) &srv_max_buf_pool_modified_pct,
@@ -2366,6 +2370,11 @@ xb_get_one_option(const struct my_option *opt,
 
 static bool innodb_init_param()
 {
+	if (!ut_is_2pow(log_sys.write_size)) {
+		msg("InnoDB: innodb_log_write_ahead_size=%u"
+		    " is not a power of two", log_sys.write_size);
+		return true;
+	}
 	srv_is_being_started = TRUE;
 	/* === some variables from mysqld === */
 	memset((G_PTR) &mysql_tmpdir_list, 0, sizeof(mysql_tmpdir_list));
@@ -3390,7 +3399,7 @@ static bool xtrabackup_copy_logfile()
   ut_a(dst_log_file);
   ut_ad(recv_sys.is_initialised());
   const size_t sequence_offset{log_sys.is_encrypted() ? 8U + 5U : 5U};
-  const size_t block_size_1{log_sys.get_block_size() - 1};
+  const size_t block_size_1{log_sys.write_size - 1};
 
   ut_ad(!log_sys.is_pmem());
 
@@ -3465,7 +3474,7 @@ static bool xtrabackup_copy_logfile()
         if (r == recv_sys_t::GOT_EOF)
           break;
 
-        if (recv_sys.offset < log_sys.get_block_size())
+        if (recv_sys.offset < log_sys.write_size)
           break;
 
         if (xtrabackup_throttle && io_ticket-- < 0)
diff --git a/extra/perror.c b/extra/perror.c
index c9e9ae6e334..b0115e14c04 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -352,7 +352,8 @@ int main(int argc,char *argv[])
       {
         found= 1;
         if (verbose)
-          printf("MariaDB error code %3d (%s): %s\n", code, name, msg);
+          printf("MariaDB error code %3d (%s): %s\n"
+                 "Learn more: https://mariadb.com/kb/en/e%3d/\n", code, name, msg, code);
         else
           puts(msg);
       }
diff --git a/mysql-test/include/ctype_myanmar.inc b/mysql-test/include/ctype_myanmar.inc
index a305430835f..75de5f07a5d 100644
--- a/mysql-test/include/ctype_myanmar.inc
+++ b/mysql-test/include/ctype_myanmar.inc
@@ -1293,11 +1293,9 @@ INSERT INTO t1 (s1) VALUES
 (_ucs2 0x101C1000103A10181000103A),
 (_ucs2 0x101C103910181000103A /* tea */);
 
-# enable view-protocol after fix MDEV-27871
---disable_view_protocol
-
-SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id;
---enable_view_protocol
+--disable_service_connection
+SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) as exp FROM t1 ORDER BY id;
+--enable_service_connection
 
 DROP TABLE t1;
 
diff --git a/mysql-test/include/ctype_numconv.inc b/mysql-test/include/ctype_numconv.inc
index 6241d29e2f3..6fb8d58276f 100644
--- a/mysql-test/include/ctype_numconv.inc
+++ b/mysql-test/include/ctype_numconv.inc
@@ -1,7 +1,3 @@
-#remove this include after fix MDEV-27871
-# maybe some tests need to be excluded separately after fix
---source include/no_view_protocol.inc
-
 SET TIME_ZONE = _latin1 '+03:00';
 
 --echo #
@@ -464,6 +460,7 @@ show create table t1;
 drop table t1;
 
 --disable_ps2_protocol
+--disable_view_protocol
 # Ensure that row_count() value is reset after drop table.
 select 1;
 select hex(concat(row_count()));
@@ -475,6 +472,7 @@ select hex(concat(found_rows()));
 create table t1 as select concat(found_rows()) as c1;
 show create table t1;
 drop table t1;
+--enable_view_protocol
 --enable_ps2_protocol
 
 create table t1 as select concat(uuid_short()) as c1;
@@ -664,71 +662,71 @@ create table t1 as select concat(Dimension(GeomFromText('LINSTRING(0 0,10 10)'))
 show create table t1;
 drop table t1;
 
-select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
+select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
 create table t1 as select concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))));
+select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)')))) as exp;
 create table t1 as select concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
+select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
 create table t1 as select concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))));
+select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')))) as exp;
 create table t1 as select concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))));
+select hex(concat(IsEmpty(GeomFromText('POINT(1 1)')))) as exp;
 create table t1 as select concat(IsEmpty(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
+select hex(concat(IsSimple(GeomFromText('POINT(1 1)')))) as exp;
 create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))));
+select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)')))) as exp;
 create table t1 as select concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))));
+select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)')))) as exp;
 create table t1 as select concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))) as c1;
 drop table t1;
 
-select hex(concat(x(GeomFromText('Point(1 2)'))));
+select hex(concat(x(GeomFromText('Point(1 2)')))) as exp;
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(y(GeomFromText('Point(1 2)'))));
+select hex(concat(y(GeomFromText('Point(1 2)')))) as exp;
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))));
+select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)')))) as exp;
 create table t1 as select concat(GLength(GeomFromText('LineString(1 2, 2 2)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))));
+select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))')))) as exp;
 create table t1 as select concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(GeometryType(GeomFromText('Point(1 2)'))));
+select hex(concat(GeometryType(GeomFromText('Point(1 2)')))) as exp;
 create table t1 as select concat(GeometryType(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(AsText(GeomFromText('Point(1 2)'))));
+select hex(concat(AsText(GeomFromText('Point(1 2)')))) as exp;
 create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 drop table t1;
@@ -874,7 +872,7 @@ create table t1 as select concat(sec_to_time(2378)) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')));
+select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00'))) as exp;
 create table t1 as select concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')) as c1;
 show create table t1;
 drop table t1;
@@ -894,12 +892,12 @@ create table t1 as select concat(from_unixtime(1111885200)) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')));
+select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00'))) as exp;
 create table t1 as select concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')) as c1;
 show create table t1;
 drop table t1;
 
-select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)));
+select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day))) as exp;
 create table t1 as select concat(date_add('2004-01-01 12:00:00', interval 1 day)) as c1;
 show create table t1;
 select * from t1;
@@ -1646,9 +1644,11 @@ INSERT INTO t1 VALUES (1234567);
 SELECT GROUP_CONCAT(IFNULL(a,'')) FROM t1;
 SELECT GROUP_CONCAT(IF(a,a,'')) FROM t1;
 SELECT GROUP_CONCAT(CASE WHEN a THEN a ELSE '' END) FROM t1;
+--disable_view_protocol
 --enable_metadata
 SELECT COALESCE(a,'') FROM t1 GROUP BY 1;
 --disable_metadata
+--enable_view_protocol
 --echo # All columns must be VARCHAR(9) with the same length:
 --disable_warnings
 CREATE TABLE t2 AS
@@ -1765,15 +1765,17 @@ SELECT
   DATE_SUB(CAST('2007-08-03 17:33:00' AS DATETIME), INTERVAL 1 MINUTE) AS field_datetime;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
---enable_metadata
 # PS protocol gives different "Max length" value for DATETIME.
 --disable_ps_protocol
+--disable_view_protocol
+--enable_metadata
 SELECT
   DATE_SUB('2007-08-03', INTERVAL 1 DAY) AS field_str1,
   DATE_SUB('2007-08-03 17:33:00', INTERVAL 1 MINUTE) AS field1_str2,
   DATE_SUB(DATE('2007-08-03'), INTERVAL 1 DAY) AS field_date,
   DATE_SUB(CAST('2007-08-03 17:33:00' AS DATETIME), INTERVAL 1 MINUTE) AS field_datetime;
 --disable_metadata
+--enable_view_protocol
 --enable_ps_protocol
 SELECT
   HEX(DATE_SUB('2007-08-03', INTERVAL 1 MINUTE)) AS field_str1,
diff --git a/mysql-test/include/ctype_pad.inc b/mysql-test/include/ctype_pad.inc
index a18876145df..8790525701c 100644
--- a/mysql-test/include/ctype_pad.inc
+++ b/mysql-test/include/ctype_pad.inc
@@ -52,14 +52,13 @@ DROP TABLE t1;
 --echo #
 --echo # IF, CASE, LEAST
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
-eval SELECT IF('abc' COLLATE $coll = 'abc ', 'pad', 'nopad');
-eval SELECT CASE 'abc' COLLATE $coll WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-eval SELECT CASE WHEN 'abc' COLLATE $coll = 'abc ' THEN 'pad' ELSE 'nopad' END;
-eval SELECT HEX(LEAST('abc ' COLLATE $coll, 'abc  '));
-eval SELECT HEX(GREATEST('abc ' COLLATE $coll, 'abc  '));
---enable_view_protocol
+
+eval SELECT IF('abc' COLLATE $coll = 'abc ', 'pad', 'nopad') as exp;
+eval SELECT CASE 'abc' COLLATE $coll WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+eval SELECT CASE WHEN 'abc' COLLATE $coll = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+eval SELECT HEX(LEAST('abc ' COLLATE $coll, 'abc  ')) as exp;
+eval SELECT HEX(GREATEST('abc ' COLLATE $coll, 'abc  ')) as exp;
+
 --echo #
 --echo # Collation mix
 --echo #
diff --git a/mysql-test/include/ctype_str_to_date.inc b/mysql-test/include/ctype_str_to_date.inc
index fc7d6801adf..03a3b699497 100644
--- a/mysql-test/include/ctype_str_to_date.inc
+++ b/mysql-test/include/ctype_str_to_date.inc
@@ -3,10 +3,7 @@
 --echo #
 
 SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
-# enable view-protocol after fix MDEV-27871
---disable_view_protocol
-SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
---enable_view_protocol
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR)) as exp;
 CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
 SHOW COLUMNS FROM t1;
 INSERT INTO t1 VALUES (_utf8'2001÷01÷01',_utf8'%Y÷%m÷%d');
diff --git a/mysql-test/include/ctype_utf8mb4.inc b/mysql-test/include/ctype_utf8mb4.inc
index 73011cef81d..2ef614039e6 100644
--- a/mysql-test/include/ctype_utf8mb4.inc
+++ b/mysql-test/include/ctype_utf8mb4.inc
@@ -2,11 +2,6 @@
 # Tests with the utf8mb4 character set
 #
 
-# Tests will be skipped for the view protocol because the view protocol uses 
-# an additional util connection and don't use for this nessesary configurations
-# Also need to resolve MDEV-27871
--- source include/no_view_protocol.inc
-
 --source include/default_optimizer_switch.inc
 --disable_warnings
 drop table if exists t1,t2;
@@ -31,26 +26,26 @@ select locate('HE','hello' collate utf8mb4_bin);
 select locate('HE','hello' collate utf8mb4_bin,2);
 select locate('LO','hello' collate utf8mb4_bin,2);
 
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2);
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2);
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2);
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin);
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin);
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2) as exp;
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin) as exp;
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin) as exp;
 
-select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1);
+select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1) as exp;
 
 select 'a' like 'a';
 select 'A' like 'a';
 select 'A' like 'a' collate utf8mb4_bin;
-select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%');
+select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%') as exp;
 
 # Bug #6040: can't retrieve records with umlaut
 # characters in case insensitive manner.
 # Case insensitive search LIKE comparison
 # was broken for multibyte characters:
-select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4);
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
+select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4) as exp;
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
 
 #
 # Check the following:
@@ -666,6 +661,7 @@ DROP TABLE t1;
 #
 # Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 table
 #
+--disable_service_connection
 SET NAMES latin1;
 eval CREATE TABLE t1 (
     id int unsigned NOT NULL auto_increment,
@@ -682,6 +678,7 @@ SELECT id, term FROM t1 where (list_id = 1) AND (term = "testetest");
 SELECT id, term FROM t1 where (list_id = 1) AND (term = "test�test");
 DROP TABLE t1;
 }
+--enable_service_connection
 
 #
 # Bug #6019 SELECT tries to use too short prefix index on utf8mb4 data
@@ -747,10 +744,10 @@ drop table t1;
 #
 # Bug#22638 SOUNDEX broken for international characters
 #
-select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB);
-select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB));
-select soundex(_utf8mb4 0xD091D092D093);
-select hex(soundex(_utf8mb4 0xD091D092D093));
+select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB) as exp;
+select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)) as exp;
+select soundex(_utf8mb4 0xD091D092D093) as exp;
+select hex(soundex(_utf8mb4 0xD091D092D093)) as exp;
 
 
 SET collation_connection='utf8mb4_general_ci';
@@ -786,7 +783,7 @@ drop table t1;
 #
 # Bug#8385: utf8mb4_general_ci treats Cyrillic letters I and SHORT I as the same
 #
-select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4);
+select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4) as exp;
 
 #
 # Bugs#5980: NULL requires a characterset in a union
@@ -1191,6 +1188,7 @@ DROP TABLE t1;
 #            (see bug #16674 as well)
 #
 
+--disable_service_connection
 SET NAMES latin2;
 
 if (!$is_heap)
@@ -1220,6 +1218,7 @@ SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN
 
 DROP TABLE t1;
 }
+--enable_service_connection
 
 #
 # Bug 20709: problem with utf8mb4 fields in temporary tables
@@ -1420,8 +1419,11 @@ set names utf8mb4;
 eval create table t1 (a varchar(10) character set latin1, b int) engine $engine;
 insert into t1 values ('a',1);
 select concat(a, if(b>10, N'x', N'y')) from t1;
+#Incorrect collation in error message with view protocol
+--disable_view_protocol
 --error 1267
 select concat(a, if(b>10, N'æ', N'ß')) from t1;
+--enable_view_protocol
 drop table t1;
 
 # Conversion tests for character set introducers
diff --git a/mysql-test/include/empty_string_literal.inc b/mysql-test/include/empty_string_literal.inc
index 5857c26d4ee..86ddee5db76 100644
--- a/mysql-test/include/empty_string_literal.inc
+++ b/mysql-test/include/empty_string_literal.inc
@@ -1,17 +1,15 @@
 SET SESSION character_set_connection=latin2;
 SET SESSION character_set_client=cp1250;
 
---disable_service_connection
-
 --echo #
 --echo # Test litteral
 --echo #
 
-#enable view protocol after fix MDEV-27871 and
-# it is necessary that the view protocol uses the same connection,
-# not util connection
+# For "--view-protocol" NULLIF('','') converts to nullif(NULL,NULL)
+# in view definition and CHARSET(nullif(NULL,NULL)) returns 'binary'.
+# Also view does not allow columns with the same name,
+# so it uses generated names
 --disable_view_protocol
-
 SET sql_mode=@mode;
 select @@sql_mode;
 SELECT '',CHARSET(''), null, CHARSET(null), CAST(null as char(10)), CHARSET(CAST(null as char(10))), 'x', CHARSET('x');
@@ -21,7 +19,6 @@ SELECT '',CHARSET(''), null, CHARSET(null), CAST(null as char(10)), CHARSET(CAST
 SELECT CHARSET(NULLIF('','')),NULLIF('','');
 
 
-
 --echo #
 --echo # Test NCHAR litteral
 --echo #
@@ -33,7 +30,6 @@ SELECT N'',CHARSET(N''), N'x', CHARSET(N'x');
 SELECT CHARSET(NULLIF(N'',N'')),NULLIF(N'',N'');
 
 
-
 --echo #
 --echo # Test CHARSET prefix litteral
 --echo #
@@ -63,12 +59,12 @@ SELECT '' '' '';
 SELECT '' '' '',CHARSET('' '' '');
 SELECT _latin1'' '' '',CHARSET(_latin1'' '' '');
 SELECT N'' '' '',CHARSET(N'' '' '');
-
 --enable_view_protocol
 
 --echo #
 --echo # UNION - implicit group by
 --echo #
+--disable_service_connection
 SELECT 1, null
 UNION
 SELECT 1 , ''
@@ -84,16 +80,10 @@ UNION
 SELECT 1 , _cp1250 ''
 ORDER BY 1;
 
-# it is necessary that the view protocol uses the same connection,
-# not util connection
---disable_view_protocol
-
 SELECT NULLIF(_cp1250 '',_cp1250 '')
 UNION
 SELECT NULLIF(N'',N'');
 
---enable_view_protocol
-
 --error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT 1 , _latin2 ''
 UNION
@@ -131,5 +121,4 @@ EXPLAIN EXTENDED SELECT '';
 EXPLAIN EXTENDED SELECT _latin1'';
 EXPLAIN EXTENDED SELECT N'';
 EXPLAIN EXTENDED SELECT '' '';
-
 --enable_service_connection
diff --git a/mysql-test/include/gis_debug.inc b/mysql-test/include/gis_debug.inc
index 813ae252070..993ed9a4a1a 100644
--- a/mysql-test/include/gis_debug.inc
+++ b/mysql-test/include/gis_debug.inc
@@ -119,28 +119,25 @@ CALL p1(-1, 'GeometryCollection(Point(9 9),LineString(1 5,0 0),Polygon((2 2,2 8,
 
 --enable_query_log
 
-#enable after fix MDEV-27871
---disable_view_protocol
 SELECT ST_CONTAINS(
   GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-  GeomFromText('POINT(5 10)'));
+  GeomFromText('POINT(5 10)')) as geom;
 SELECT AsText(ST_UNION(
   GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-  GeomFromText('POINT(5 10)')));
+  GeomFromText('POINT(5 10)'))) as geom;
 
 DROP PROCEDURE p1;
 
 --echo #
 --echo # Bug #13833019 ASSERTION `T1->RESULT_RANGE' FAILED IN GCALC_OPERATION_REDUCER::END_COUPLE
 --echo #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3));
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3)) as geom;
 
 --echo #
 --echo # Bug #13832749 	HANDLE_FATAL_SIGNAL IN GCALC_FUNCTION::COUNT_INTERNAL
 --echo #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1));
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1)) as geom;
 
---enable_view_protocol
 
 --echo #
 --echo # Bug#13358363 - ASSERTION: N > 0 && N < SINUSES_CALCULATED*2+1 | GET_N_SINCOS/ADD_EDGE_BUFFER
@@ -148,22 +145,19 @@ SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3
 
 DO ST_BUFFER(ST_GEOMCOLLFROMTEXT('linestring(1 1,2 2)'),'');
 
-#enable after fix MDEV-27871
---disable_view_protocol
 
 SELECT ST_WITHIN(
         LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
         ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) '),
-                  ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) '))));
+                  ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) ')))) as st;
 
 SELECT ST_DIMENSION(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((3 5,2 5,2 4,3 4,3 5)) '),
-                              ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))'))));
+                              ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))')))) as st;
 
 SELECT ST_NUMINTERIORRINGS(
        ST_ENVELOPE(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5))) '),
-                             SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) ')))));
+                             SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) '))))) as st;
 
 SELECT ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
-                        SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))));
+                        SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) ')))) as st;
 
---enable_view_protocol
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc
index 199fc9d3b2f..e7ae18d7d96 100644
--- a/mysql-test/include/index_merge1.inc
+++ b/mysql-test/include/index_merge1.inc
@@ -301,31 +301,28 @@ select count(*) from t0;
 
 # Test for BUG#4177
 
-# enable view-protocol after fix MDEV-27871
---disable_view_protocol
-
 drop table t4;
 create table t4 (a int);
 insert into t4 values (1),(4),(3);
 set @save_join_buffer_size=@@join_buffer_size;
 set join_buffer_size= 4096;
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
  from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
   where (A.key1 < 500000 or A.key2 < 3)
   and   (B.key1 < 500000 or B.key2 < 3);
 
-select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
  from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
   where (A.key1 < 500000 or A.key2 < 3)
   and   (B.key1 < 500000 or B.key2 < 3);
 
 update t0 set key1=1;
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
  from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
   where (A.key1 = 1 or A.key2 = 1)
   and   (B.key1 = 1 or B.key2 = 1);
 
-select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
  from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
   where (A.key1 = 1 or A.key2 = 1)
   and   (B.key1 = 1 or B.key2 = 1);
@@ -338,12 +335,12 @@ update t0 set key2=1, key3=1, key4=1, key5=1,key6=1,key7=1 where key7 < 500;
 # scan cost estimates depend on ha_myisam::ref_length)
 --replace_column 9 #
 --replace_result "4,4,4,4,4,4,4" X "4,4,4,4,4,4" X "i6,i7" "i6,i7?" "i6" "i6,i7?"
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
  from t0 as A straight_join t0 as B
  where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
   and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
 
-select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
  from t0 as A straight_join t0 as B
  where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
   and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
@@ -353,8 +350,6 @@ set join_buffer_size= @save_join_buffer_size;
 
 drop table t0, t1, t2, t3, t4;
 
---enable_view_protocol
-
 # BUG#16166
 CREATE TABLE t1 (
   cola char(3) not null, colb char(3) not null,  filler char(200),
diff --git a/mysql-test/include/log_slow_grep.inc b/mysql-test/include/log_slow_grep.inc
index 004c8ccefbc..28717e18123 100644
--- a/mysql-test/include/log_slow_grep.inc
+++ b/mysql-test/include/log_slow_grep.inc
@@ -21,5 +21,10 @@
 --source include/log_grep.inc
 
 # InnoDB/Engines
---let log_expected_matches = $log_slow_innodb_expected_matches
---let grep_pattern = ^# Pages_accessed: \d+  Pages_read: \d+  Pages_updated: \d+  Old_rows_read: \d+\n# Pages_read_time: \d+\.\d+  Engine_time: \d+\.\d+\$
+--let log_expected_matches = $log_slow_verbosity_innodb_expected_matches
+--let grep_pattern = ^# Pages_accessed: \d+  Pages_read: \d+  Pages_prefetched: \d+  Pages_updated: \d+  Old_rows_read: \d+\$
+--source include/log_grep.inc
+
+--let grep_pattern = ^# Pages_read_time: \d+\.\d+  Engine_time: \d+\.\d+\$
+--source include/log_grep.inc
+
diff --git a/mysql-test/include/rowid_filter_debug_kill.inc b/mysql-test/include/rowid_filter_debug_kill.inc
index 230bef6d10c..5c3ae214f02 100644
--- a/mysql-test/include/rowid_filter_debug_kill.inc
+++ b/mysql-test/include/rowid_filter_debug_kill.inc
@@ -51,5 +51,33 @@ disconnect con1;
 reap;
 set debug_sync='RESET';
 
+--echo #
+--echo # MDEV-30651: SIGSEGV in st_join_table::save_explain_data and
+--echo #             Assertion `sel->quick' failed in make_range_rowid_filters
+--echo #
+
+--echo # Reusing table t2 and t3 from previous test
+let $target_id= `select connection_id()`;
+
+set debug_sync='in_forced_range_optimize SIGNAL ready1 WAIT_FOR go1';
+send
+explain
+select straight_join * from t2, t3
+where
+  t3.key1=t2.a and t3.key2 between 2 and 10;
+
+connect (con1, localhost, root,,);
+set debug_sync='now WAIT_FOR ready1';
+evalp kill query $target_id;
+set debug_sync='now SIGNAL go1';
+
+connection default;
+disconnect con1;
+
+--error ER_QUERY_INTERRUPTED
+reap;
+set debug_sync='RESET';
+
+
 drop table t2,t3;
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/main/alter_table_online.result b/mysql-test/main/alter_table_online.result
index fb5f2abf984..dddcce31a41 100644
--- a/mysql-test/main/alter_table_online.result
+++ b/mysql-test/main/alter_table_online.result
@@ -260,4 +260,35 @@ rollback;
 connection default;
 drop table t1;
 disconnect con2;
+# MDEV-34164 Server crashes when executing OPTIMIZE or REPAIR TABLE for InnoDB temporary tables
+create temporary table t1 (i int) engine=innodb;
+create table t2 (i int) engine=aria ;
+optimize table t1,t2;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+test.t2	optimize	status	Table is already up to date
+drop table t1,t2;
+create temporary table t1 (f int) engine=innodb;
+create temporary table t2 (f int) engine=innodb;
+optimize local table t1,t2;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+test.t2	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t2	optimize	status	OK
+drop table t1,t2;
+set @save_sql_mode = @@sql_mode;
+set sql_mode= '';
+create temporary table t (c decimal zerofill,c2 int zerofill,c3 char binary,key(c)) engine=innodb;
+insert into t values (1,1,1);
+set session enforce_storage_engine=aria;
+optimize no_write_to_binlog table t;
+Table	Op	Msg_type	Msg_text
+test.t	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t	optimize	status	OK
+Warnings:
+Note	1266	Using storage engine Aria for table 't'
+drop table t;
+set sql_mode= @save_sql_mode;
 # End of 11.2 tests
diff --git a/mysql-test/main/alter_table_online.test b/mysql-test/main/alter_table_online.test
index 4d8f831186f..7843c90efd1 100644
--- a/mysql-test/main/alter_table_online.test
+++ b/mysql-test/main/alter_table_online.test
@@ -282,4 +282,25 @@ drop table t1;
 --disconnect con2
 --enable_view_protocol
 
+
+--echo # MDEV-34164 Server crashes when executing OPTIMIZE or REPAIR TABLE for InnoDB temporary tables
+create temporary table t1 (i int) engine=innodb;
+create table t2 (i int) engine=aria ;
+optimize table t1,t2;
+drop table t1,t2;
+
+create temporary table t1 (f int) engine=innodb;
+create temporary table t2 (f int) engine=innodb;
+optimize local table t1,t2;
+drop table t1,t2;
+
+set @save_sql_mode = @@sql_mode;
+set sql_mode= '';
+create temporary table t (c decimal zerofill,c2 int zerofill,c3 char binary,key(c)) engine=innodb;
+insert into t values (1,1,1);
+set session enforce_storage_engine=aria;
+optimize no_write_to_binlog table t;
+drop table t;
+set sql_mode= @save_sql_mode;
+
 --echo # End of 11.2 tests
diff --git a/mysql-test/main/analyze_engine_stats2.opt b/mysql-test/main/analyze_engine_stats2.opt
index a5bb9a93636..c33354be63a 100644
--- a/mysql-test/main/analyze_engine_stats2.opt
+++ b/mysql-test/main/analyze_engine_stats2.opt
@@ -1 +1 @@
---innodb_buffer_pool_dump_at_shutdown=off --innodb_buffer_pool_load_at_startup=off --innodb-stats-persistent=1  --innodb-stats-auto-recalc=off
+--innodb-buffer-pool-size=32M --innodb_buffer_pool_dump_at_shutdown=off --innodb_buffer_pool_load_at_startup=off --innodb-stats-persistent=1 --innodb-stats-auto-recalc=off
diff --git a/mysql-test/main/analyze_engine_stats2.result b/mysql-test/main/analyze_engine_stats2.result
index 8930b21689c..cdd88e9dddd 100644
--- a/mysql-test/main/analyze_engine_stats2.result
+++ b/mysql-test/main/analyze_engine_stats2.result
@@ -8,57 +8,20 @@ c varchar(255),
 d varchar(255),
 primary key(a,b,c,d)
 ) engine=innodb;
-SET STATEMENT unique_checks=0,foreign_key_checks=0 FOR
+SET unique_checks=0, foreign_key_checks= 0;
+begin;
 insert into t1 select
 repeat(uuid(), 7), 
 repeat(uuid(), 7), 
 repeat(uuid(), 7), 
 repeat(uuid(), 7)
 from seq_1_to_16384;
+commit;
 SET GLOBAL innodb_fast_shutdown=0;
 # restart
 set log_slow_verbosity='engine';
 set long_query_time=0.0;
 set @js='$analyze_output';
-select @js;
-@js
-{
-  "query_optimization": {
-    "r_total_time_ms": "REPLACED"
-  },
-  "query_block": {
-    "select_id": 1,
-    "cost": 0.011647987,
-    "r_loops": 1,
-    "r_total_time_ms": "REPLACED",
-    "nested_loop": [
-      {
-        "table": {
-          "table_name": "t1",
-          "access_type": "index",
-          "key": "PRIMARY",
-          "key_length": "1028",
-          "used_key_parts": ["a", "b", "c", "d"],
-          "loops": 1,
-          "r_loops": 1,
-          "rows": 1,
-          "r_rows": 16384,
-          "cost": 0.0110178,
-          "r_table_time_ms": "REPLACED",
-          "r_other_time_ms": "REPLACED",
-          "r_engine_stats": {
-            "pages_accessed": "REPLACED",
-            "pages_read_count": "REPLACED",
-            "pages_read_time_ms": "REPLACED"
-          },
-          "filtered": 100,
-          "r_total_filtered": 100,
-          "r_filtered": 100
-        }
-      }
-    ]
-  }
-}
 set @pages_read_time_ms=
 (select json_value(@js,'$.query_block.nested_loop[0].table.r_engine_stats.pages_read_time_ms'));
 
diff --git a/mysql-test/main/analyze_engine_stats2.test b/mysql-test/main/analyze_engine_stats2.test
index 36f6a76585e..67379d75751 100644
--- a/mysql-test/main/analyze_engine_stats2.test
+++ b/mysql-test/main/analyze_engine_stats2.test
@@ -18,15 +18,18 @@ create table t1 (
   primary key(a,b,c,d)
 ) engine=innodb;
 
+SET unique_checks=0, foreign_key_checks= 0;
+begin;
+
 # The data size is 160K * 1K = 160M 
 #  16M / (page_size=16K) = 1K pages.
-SET STATEMENT unique_checks=0,foreign_key_checks=0 FOR
 insert into t1 select
   repeat(uuid(), 7), 
   repeat(uuid(), 7), 
   repeat(uuid(), 7), 
   repeat(uuid(), 7)
 from seq_1_to_16384;
+commit;
 
 SET GLOBAL innodb_fast_shutdown=0;
 source include/restart_mysqld.inc;
@@ -37,10 +40,6 @@ let $analyze_output= `analyze format=json
 select * from t1 force index (PRIMARY) order by a desc, b desc, c desc, d desc`;
 evalp set @js='$analyze_output';
 
-# Print it out for user-friendlines
---replace_regex /("(r_[a-z_]*_time_ms|pages[^"]*)": )[^, \n]*/\1"REPLACED"/
-select @js;
-
 set @pages_read_time_ms=
   (select json_value(@js,'$.query_block.nested_loop[0].table.r_engine_stats.pages_read_time_ms'));
 
diff --git a/mysql-test/main/analyze_stmt_prefetch_count.opt b/mysql-test/main/analyze_stmt_prefetch_count.opt
new file mode 100644
index 00000000000..c33354be63a
--- /dev/null
+++ b/mysql-test/main/analyze_stmt_prefetch_count.opt
@@ -0,0 +1 @@
+--innodb-buffer-pool-size=32M --innodb_buffer_pool_dump_at_shutdown=off --innodb_buffer_pool_load_at_startup=off --innodb-stats-persistent=1 --innodb-stats-auto-recalc=off
diff --git a/mysql-test/main/analyze_stmt_prefetch_count.result b/mysql-test/main/analyze_stmt_prefetch_count.result
new file mode 100644
index 00000000000..e6f4ce1f714
--- /dev/null
+++ b/mysql-test/main/analyze_stmt_prefetch_count.result
@@ -0,0 +1,60 @@
+create table t1 (
+a varchar(255),
+b varchar(255),
+c varchar(255),
+d varchar(255),
+primary key(a,b,c,d)
+) engine=innodb;
+SET unique_checks=0, foreign_key_checks= 0;
+begin;
+insert into t1 select
+repeat(uuid(), 7), 
+repeat(uuid(), 7), 
+repeat(uuid(), 7), 
+repeat(uuid(), 7)
+from seq_1_to_16384;
+insert into t1 values ('z','z','z','z');
+commit;
+# Restart the server to make sure we have an empty InnoDB Buffer Pool 
+# (in the test's .opt file we've disabled buffer pool saving/loading 
+#  and also tried to disable any background activity)
+SET GLOBAL innodb_fast_shutdown=0;
+# restart
+set @innodb_pages_read0= 
+(select variable_value 
+from information_schema.session_status 
+where variable_name like 'innodb_pages_read');
+set @js='$analyze_output';
+set @js=json_extract(@js, '$.query_block.nested_loop[0].table.r_engine_stats');
+set @pages_accessed= cast(json_value(@js,'$.pages_accessed') as INT);
+set @pages_read_count= cast(json_value(@js,'$.pages_read_count') as INT);
+set @pages_prefetch_read_count= cast(json_value(@js,'$.pages_prefetch_read_count') as INT);
+select @pages_accessed > 1000 and @pages_accessed < 1500;
+@pages_accessed > 1000 and @pages_accessed < 1500
+1
+set @total_read = (@pages_read_count + @pages_prefetch_read_count);
+select @pages_accessed*0.75 < @total_read, @total_read < @pages_accessed*1.25;
+@pages_accessed*0.75 < @total_read	@total_read < @pages_accessed*1.25
+1	1
+set @innodb_pages_read1= 
+(select variable_value 
+from information_schema.session_status 
+where variable_name like 'innodb_pages_read');
+set @innodb_pages_read_incr= (@innodb_pages_read1 - @innodb_pages_read0);
+select @innodb_pages_read_incr > 1000, @innodb_pages_read_incr < 1500;
+@innodb_pages_read_incr > 1000	@innodb_pages_read_incr < 1500
+1	1
+set @js='$analyze_output';
+set @js=json_extract(@js, '$.query_block.nested_loop[0].table.r_engine_stats');
+# This must just print pages_accessed. No page reads or prefetch reads,
+# because the previous query has read all the needed pages into the
+# buffer pool, which is set to be large enough to accomodate the whole
+# table.
+select @js;
+@js
+{"pages_accessed": NUMBER}
+set @pages_accessed2= cast(json_value(@js,'$.pages_accessed') as INT);
+select @pages_accessed2 = @pages_accessed;
+@pages_accessed2 = @pages_accessed
+1
+drop table t1;
diff --git a/mysql-test/main/analyze_stmt_prefetch_count.test b/mysql-test/main/analyze_stmt_prefetch_count.test
new file mode 100644
index 00000000000..6859b15150b
--- /dev/null
+++ b/mysql-test/main/analyze_stmt_prefetch_count.test
@@ -0,0 +1,77 @@
+--source include/have_innodb.inc
+--source include/have_sequence.inc
+
+
+# Each row is 1K.
+create table t1 (
+  a varchar(255),
+  b varchar(255),
+  c varchar(255),
+  d varchar(255),
+  primary key(a,b,c,d)
+) engine=innodb;
+
+# The data size is 16K * 1K = 16M 
+#  16M / (page_size=16K) = 1K pages.
+SET unique_checks=0, foreign_key_checks= 0;
+begin;
+insert into t1 select
+  repeat(uuid(), 7), 
+  repeat(uuid(), 7), 
+  repeat(uuid(), 7), 
+  repeat(uuid(), 7)
+from seq_1_to_16384;
+insert into t1 values ('z','z','z','z');
+commit;
+
+--echo # Restart the server to make sure we have an empty InnoDB Buffer Pool 
+--echo # (in the test's .opt file we've disabled buffer pool saving/loading 
+--echo #  and also tried to disable any background activity)
+SET GLOBAL innodb_fast_shutdown=0;
+--source include/restart_mysqld.inc
+
+set @innodb_pages_read0= 
+  (select variable_value 
+   from information_schema.session_status 
+   where variable_name like 'innodb_pages_read');
+
+let $analyze_output= `analyze format=json 
+select * from t1 force index (PRIMARY) order by a,b,c,d`;
+evalp set @js='$analyze_output';
+
+set @js=json_extract(@js, '$.query_block.nested_loop[0].table.r_engine_stats');
+#select @js;
+set @pages_accessed= cast(json_value(@js,'$.pages_accessed') as INT);
+set @pages_read_count= cast(json_value(@js,'$.pages_read_count') as INT);
+set @pages_prefetch_read_count= cast(json_value(@js,'$.pages_prefetch_read_count') as INT);
+
+select @pages_accessed > 1000 and @pages_accessed < 1500;
+
+set @total_read = (@pages_read_count + @pages_prefetch_read_count);
+
+select @pages_accessed*0.75 < @total_read, @total_read < @pages_accessed*1.25;
+
+set @innodb_pages_read1= 
+  (select variable_value 
+   from information_schema.session_status 
+   where variable_name like 'innodb_pages_read');
+
+set @innodb_pages_read_incr= (@innodb_pages_read1 - @innodb_pages_read0);
+
+select @innodb_pages_read_incr > 1000, @innodb_pages_read_incr < 1500;
+
+let $analyze_output= `analyze format=json 
+select * from t1 force index (PRIMARY) order by a,b,c,d`;
+evalp set @js='$analyze_output';
+set @js=json_extract(@js, '$.query_block.nested_loop[0].table.r_engine_stats');
+
+--echo # This must just print pages_accessed. No page reads or prefetch reads,
+--echo # because the previous query has read all the needed pages into the
+--echo # buffer pool, which is set to be large enough to accomodate the whole
+--echo # table.
+--replace_regex /[0-9]+/NUMBER/
+select @js;
+set @pages_accessed2= cast(json_value(@js,'$.pages_accessed') as INT);
+
+select @pages_accessed2 = @pages_accessed;
+drop table t1;
diff --git a/mysql-test/main/bad_startup_options_debug.result b/mysql-test/main/bad_startup_options_debug.result
new file mode 100644
index 00000000000..626d9337d2b
--- /dev/null
+++ b/mysql-test/main/bad_startup_options_debug.result
@@ -0,0 +1,7 @@
+#
+# MDEV-34437 SIGSEGV in vio_get_normalized_ip when using extra-port
+#
+FOUND 1 /\[ERROR\] Can't create IP socket: Servname not supported/ in errorlog.err
+FOUND 1 /\[ERROR\] Can't create IP socket: Servname not supported/ in errorlog.err
+# restart
+# End of 10.11 tests
diff --git a/mysql-test/main/bad_startup_options_debug.test b/mysql-test/main/bad_startup_options_debug.test
new file mode 100644
index 00000000000..c43124eba39
--- /dev/null
+++ b/mysql-test/main/bad_startup_options_debug.test
@@ -0,0 +1,34 @@
+# mysqld refuses to run as root normally.
+--source include/not_as_root.inc
+--source include/have_debug.inc
+--source include/not_embedded.inc
+--source include/linux.inc
+
+--source include/shutdown_mysqld.inc
+
+# Try to start the server, with bad values for some options.
+# Make sure, the starts fails, and expected message is in the error log
+
+--let errorlog=$MYSQL_TMP_DIR/errorlog.err
+--let SEARCH_FILE=$errorlog
+
+--echo #
+--echo # MDEV-34437 SIGSEGV in vio_get_normalized_ip when using extra-port
+--echo #
+
+# getaddrinfo failure by fixing port to invalid value
+--error 1
+--exec $MYSQLD --defaults-group-suffix=.1 --defaults-file=$MYSQLTEST_VARDIR/my.cnf --debug='d,sabotage_port_number' --log-error=$errorlog
+--let SEARCH_PATTERN=\[ERROR\] Can't create IP socket: Servname not supported
+--source include/search_pattern_in_file.inc
+--remove_file $SEARCH_FILE
+
+--error 1
+--exec $MYSQLD --defaults-group-suffix=.1 --defaults-file=$MYSQLTEST_VARDIR/my.cnf --debug='d,sabotage_port_number' --bind-address=0.0.0.0 --log-error=$errorlog
+--let SEARCH_PATTERN=\[ERROR\] Can't create IP socket: Servname not supported
+--source include/search_pattern_in_file.inc
+--remove_file $SEARCH_FILE
+
+--source include/start_mysqld.inc
+
+--echo # End of 10.11 tests
diff --git a/mysql-test/main/create_or_replace.result b/mysql-test/main/create_or_replace.result
index 4bc0afe91d5..71dad47f7a1 100644
--- a/mysql-test/main/create_or_replace.result
+++ b/mysql-test/main/create_or_replace.result
@@ -261,83 +261,90 @@ create table test.t1 (i int) engine=myisam;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
 InnoDB		0 transactions not purged
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	mysqltest2	
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	mysqltest2	t2
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
 create or replace table test.t1;
 ERROR 42000: A table must have at least 1 column
 show tables;
 Tables_in_test
 t2
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	mysqltest2	
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	mysqltest2	t2
 create or replace table mysqltest2.t2;
 ERROR 42000: A table must have at least 1 column
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 create table t1 (i int);
 drop table t1;
 create table test.t1 (i int);
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	mysqltest2	
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	mysqltest2	t2
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
 create or replace table test.t1 (a int) select 1 as 'a', 2 as 'a';
 ERROR 42S21: Duplicate column name 'a'
 show tables;
 Tables_in_test
 t2
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	mysqltest2	
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	mysqltest2	t2
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	mysqltest2	
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	mysqltest2	t2
 create or replace table mysqltest2.t2 (a int) select 1 as 'a', 2 as 'a';
 ERROR 42S21: Duplicate column name 'a'
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 create table t1 (i int);
 drop table t1;
 create table test.t1 (i int) engine=innodb;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	mysqltest2	
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	mysqltest2	t2
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
 unlock tables;
 drop table test.t1,mysqltest2.t2;
 create table test.t1 (i int) engine=aria transactional=1 checksum=1;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	mysqltest2	
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	mysqltest2	t2
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
 unlock tables;
 drop table t1;
 create table test.t1 (i int);
@@ -348,19 +355,19 @@ drop table test.t1;
 #
 create table t1 (i int);
 lock table t1 write;
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
 create or replace table t1 (a char(1)) engine=Innodb select 'foo' as a;
 ERROR 22001: Data too long for column 'a' at row 1
 show tables;
 Tables_in_test
 t2
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 create table t1 (i int);
 drop table t1;
 #
@@ -447,37 +454,37 @@ drop view t1;
 #
 create table t1 (a int);
 lock table t1 write, t2 read;
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
-#	MDL_SHARED_READ	NULL	Table metadata lock	test	t2
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
+MDL_SHARED_READ	Table metadata lock	test	t2
 create or replace table t1 (i int);
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
-#	MDL_SHARED_READ	NULL	Table metadata lock	test	t2
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
+MDL_SHARED_READ	Table metadata lock	test	t2
 create or replace table t1 like t2;
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
-#	MDL_SHARED_READ	NULL	Table metadata lock	test	t2
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
+MDL_SHARED_READ	Table metadata lock	test	t2
 create or replace table t1 select 1 as f1;
-select * from information_schema.metadata_lock_info;
-THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
-#	MDL_SHARED_READ	NULL	Table metadata lock	test	t2
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
+LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
+MDL_BACKUP_DDL	Backup lock		
+MDL_BACKUP_DML	Backup lock		
+MDL_INTENTION_EXCLUSIVE	Schema metadata lock	test	
+MDL_SHARED_NO_READ_WRITE	Table metadata lock	test	t1
+MDL_SHARED_READ	Table metadata lock	test	t2
 drop table t1;
 unlock tables;
 #
diff --git a/mysql-test/main/create_or_replace.test b/mysql-test/main/create_or_replace.test
index 7c83f3e27a6..05af75b61b7 100644
--- a/mysql-test/main/create_or_replace.test
+++ b/mysql-test/main/create_or_replace.test
@@ -217,58 +217,51 @@ create table test.t1 (i int) engine=myisam;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
 --source ../suite/innodb/include/wait_all_purged.inc
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 --error ER_TABLE_MUST_HAVE_COLUMNS
 create or replace table test.t1;
 show tables;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 --error ER_TABLE_MUST_HAVE_COLUMNS
 create or replace table mysqltest2.t2;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 create table t1 (i int);
 drop table t1;
 
 create table test.t1 (i int);
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 --error ER_DUP_FIELDNAME
 create or replace table test.t1 (a int) select 1 as 'a', 2 as 'a';
 show tables;
---replace_column 1 #
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 --error ER_DUP_FIELDNAME
 create or replace table mysqltest2.t2 (a int) select 1 as 'a', 2 as 'a';
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 create table t1 (i int);
 drop table t1;
 
 create table test.t1 (i int) engine=innodb;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 unlock tables;
 drop table test.t1,mysqltest2.t2;
 
 create table test.t1 (i int) engine=aria transactional=1 checksum=1;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 unlock tables;
 drop table t1;
 
@@ -282,15 +275,13 @@ drop table test.t1;
 --echo #
 create table t1 (i int);
 lock table t1 write;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 --error ER_DATA_TOO_LONG
 create or replace table t1 (a char(1)) engine=Innodb select 'foo' as a;
 show tables;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 create table t1 (i int);
 drop table t1;
 --enable_view_protocol
@@ -366,22 +357,18 @@ drop view t1;
 
 create table t1 (a int);
 lock table t1 write, t2 read;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 
 create or replace table t1 (i int);
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 create or replace table t1 like t2;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 create or replace table t1 select 1 as f1;
---replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info;
+select LOCK_MODE,LOCK_TYPE, TABLE_SCHEMA,TABLE_NAME from information_schema.metadata_lock_info;
 drop table t1;
 unlock tables;
 
diff --git a/mysql-test/main/cset_narrowing.test b/mysql-test/main/cset_narrowing.test
index 4b97c4f061f..6f2606ccf0b 100644
--- a/mysql-test/main/cset_narrowing.test
+++ b/mysql-test/main/cset_narrowing.test
@@ -92,11 +92,14 @@ set optimizer_trace=1;
 explain
 select * from t10, t1 where t10.mb4=t1.mb3 and t10.pk=3;
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 --source include/explain-no-costs.inc
 select
   json_detailed(json_extract(trace, '$**.range_scan_alternatives')) as JS
 from
   information_schema.optimizer_trace;
+--enable_view_protocol
 
 select * from t10, t1 where t10.mb4=t1.mb3 and t10.pk=3;
 
@@ -129,6 +132,8 @@ select * from t10, t2 where t2.mb4>t10.mb4 and t10.pk=3;
 
 --echo # - ref acccess lookup keys do use equality substitution,
 --echo # - concat() arguments don't
+#Enable after fix MDEV-32034
+--disable_view_protocol
 --source include/explain-no-costs.inc
 explain format=json
 select straight_join * from t10,t1 force index(mb3),t2
@@ -136,6 +141,7 @@ where
   t1.mb3=t2.mb4 and t2.mb4=t10.mb4 and concat(t1.mb3, t2.mb4, t10.mb4)<>'Bebebe';
 select json_detailed(json_extract(trace, '$**.condition_processing')) as JS
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 select straight_join * from t10,t1 force index(mb3),t2
 where
@@ -150,8 +156,11 @@ where
   t1.mb3=t2.mb4 and t2.mb4=t10.mb4 and t10.mb4='hello' and
   concat(t1.mb3, t2.mb4, t10.mb4)<>'Bebebe';
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select json_detailed(json_extract(trace, '$**.condition_processing')) as JS
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 drop table t2;
 drop table t1, t10;
diff --git a/mysql-test/main/ctype_big5.result b/mysql-test/main/ctype_big5.result
index 234897b08fe..cde970373eb 100644
--- a/mysql-test/main/ctype_big5.result
+++ b/mysql-test/main/ctype_big5.result
@@ -5115,20 +5115,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5253,20 +5253,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5392,20 +5392,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5530,20 +5530,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_binary.result b/mysql-test/main/ctype_binary.result
index 18fd5d4d738..7cce072e296 100644
--- a/mysql-test/main/ctype_binary.result
+++ b/mysql-test/main/ctype_binary.result
@@ -1131,8 +1131,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1141,8 +1141,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))));
-hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))))
+select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1151,8 +1151,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 30
 create table t1 as select concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1161,8 +1161,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))));
-hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))))
+select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')))) as exp;
+exp
 31
 create table t1 as select concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))) as c1;
 show create table t1;
@@ -1171,8 +1171,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))));
-hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsEmpty(GeomFromText('POINT(1 1)')))) as exp;
+exp
 30
 create table t1 as select concat(IsEmpty(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -1181,8 +1181,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(21) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
-hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsSimple(GeomFromText('POINT(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -1191,8 +1191,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))));
-hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))))
+select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)')))) as exp;
+exp
 30
 create table t1 as select concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))) as c1;
 show create table t1;
@@ -1201,13 +1201,13 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))));
-hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))))
+select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))) as c1;
 drop table t1;
-select hex(concat(x(GeomFromText('Point(1 2)'))));
-hex(concat(x(GeomFromText('Point(1 2)'))))
+select hex(concat(x(GeomFromText('Point(1 2)')))) as exp;
+exp
 31
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1216,8 +1216,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(y(GeomFromText('Point(1 2)'))));
-hex(concat(y(GeomFromText('Point(1 2)'))))
+select hex(concat(y(GeomFromText('Point(1 2)')))) as exp;
+exp
 32
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1226,8 +1226,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))));
-hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))))
+select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)')))) as exp;
+exp
 31
 create table t1 as select concat(GLength(GeomFromText('LineString(1 2, 2 2)'))) as c1;
 show create table t1;
@@ -1236,8 +1236,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))));
-hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))))
+select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))')))) as exp;
+exp
 31
 create table t1 as select concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))) as c1;
 show create table t1;
@@ -1246,8 +1246,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GeometryType(GeomFromText('Point(1 2)'))));
-hex(concat(GeometryType(GeomFromText('Point(1 2)'))))
+select hex(concat(GeometryType(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E54
 create table t1 as select concat(GeometryType(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1256,8 +1256,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(AsText(GeomFromText('Point(1 2)'))));
-hex(concat(AsText(GeomFromText('Point(1 2)'))))
+select hex(concat(AsText(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E542831203229
 create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1526,8 +1526,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')));
-hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')))
+select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00'))) as exp;
+exp
 32343A30303A3030
 create table t1 as select concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')) as c1;
 show create table t1;
@@ -1566,8 +1566,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(19) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')));
-hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')))
+select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00'))) as exp;
+exp
 323030332D31322D33312032303A30303A3030
 create table t1 as select concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')) as c1;
 show create table t1;
@@ -1576,8 +1576,8 @@ t1	CREATE TABLE `t1` (
   `c1` varbinary(19) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)));
-hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)))
+select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day))) as exp;
+exp
 323030342D30312D30322031323A30303A3030
 create table t1 as select concat(date_add('2004-01-01 12:00:00', interval 1 day)) as c1;
 show create table t1;
diff --git a/mysql-test/main/ctype_binary.test b/mysql-test/main/ctype_binary.test
index b7a0c3deb4e..26618ec235b 100644
--- a/mysql-test/main/ctype_binary.test
+++ b/mysql-test/main/ctype_binary.test
@@ -1,7 +1,3 @@
-
-#remove this include after fix MDEV-27871
---source include/no_view_protocol.inc
-
 set names binary;
 
 --source include/ctype_numconv.inc
@@ -234,22 +230,30 @@ SET NAMES latin1,character_set_connection=binary;
 --echo # Binary format, binary result
 SELECT DATE_FORMAT('2004-02-02','%W');
 SELECT HEX(DATE_FORMAT('2004-02-02','%W'));
+#Enable after fix MDEV-33936
+--disable_view_protocol
 SELECT DATE_FORMAT(TIME'-01:01:01','%h');
 SELECT HEX(DATE_FORMAT(TIME'-01:01:01','%h'));
+--enable_view_protocol
 
 --echo # latin1 format, binary result
 SELECT DATE_FORMAT('2004-02-02',_latin1'%W');
 SELECT HEX(DATE_FORMAT('2004-02-02',_latin1'%W'));
+#Enable after fix MDEV-33936
+--disable_view_protocol
 SELECT DATE_FORMAT(TIME'-01:01:01',_latin1'%h');
 SELECT HEX(DATE_FORMAT(TIME'-01:01:01',_latin1'%h'));
+--enable_view_protocol
 
 --echo # Binary format, latin1 result
 SET NAMES latin1;
 SELECT DATE_FORMAT('2004-02-02',_binary'%W');
 SELECT HEX(DATE_FORMAT('2004-02-02',_binary'%W'));
+#Enable after fix MDEV-33936
+--disable_view_protocol
 SELECT DATE_FORMAT(TIME'-01:01:01',_binary'%h');
 SELECT HEX(DATE_FORMAT(TIME'-01:01:01',_binary'%h'));
-
+--enable_view_protocol
 --echo #
 --echo # End of 10.4 tests
 --echo #
diff --git a/mysql-test/main/ctype_collate_context.result b/mysql-test/main/ctype_collate_context.result
index a00ab43992f..befeffd47a8 100644
--- a/mysql-test/main/ctype_collate_context.result
+++ b/mysql-test/main/ctype_collate_context.result
@@ -3718,3 +3718,103 @@ DROP PROCEDURE p;
 #
 # End of 10.9 tests
 #
+#
+# Start of 10.11 tests
+#
+#
+# MDEV-10865 COLLATE keyword doesn't work in PREPARE query
+#
+SET NAMES utf8mb4;
+#
+# A context collation and an explicit NULL
+#
+SELECT NULL COLLATE uca1400_ai_ci;
+ERROR HY000: 'NULL' is not allowed in this context
+SELECT CONCAT(NULL) COLLATE uca1400_ai_ci;
+ERROR HY000: 'NULL' is not allowed in this context
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT NULL COLLATE uca1400_ai_ci AS c1';
+ERROR HY000: 'NULL' is not allowed in this context
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE uca1400_ai_ci AS c1';
+ERROR HY000: 'NULL' is not allowed in this context
+#
+# A context collation and a parameter bound to NULL
+#
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING NULL;
+ERROR HY000: 'NULL' is not allowed in this context
+EXECUTE stmt USING CONCAT(NULL);
+ERROR HY000: 'NULL' is not allowed in this context
+EXECUTE stmt USING NULL COLLATE uca1400_ai_ci;
+ERROR HY000: 'NULL' is not allowed in this context
+EXECUTE stmt USING CONCAT(NULL) COLLATE uca1400_ai_ci;
+ERROR HY000: 'NULL' is not allowed in this context
+#
+# A context collation and CONVERT(NULL USING ...)
+#
+EXECUTE stmt USING CONVERT(NULL USING utf8mb4);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+EXECUTE stmt USING CONVERT(NULL USING utf8mb4) COLLATE uca1400_ai_ci;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+EXECUTE stmt USING CONVERT(NULL USING binary);
+ERROR 42000: COLLATION 'uca1400_ai_ci' is not valid for CHARACTER SET 'binary'
+EXECUTE stmt USING CONVERT(NULL USING latin1);
+ERROR 42000: COLLATION 'uca1400_ai_ci' is not valid for CHARACTER SET 'latin1'
+#
+# A context collation and an expression with a parameter
+# whose character does not get resolved when bound to a not-NULL value
+#
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT LEFT(NULL,?) COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING NULL;
+ERROR HY000: 'NULL' is not allowed in this context
+#
+# A context collation and an expression with a parameter
+# whose character set gets resolved when bound to a not-NULL value
+#
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING 1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING _binary'test';
+ERROR 42000: COLLATION 'uca1400_ai_ci' is not valid for CHARACTER SET 'binary'
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING 'test' COLLATE utf8mb4_bin;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING _latin1'test' COLLATE latin1_bin;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+#
+# End of 10.11 tests
+#
diff --git a/mysql-test/main/ctype_collate_context.test b/mysql-test/main/ctype_collate_context.test
index 38f15d55d0a..9363c2ba2b1 100644
--- a/mysql-test/main/ctype_collate_context.test
+++ b/mysql-test/main/ctype_collate_context.test
@@ -404,3 +404,103 @@ DROP PROCEDURE p;
 --echo #
 --echo # End of 10.9 tests
 --echo #
+
+--echo #
+--echo # Start of 10.11 tests
+--echo #
+
+--echo #
+--echo # MDEV-10865 COLLATE keyword doesn't work in PREPARE query
+--echo #
+
+SET NAMES utf8mb4;
+
+--echo #
+--echo # A context collation and an explicit NULL
+--echo #
+
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+SELECT NULL COLLATE uca1400_ai_ci;
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+SELECT CONCAT(NULL) COLLATE uca1400_ai_ci;
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT NULL COLLATE uca1400_ai_ci AS c1';
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE uca1400_ai_ci AS c1';
+
+
+--echo #
+--echo # A context collation and a parameter bound to NULL
+--echo #
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+EXECUTE stmt USING NULL;
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+EXECUTE stmt USING CONCAT(NULL);
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+EXECUTE stmt USING NULL COLLATE uca1400_ai_ci;
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+EXECUTE stmt USING CONCAT(NULL) COLLATE uca1400_ai_ci;
+
+--echo #
+--echo # A context collation and CONVERT(NULL USING ...)
+--echo #
+
+EXECUTE stmt USING CONVERT(NULL USING utf8mb4);
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+EXECUTE stmt USING CONVERT(NULL USING utf8mb4) COLLATE uca1400_ai_ci;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+--error ER_COLLATION_CHARSET_MISMATCH
+EXECUTE stmt USING CONVERT(NULL USING binary);
+
+--error ER_COLLATION_CHARSET_MISMATCH
+EXECUTE stmt USING CONVERT(NULL USING latin1);
+
+--echo #
+--echo # A context collation and an expression with a parameter
+--echo # whose character does not get resolved when bound to a not-NULL value
+--echo #
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT LEFT(NULL,?) COLLATE uca1400_ai_ci AS c1';
+--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
+EXECUTE stmt USING NULL;
+
+
+--echo #
+--echo # A context collation and an expression with a parameter
+--echo # whose character set gets resolved when bound to a not-NULL value
+--echo #
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING 1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+--error ER_COLLATION_CHARSET_MISMATCH
+EXECUTE stmt USING _binary'test';
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING 'test' COLLATE utf8mb4_bin;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE uca1400_ai_ci AS c1';
+EXECUTE stmt USING _latin1'test' COLLATE latin1_bin;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+
+--echo #
+--echo # End of 10.11 tests
+--echo #
diff --git a/mysql-test/main/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result
index c29837da0cd..94bc9cb8e08 100644
--- a/mysql-test/main/ctype_cp1251.result
+++ b/mysql-test/main/ctype_cp1251.result
@@ -1543,8 +1543,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1553,8 +1553,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))));
-hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))))
+select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1563,8 +1563,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 30
 create table t1 as select concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1573,8 +1573,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))));
-hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))))
+select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')))) as exp;
+exp
 31
 create table t1 as select concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))) as c1;
 show create table t1;
@@ -1583,8 +1583,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))));
-hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsEmpty(GeomFromText('POINT(1 1)')))) as exp;
+exp
 30
 create table t1 as select concat(IsEmpty(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -1593,8 +1593,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(21) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
-hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsSimple(GeomFromText('POINT(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -1603,8 +1603,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))));
-hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))))
+select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)')))) as exp;
+exp
 30
 create table t1 as select concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))) as c1;
 show create table t1;
@@ -1613,13 +1613,13 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))));
-hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))))
+select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))) as c1;
 drop table t1;
-select hex(concat(x(GeomFromText('Point(1 2)'))));
-hex(concat(x(GeomFromText('Point(1 2)'))))
+select hex(concat(x(GeomFromText('Point(1 2)')))) as exp;
+exp
 31
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1628,8 +1628,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(y(GeomFromText('Point(1 2)'))));
-hex(concat(y(GeomFromText('Point(1 2)'))))
+select hex(concat(y(GeomFromText('Point(1 2)')))) as exp;
+exp
 32
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1638,8 +1638,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))));
-hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))))
+select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)')))) as exp;
+exp
 31
 create table t1 as select concat(GLength(GeomFromText('LineString(1 2, 2 2)'))) as c1;
 show create table t1;
@@ -1648,8 +1648,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))));
-hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))))
+select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))')))) as exp;
+exp
 31
 create table t1 as select concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))) as c1;
 show create table t1;
@@ -1658,8 +1658,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GeometryType(GeomFromText('Point(1 2)'))));
-hex(concat(GeometryType(GeomFromText('Point(1 2)'))))
+select hex(concat(GeometryType(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E54
 create table t1 as select concat(GeometryType(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1668,8 +1668,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(20) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(AsText(GeomFromText('Point(1 2)'))));
-hex(concat(AsText(GeomFromText('Point(1 2)'))))
+select hex(concat(AsText(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E542831203229
 create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1938,8 +1938,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')));
-hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')))
+select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00'))) as exp;
+exp
 32343A30303A3030
 create table t1 as select concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')) as c1;
 show create table t1;
@@ -1978,8 +1978,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')));
-hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')))
+select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00'))) as exp;
+exp
 323030332D31322D33312032303A30303A3030
 create table t1 as select concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')) as c1;
 show create table t1;
@@ -1988,8 +1988,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) CHARACTER SET cp1251 COLLATE cp1251_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)));
-hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)))
+select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day))) as exp;
+exp
 323030342D30312D30322031323A30303A3030
 create table t1 as select concat(date_add('2004-01-01 12:00:00', interval 1 day)) as c1;
 show create table t1;
diff --git a/mysql-test/main/ctype_cp932.result b/mysql-test/main/ctype_cp932.result
index a66bf1da027..f8d83463f26 100644
--- a/mysql-test/main/ctype_cp932.result
+++ b/mysql-test/main/ctype_cp932.result
@@ -135,20 +135,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp932_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp932_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp932_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -273,20 +273,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp932_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp932_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp932_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp932_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp932_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -412,20 +412,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp932_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp932_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp932_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp932_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp932_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp932_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp932_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp932_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp932_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp932_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp932_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -550,20 +550,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp932_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp932_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp932_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp932_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp932_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp932_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp932_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp932_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp932_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp932_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp932_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp932_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_cp932.test b/mysql-test/main/ctype_cp932.test
index 3d0306884df..2ccbe8f1582 100644
--- a/mysql-test/main/ctype_cp932.test
+++ b/mysql-test/main/ctype_cp932.test
@@ -4,9 +4,6 @@
 --echo #               USED.
 --echo #
 
-#remove this include in 10.6 version
---source include/no_view_protocol.inc
-
 SET @old_character_set_client= @@character_set_client;
 SET @old_character_set_connection= @@character_set_connection;
 SET @old_character_set_results= @@character_set_results;
diff --git a/mysql-test/main/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result
index ea8824584d8..4cd17378e2a 100644
--- a/mysql-test/main/ctype_eucjpms.result
+++ b/mysql-test/main/ctype_eucjpms.result
@@ -34304,20 +34304,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'eucjpms_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'eucjpms_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'eucjpms_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -34442,20 +34442,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'eucjpms_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'eucjpms_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'eucjpms_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'eucjpms_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -34581,20 +34581,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'eucjpms_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'eucjpms_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'eucjpms_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'eucjpms_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'eucjpms_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'eucjpms_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'eucjpms_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'eucjpms_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'eucjpms_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -34719,20 +34719,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'eucjpms_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'eucjpms_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'eucjpms_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'eucjpms_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'eucjpms_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'eucjpms_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'eucjpms_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'eucjpms_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'eucjpms_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'eucjpms_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_euckr.result b/mysql-test/main/ctype_euckr.result
index 8de90f89a26..936de3631e4 100644
--- a/mysql-test/main/ctype_euckr.result
+++ b/mysql-test/main/ctype_euckr.result
@@ -25817,20 +25817,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'euckr_korean_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'euckr_korean_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'euckr_korean_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -25955,20 +25955,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'euckr_korean_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'euckr_korean_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'euckr_korean_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'euckr_korean_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'euckr_korean_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -26094,20 +26094,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'euckr_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'euckr_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'euckr_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'euckr_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'euckr_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'euckr_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'euckr_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'euckr_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'euckr_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'euckr_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'euckr_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -26232,20 +26232,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'euckr_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'euckr_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'euckr_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'euckr_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'euckr_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'euckr_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'euckr_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'euckr_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'euckr_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'euckr_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'euckr_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'euckr_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result
index 163364d4bc4..432b38a4752 100644
--- a/mysql-test/main/ctype_gb2312.result
+++ b/mysql-test/main/ctype_gb2312.result
@@ -4805,20 +4805,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gb2312_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gb2312_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gb2312_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4943,20 +4943,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gb2312_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gb2312_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gb2312_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gb2312_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5082,20 +5082,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gb2312_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gb2312_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gb2312_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gb2312_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gb2312_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gb2312_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gb2312_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gb2312_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gb2312_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5220,20 +5220,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gb2312_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gb2312_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gb2312_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gb2312_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gb2312_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gb2312_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gb2312_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gb2312_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gb2312_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gb2312_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result
index 3c5e59ba756..85e5cccb08b 100644
--- a/mysql-test/main/ctype_gbk.result
+++ b/mysql-test/main/ctype_gbk.result
@@ -6271,20 +6271,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gbk_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gbk_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gbk_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6409,20 +6409,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gbk_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gbk_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gbk_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gbk_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gbk_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6548,20 +6548,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gbk_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gbk_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gbk_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gbk_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gbk_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gbk_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gbk_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gbk_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gbk_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gbk_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gbk_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6686,20 +6686,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'gbk_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'gbk_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'gbk_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'gbk_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'gbk_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'gbk_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'gbk_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'gbk_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'gbk_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'gbk_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'gbk_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'gbk_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_gbk.test b/mysql-test/main/ctype_gbk.test
index 355638340f6..5ef4d349687 100644
--- a/mysql-test/main/ctype_gbk.test
+++ b/mysql-test/main/ctype_gbk.test
@@ -449,13 +449,10 @@ DROP TABLE t1;
 --echo #
 --echo # MDEV-7661 Unexpected result for: CAST(0xHHHH AS CHAR CHARACTER SET xxx) for incorrect byte sequences
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
 set sql_mode='';
 SELECT HEX(CAST(0xA341 AS CHAR CHARACTER SET gb2312)) as exp;
 SELECT HEX(CONVERT(CAST(0xA341 AS CHAR CHARACTER SET gb2312) USING utf8)) as exp;
 set sql_mode=default;
---enable_view_protocol
 
 --echo #
 --echo # End of 10.1 tests
diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result
index 4ba393f3918..e67822df983 100644
--- a/mysql-test/main/ctype_latin1.result
+++ b/mysql-test/main/ctype_latin1.result
@@ -518,8 +518,8 @@ SELECT '\%b' LIKE '%\%';
 SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
 @@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
 latin1	F7
-SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
-STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR)) as exp;
+exp
 2001-01-01
 CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
 SHOW COLUMNS FROM t1;
@@ -1852,8 +1852,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1862,8 +1862,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))));
-hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))))
+select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1872,8 +1872,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 30
 create table t1 as select concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -1882,8 +1882,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))));
-hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))))
+select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')))) as exp;
+exp
 31
 create table t1 as select concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))) as c1;
 show create table t1;
@@ -1892,8 +1892,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))));
-hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsEmpty(GeomFromText('POINT(1 1)')))) as exp;
+exp
 30
 create table t1 as select concat(IsEmpty(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -1902,8 +1902,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(21) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
-hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsSimple(GeomFromText('POINT(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -1912,8 +1912,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))));
-hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))))
+select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)')))) as exp;
+exp
 30
 create table t1 as select concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))) as c1;
 show create table t1;
@@ -1922,13 +1922,13 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))));
-hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))))
+select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))) as c1;
 drop table t1;
-select hex(concat(x(GeomFromText('Point(1 2)'))));
-hex(concat(x(GeomFromText('Point(1 2)'))))
+select hex(concat(x(GeomFromText('Point(1 2)')))) as exp;
+exp
 31
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1937,8 +1937,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(y(GeomFromText('Point(1 2)'))));
-hex(concat(y(GeomFromText('Point(1 2)'))))
+select hex(concat(y(GeomFromText('Point(1 2)')))) as exp;
+exp
 32
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1947,8 +1947,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))));
-hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))))
+select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)')))) as exp;
+exp
 31
 create table t1 as select concat(GLength(GeomFromText('LineString(1 2, 2 2)'))) as c1;
 show create table t1;
@@ -1957,8 +1957,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))));
-hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))))
+select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))')))) as exp;
+exp
 31
 create table t1 as select concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))) as c1;
 show create table t1;
@@ -1967,8 +1967,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GeometryType(GeomFromText('Point(1 2)'))));
-hex(concat(GeometryType(GeomFromText('Point(1 2)'))))
+select hex(concat(GeometryType(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E54
 create table t1 as select concat(GeometryType(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -1977,8 +1977,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(AsText(GeomFromText('Point(1 2)'))));
-hex(concat(AsText(GeomFromText('Point(1 2)'))))
+select hex(concat(AsText(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E542831203229
 create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -2247,8 +2247,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')));
-hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')))
+select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00'))) as exp;
+exp
 32343A30303A3030
 create table t1 as select concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')) as c1;
 show create table t1;
@@ -2287,8 +2287,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')));
-hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')))
+select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00'))) as exp;
+exp
 323030332D31322D33312032303A30303A3030
 create table t1 as select concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')) as c1;
 show create table t1;
@@ -2297,8 +2297,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)));
-hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)))
+select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day))) as exp;
+exp
 323030342D30312D30322031323A30303A3030
 create table t1 as select concat(date_add('2004-01-01 12:00:00', interval 1 day)) as c1;
 show create table t1;
@@ -8405,20 +8405,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8543,20 +8543,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8682,20 +8682,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8820,20 +8820,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_latin1.test b/mysql-test/main/ctype_latin1.test
index 56463890f70..290eec2edc4 100644
--- a/mysql-test/main/ctype_latin1.test
+++ b/mysql-test/main/ctype_latin1.test
@@ -139,8 +139,10 @@ select hex(cast(_ascii 0x7f as char(1) character set latin1));
 --echo #
 --echo # Bug#58022 ... like ... escape export_set ( ... ) crashes when export_set returns warnings
 --echo #
+#view-protocol doubles warning message
+--disable_view_protocol
 SELECT '' LIKE '' ESCAPE EXPORT_SET(1, 1, 1, 1, '');
-
+--enable_view_protocol
 --echo End of 5.1 tests
 
                                                                                
@@ -223,6 +225,8 @@ SET NAMES latin1 COLLATE latin1_bin;
 --echo # MDEV-6752 Trailing incomplete characters are not replaced to question marks on conversion
 --echo #
 SET NAMES utf8, character_set_connection=latin1;
+
+--disable_service_connection
 SELECT '�';
 SELECT HEX('�');
 SELECT HEX(CAST('�' AS CHAR CHARACTER SET utf8));
@@ -241,6 +245,7 @@ INSERT IGNORE INTO t1 VALUES ('
 SHOW WARNINGS;
 SELECT HEX(a),a FROM t1;
 DROP TABLE t1;
+--enable_service_connection
 
 --echo #
 --echo # MDEV-7629 Regression: Bit and hex string literals changed column names in 10.0.14
diff --git a/mysql-test/main/ctype_ldml.result b/mysql-test/main/ctype_ldml.result
index 31508fcd1b1..c5024a66d0b 100644
--- a/mysql-test/main/ctype_ldml.result
+++ b/mysql-test/main/ctype_ldml.result
@@ -83,50 +83,50 @@ select * from t1 where c1='b';
 c1
 a
 drop table t1;
-SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_ci));
-hex(weight_string(_utf8mb4'a' collate utf8mb4_test_ci))
+SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_ci)) as exp;
+exp
 120F
-SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 314A
-SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a));
-hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci)	hex(lower(@a))
+SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a)) as exp;
+hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci)	exp
 F0909080	F09090A8
-SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a));
-hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_ci)	hex(upper(@a))
+SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a)) as exp;
+hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_ci)	exp
 F09090A8	F0909080
-SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a));
-hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_ci)	hex(lower(@a))
+SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a)) as exp;
+hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_ci)	exp
 E2B080	E2B0B0
-SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a));
-hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_ci)	hex(upper(@a))
+SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a)) as exp;
+hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_ci)	exp
 E2B0B0	E2B080
-SELECT hex(weight_string(convert(_utf32 0x61 using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_utf32 0x61 using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_utf32 0x61 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 120F
-SELECT hex(weight_string(convert(_utf32 0x62 using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_utf32 0x62 using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_utf32 0x62 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 120F
-SELECT hex(weight_string(convert(_utf32 0x10062 using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_utf32 0x10062 using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_utf32 0x10062 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 120F
-SELECT hex(weight_string(convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 30D2
-SELECT hex(weight_string(convert(_utf32 0x100400 using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_utf32 0x100400 using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_utf32 0x100400 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 30D2
-SELECT hex(weight_string(_utf8mb4 0x64 collate utf8mb4_test_ci));
-hex(weight_string(_utf8mb4 0x64 collate utf8mb4_test_ci))
+SELECT hex(weight_string(_utf8mb4 0x64 collate utf8mb4_test_ci)) as exp;
+exp
 1250
-SELECT hex(weight_string(convert(_ucs2 0x0064017e using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_ucs2 0x0064017e using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_ucs2 0x0064017e using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 1251
-SELECT hex(weight_string(convert(_ucs2 0x0044017e using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_ucs2 0x0044017e using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_ucs2 0x0044017e using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 1251
-SELECT hex(weight_string(convert(_ucs2 0x0044017d using utf8mb4) collate utf8mb4_test_ci));
-hex(weight_string(convert(_ucs2 0x0044017d using utf8mb4) collate utf8mb4_test_ci))
+SELECT hex(weight_string(convert(_ucs2 0x0044017d using utf8mb4) collate utf8mb4_test_ci)) as exp;
+exp
 1251
 CREATE TABLE t1 (
 col1 varchar(100) character set utf8 collate utf8_test_ci
@@ -533,23 +533,23 @@ show collation like 'utf8mb3_phone_ci';
 Collation	Charset	Id	Default	Compiled	Sortlen
 utf8mb3_phone_ci	utf8mb3	352			8
 SET NAMES utf8;
-SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci));
-hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci))
+SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci)) as exp;
+exp
 0E33
-SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci));
-hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci))
+SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci)) as exp;
+exp
 FFFD
-SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a));
-hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci)	hex(lower(@a))
+SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a)) as exp;
+hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci)	exp
 F0909080	F0909080
-SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a));
-hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_400_ci)	hex(upper(@a))
+SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a)) as exp;
+hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_400_ci)	exp
 F09090A8	F09090A8
-SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a));
-hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_400_ci)	hex(lower(@a))
+SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a)) as exp;
+hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_400_ci)	exp
 E2B080	E2B080
-SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a));
-hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_400_ci)	hex(upper(@a))
+SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a)) as exp;
+hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_400_ci)	exp
 E2B0B0	E2B0B0
 #
 # WL#5624 Collation customization improvements
@@ -1019,9 +1019,9 @@ HEX(WEIGHT_STRING(a))	HEX(CONVERT(a USING ucs2))	HEX(a)
 15D3	09B809CD	E0A6B8E0A78D
 15D4	09B909CD	E0A6B9E0A78D
 SELECT HEX(WEIGHT_STRING(a)) as wa,
-GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
+GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a) as ha
 FROM t1 GROUP BY a ORDER BY a;
-wa	GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
+wa	ha
 15A2	0985
 15A3	0986
 15A4	0987
diff --git a/mysql-test/main/ctype_ldml.test b/mysql-test/main/ctype_ldml.test
index 9189630e5a3..ed0846c0dd2 100644
--- a/mysql-test/main/ctype_ldml.test
+++ b/mysql-test/main/ctype_ldml.test
@@ -3,9 +3,6 @@
 --source include/have_utf16.inc
 --source include/have_utf32.inc
 
-#remove this include after fix MDEV-27871
---source include/no_view_protocol.inc
-
 --disable_query_log
 call mtr.add_suppression("Charset id.*trying to replace");
 --enable_query_log
@@ -70,25 +67,25 @@ select * from t1 where c1='b';
 drop table t1;
 
 # make sure utf8_test_ci is Unicode-5.0.0
-SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_ci));
-SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a));
-SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a));
-SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a));
-SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a));
+SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a)) as exp;
+SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a)) as exp;
+SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_ci), hex(lower(@a)) as exp;
+SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_ci), hex(upper(@a)) as exp;
 
 # check that it works with supplementary characters
-SELECT hex(weight_string(convert(_utf32 0x61 using utf8mb4) collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_utf32 0x62 using utf8mb4) collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_utf32 0x10062 using utf8mb4) collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_utf32 0x100400 using utf8mb4) collate utf8mb4_test_ci));
+SELECT hex(weight_string(convert(_utf32 0x61 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_utf32 0x62 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_utf32 0x10062 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_utf32 0x100400 using utf8mb4) collate utf8mb4_test_ci)) as exp;
 
 # check contractions with non-ascii characters
-SELECT hex(weight_string(_utf8mb4 0x64 collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_ucs2 0x0064017e using utf8mb4) collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_ucs2 0x0044017e using utf8mb4) collate utf8mb4_test_ci));
-SELECT hex(weight_string(convert(_ucs2 0x0044017d using utf8mb4) collate utf8mb4_test_ci));
+SELECT hex(weight_string(_utf8mb4 0x64 collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_ucs2 0x0064017e using utf8mb4) collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_ucs2 0x0044017e using utf8mb4) collate utf8mb4_test_ci)) as exp;
+SELECT hex(weight_string(convert(_ucs2 0x0044017d using utf8mb4) collate utf8mb4_test_ci)) as exp;
 
 
 #
@@ -189,10 +186,12 @@ show collation like '%test%';
 show collation like 'ucs2_vn_ci';
 create table t1 (c1 char(1) character set ucs2 collate ucs2_vn_ci);
 insert into t1 values (0x0061);
+--disable_view_protocol
 --enable_metadata
 set @@character_set_results=NULL;
 select * from t1;
 --disable_metadata
+--enable_view_protocol
 drop table t1;
 
 #
@@ -212,12 +211,12 @@ show collation like 'utf8mb3_phone_ci';
 SET NAMES utf8;
 
 # make sure utf8mb4_test_400_ci is Unicode-4.0.0 based
-SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci));
-SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci));
-SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a));
-SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a));
-SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a));
-SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a));
+SELECT hex(weight_string(_utf8mb4'a' collate utf8mb4_test_400_ci)) as exp;
+SELECT hex(weight_string(convert(_utf32 0x10002 using utf8mb4) collate utf8mb4_test_400_ci)) as exp;
+SELECT hex(@a:=convert(_utf32 0x10400 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a)) as exp;
+SELECT hex(@a:=convert(_utf32 0x10428 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a)) as exp;
+SELECT hex(@a:=convert(_utf32 0x2C00 using utf8mb4) collate utf8mb4_test_400_ci), hex(lower(@a)) as exp;
+SELECT hex(@a:=convert(_utf32 0x2C30 using utf8mb4) collate utf8mb4_test_400_ci), hex(upper(@a)) as exp;
 
 --echo #
 --echo # WL#5624 Collation customization improvements
@@ -281,9 +280,14 @@ DROP TABLE t1;
 SET NAMES utf8 COLLATE utf8_5624_2;
 SHOW WARNINGS;
 
+# "--view-protocol" generates a dublicate error message in ctype_ldml_log.err
+# In one of the following cases, the number of similar error messages is counted,
+# so doubling the error causes the case to fail
+--disable_view_protocol
 --error ER_UNKNOWN_COLLATION
 SELECT _utf8'test' COLLATE utf8_5624_2;
 SHOW WARNINGS;
+--enable_view_protocol
 
 --echo #
 --echo # WL#5624, reset before primary ignorable
@@ -354,7 +358,7 @@ INSERT INTO t1 VALUES
 SELECT HEX(WEIGHT_STRING(a)), HEX(CONVERT(a USING ucs2)), HEX(a)
 FROM t1 ORDER BY a, BINARY(a);
 SELECT HEX(WEIGHT_STRING(a)) as wa,
-GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a)
+GROUP_CONCAT(HEX(CONVERT(a USING ucs2)) ORDER BY LENGTH(a), BINARY a) as ha
 FROM t1 GROUP BY a ORDER BY a;
 DROP TABLE t1;
 
@@ -406,7 +410,6 @@ perl;
   close(FILE);
 EOF
 
-
 --echo #
 --echo # MDEV-8686 A user defined collation utf8_confusables doesn't work
 --echo #
@@ -509,6 +512,7 @@ SELECT HEX(a), REPLACE(a,' ','<SP>') FROM t1 ORDER BY a DESC;
 DROP TABLE t1;
 
 
+--disable_service_connection
 SET NAMES utf8 COLLATE utf8_czech_test_w2;
 CREATE TABLE t1 AS SELECT SPACE(10) AS c1 LIMIT 0;
 --source include/ctype_unicode_latin.inc
@@ -610,6 +614,7 @@ SELECT 'chž'< 'i';
 
 --error ER_UNKNOWN_COLLATION
 SELECT 'a' COLLATE utf8_czech_test_bad_w2;
+--enable_service_connection
 
 --echo #
 --echo # End of 10.2 tests
diff --git a/mysql-test/main/ctype_nopad_8bit.result b/mysql-test/main/ctype_nopad_8bit.result
index ddd1f3186c9..8720e8c992a 100644
--- a/mysql-test/main/ctype_nopad_8bit.result
+++ b/mysql-test/main/ctype_nopad_8bit.result
@@ -97,20 +97,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'dec8_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'dec8_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'dec8_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -235,20 +235,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'dec8_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'dec8_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'dec8_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'dec8_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'dec8_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -374,20 +374,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'dec8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'dec8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'dec8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'dec8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'dec8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'dec8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'dec8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'dec8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'dec8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'dec8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'dec8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -512,20 +512,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'dec8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'dec8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'dec8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'dec8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'dec8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'dec8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'dec8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'dec8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'dec8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'dec8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'dec8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'dec8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -652,20 +652,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp850_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp850_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp850_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp850_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp850_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp850_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp850_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp850_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp850_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -790,20 +790,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp850_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp850_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp850_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp850_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp850_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp850_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp850_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp850_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp850_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp850_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -929,20 +929,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp850_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp850_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp850_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp850_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp850_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp850_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp850_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp850_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp850_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp850_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp850_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -1067,20 +1067,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp850_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp850_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp850_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp850_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp850_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp850_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp850_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp850_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp850_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp850_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp850_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp850_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -1207,20 +1207,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hp8_english_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hp8_english_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hp8_english_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hp8_english_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hp8_english_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hp8_english_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hp8_english_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hp8_english_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hp8_english_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -1345,20 +1345,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hp8_english_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hp8_english_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hp8_english_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hp8_english_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hp8_english_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hp8_english_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hp8_english_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hp8_english_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hp8_english_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hp8_english_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -1484,20 +1484,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hp8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hp8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hp8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hp8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hp8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hp8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hp8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hp8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hp8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hp8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hp8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -1622,20 +1622,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hp8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hp8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hp8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hp8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hp8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hp8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hp8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hp8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hp8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hp8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hp8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hp8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -1762,20 +1762,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8r_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8r_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8r_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -1900,20 +1900,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8r_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8r_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8r_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8r_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -2039,20 +2039,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8r_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8r_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8r_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8r_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8r_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8r_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8r_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8r_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8r_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -2177,20 +2177,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8r_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8r_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8r_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8r_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8r_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8r_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8r_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8r_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8r_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8r_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -2317,20 +2317,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin2_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin2_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin2_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -2455,20 +2455,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin2_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin2_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin2_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin2_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -2594,20 +2594,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin2_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin2_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin2_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin2_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin2_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -2732,20 +2732,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin2_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin2_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin2_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin2_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin2_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin2_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -2872,20 +2872,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3010,20 +3010,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3149,20 +3149,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3287,20 +3287,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3427,20 +3427,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ascii_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ascii_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ascii_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ascii_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ascii_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ascii_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ascii_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ascii_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ascii_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3565,20 +3565,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ascii_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ascii_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ascii_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ascii_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ascii_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ascii_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ascii_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ascii_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ascii_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ascii_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3704,20 +3704,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ascii_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ascii_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ascii_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ascii_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ascii_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ascii_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ascii_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ascii_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ascii_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ascii_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ascii_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3842,20 +3842,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ascii_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ascii_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ascii_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ascii_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ascii_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ascii_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ascii_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ascii_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ascii_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ascii_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ascii_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ascii_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3982,20 +3982,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hebrew_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hebrew_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hebrew_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4120,20 +4120,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hebrew_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hebrew_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hebrew_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hebrew_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4259,20 +4259,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hebrew_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hebrew_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hebrew_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hebrew_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hebrew_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hebrew_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hebrew_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hebrew_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hebrew_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4397,20 +4397,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'hebrew_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'hebrew_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'hebrew_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'hebrew_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'hebrew_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'hebrew_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'hebrew_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'hebrew_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'hebrew_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'hebrew_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4537,20 +4537,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8u_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8u_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8u_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4675,20 +4675,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8u_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8u_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8u_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8u_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4814,20 +4814,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8u_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8u_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8u_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8u_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8u_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8u_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8u_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8u_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8u_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4952,20 +4952,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'koi8u_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'koi8u_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'koi8u_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'koi8u_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'koi8u_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'koi8u_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'koi8u_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'koi8u_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'koi8u_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'koi8u_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5092,20 +5092,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'greek_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'greek_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'greek_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'greek_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'greek_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'greek_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'greek_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'greek_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'greek_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5230,20 +5230,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'greek_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'greek_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'greek_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'greek_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'greek_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'greek_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'greek_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'greek_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'greek_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'greek_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5369,20 +5369,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'greek_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'greek_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'greek_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'greek_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'greek_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'greek_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'greek_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'greek_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'greek_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'greek_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'greek_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'greek_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'greek_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'greek_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'greek_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5507,20 +5507,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'greek_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'greek_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'greek_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'greek_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'greek_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'greek_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'greek_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'greek_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'greek_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'greek_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'greek_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'greek_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'greek_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'greek_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'greek_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5647,20 +5647,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1250_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1250_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1250_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5785,20 +5785,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1250_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1250_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1250_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1250_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -5924,20 +5924,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1250_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1250_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1250_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1250_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1250_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1250_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1250_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1250_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1250_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6062,20 +6062,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1250_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1250_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1250_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1250_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1250_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1250_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1250_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1250_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1250_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1250_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6202,20 +6202,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1257_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1257_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1257_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6340,20 +6340,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1257_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1257_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1257_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1257_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6479,20 +6479,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1257_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1257_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1257_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1257_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1257_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1257_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1257_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1257_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1257_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6617,20 +6617,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1257_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1257_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1257_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1257_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1257_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1257_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1257_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1257_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1257_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1257_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6757,20 +6757,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin5_turkish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin5_turkish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin5_turkish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6895,20 +6895,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin5_turkish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin5_turkish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin5_turkish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin5_turkish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin5_turkish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -7034,20 +7034,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin5_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin5_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin5_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin5_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin5_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -7172,20 +7172,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin5_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin5_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin5_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin5_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin5_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin5_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -7312,20 +7312,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'armscii8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'armscii8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'armscii8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -7450,20 +7450,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'armscii8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'armscii8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'armscii8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'armscii8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -7589,20 +7589,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'armscii8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'armscii8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'armscii8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'armscii8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'armscii8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'armscii8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'armscii8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'armscii8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'armscii8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -7727,20 +7727,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'armscii8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'armscii8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'armscii8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'armscii8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'armscii8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'armscii8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'armscii8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'armscii8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'armscii8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'armscii8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -7867,20 +7867,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp866_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp866_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp866_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp866_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp866_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp866_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp866_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp866_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp866_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8005,20 +8005,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp866_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp866_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp866_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp866_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp866_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp866_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp866_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp866_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp866_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp866_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8144,20 +8144,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp866_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp866_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp866_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp866_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp866_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp866_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp866_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp866_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp866_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp866_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp866_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8282,20 +8282,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp866_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp866_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp866_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp866_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp866_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp866_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp866_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp866_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp866_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp866_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp866_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp866_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8422,20 +8422,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'keybcs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'keybcs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'keybcs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8560,20 +8560,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'keybcs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'keybcs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'keybcs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'keybcs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8699,20 +8699,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'keybcs2_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'keybcs2_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'keybcs2_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'keybcs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'keybcs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'keybcs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'keybcs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'keybcs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'keybcs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8837,20 +8837,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'keybcs2_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'keybcs2_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'keybcs2_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'keybcs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'keybcs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'keybcs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'keybcs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'keybcs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'keybcs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'keybcs2_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -8977,20 +8977,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macce_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macce_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macce_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macce_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macce_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macce_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macce_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macce_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macce_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -9115,20 +9115,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macce_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macce_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macce_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macce_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macce_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macce_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macce_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macce_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macce_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macce_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -9254,20 +9254,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macce_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macce_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macce_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macce_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macce_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macce_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macce_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macce_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macce_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macce_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macce_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macce_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macce_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macce_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macce_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -9392,20 +9392,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macce_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macce_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macce_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macce_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macce_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macce_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macce_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macce_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macce_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macce_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macce_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macce_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macce_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macce_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macce_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -9532,20 +9532,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macroman_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macroman_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macroman_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macroman_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macroman_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macroman_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macroman_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macroman_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macroman_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -9670,20 +9670,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macroman_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macroman_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macroman_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macroman_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macroman_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macroman_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macroman_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macroman_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macroman_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macroman_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -9809,20 +9809,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macroman_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macroman_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macroman_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macroman_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macroman_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macroman_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macroman_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macroman_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macroman_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macroman_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macroman_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -9947,20 +9947,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'macroman_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'macroman_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'macroman_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'macroman_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'macroman_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'macroman_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'macroman_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'macroman_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'macroman_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'macroman_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'macroman_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'macroman_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10087,20 +10087,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp852_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp852_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp852_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp852_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp852_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp852_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp852_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp852_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp852_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10225,20 +10225,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp852_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp852_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp852_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp852_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp852_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp852_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp852_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp852_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp852_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp852_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10364,20 +10364,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp852_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp852_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp852_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp852_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp852_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp852_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp852_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp852_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp852_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp852_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp852_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10502,20 +10502,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp852_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp852_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp852_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp852_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp852_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp852_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp852_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp852_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp852_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp852_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp852_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp852_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10642,20 +10642,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin7_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin7_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin7_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin7_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin7_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin7_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin7_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin7_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin7_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10780,20 +10780,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin7_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin7_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin7_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin7_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin7_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin7_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin7_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin7_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin7_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin7_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10919,20 +10919,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin7_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin7_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin7_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin7_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin7_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -11057,20 +11057,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin7_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin7_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin7_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin7_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin7_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin7_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -11197,20 +11197,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1251_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1251_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1251_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -11335,20 +11335,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1251_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1251_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1251_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1251_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -11474,20 +11474,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1251_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1251_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1251_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1251_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1251_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1251_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1251_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1251_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1251_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -11612,20 +11612,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1251_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1251_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1251_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1251_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1251_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1251_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1251_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1251_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1251_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1251_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -11752,20 +11752,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1256_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1256_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1256_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -11890,20 +11890,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1256_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1256_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1256_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1256_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -12029,20 +12029,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1256_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1256_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1256_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1256_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1256_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1256_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1256_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1256_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1256_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -12167,20 +12167,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'cp1256_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'cp1256_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'cp1256_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'cp1256_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'cp1256_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'cp1256_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'cp1256_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'cp1256_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'cp1256_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'cp1256_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -12307,20 +12307,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'geostd8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'geostd8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'geostd8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -12445,20 +12445,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'geostd8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'geostd8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'geostd8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'geostd8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -12584,20 +12584,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'geostd8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'geostd8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'geostd8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'geostd8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'geostd8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'geostd8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'geostd8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'geostd8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'geostd8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -12722,20 +12722,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'geostd8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'geostd8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'geostd8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'geostd8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'geostd8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'geostd8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'geostd8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'geostd8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'geostd8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'geostd8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result
index 7a1f4cf5483..0e281d68023 100644
--- a/mysql-test/main/ctype_sjis.result
+++ b/mysql-test/main/ctype_sjis.result
@@ -218,8 +218,8 @@ DROP TABLE t1;
 SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
 @@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
 sjis	8180
-SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
-STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR)) as exp;
+exp
 2001-01-01
 CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
 SHOW COLUMNS FROM t1;
@@ -19109,20 +19109,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'sjis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'sjis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'sjis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -19247,20 +19247,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'sjis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'sjis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'sjis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'sjis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'sjis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -19386,20 +19386,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'sjis_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'sjis_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'sjis_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'sjis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'sjis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'sjis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'sjis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'sjis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'sjis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'sjis_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'sjis_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -19524,20 +19524,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'sjis_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'sjis_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'sjis_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'sjis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'sjis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'sjis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'sjis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'sjis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'sjis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'sjis_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'sjis_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'sjis_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_swe7.result b/mysql-test/main/ctype_swe7.result
index 8397db11a38..0dbd362c3db 100644
--- a/mysql-test/main/ctype_swe7.result
+++ b/mysql-test/main/ctype_swe7.result
@@ -3173,20 +3173,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3311,20 +3311,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3450,20 +3450,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3588,20 +3588,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'swe7_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'swe7_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'swe7_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'swe7_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_tis620.result b/mysql-test/main/ctype_tis620.result
index 10b7042f709..459492a16e0 100644
--- a/mysql-test/main/ctype_tis620.result
+++ b/mysql-test/main/ctype_tis620.result
@@ -4001,20 +4001,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'tis620_thai_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'tis620_thai_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'tis620_thai_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4139,20 +4139,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'tis620_thai_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'tis620_thai_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'tis620_thai_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'tis620_thai_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'tis620_thai_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4278,20 +4278,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'tis620_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'tis620_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'tis620_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'tis620_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'tis620_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'tis620_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'tis620_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'tis620_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'tis620_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'tis620_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'tis620_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -4416,20 +4416,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'tis620_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'tis620_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'tis620_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'tis620_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'tis620_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'tis620_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'tis620_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'tis620_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'tis620_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'tis620_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'tis620_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'tis620_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_uca.result b/mysql-test/main/ctype_uca.result
index abc9c3f5c1d..7a83c02d112 100644
--- a/mysql-test/main/ctype_uca.result
+++ b/mysql-test/main/ctype_uca.result
@@ -10024,8 +10024,8 @@ INSERT INTO t1 (s1) VALUES
 (_ucs2 0x1011103910191004103A1038 /* cooked rice */),
 (_ucs2 0x101C1000103A10181000103A),
 (_ucs2 0x101C103910181000103A /* tea */);
-SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id;
-id	IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2))))
+SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) as exp FROM t1 ORDER BY id;
+id	exp
 1	2259	108C
 2	22593ACB	1037
 3	22593ACC	1038
@@ -12600,8 +12600,8 @@ INSERT INTO t1 (s1) VALUES
 (_ucs2 0x1011103910191004103A1038 /* cooked rice */),
 (_ucs2 0x101C1000103A10181000103A),
 (_ucs2 0x101C103910181000103A /* tea */);
-SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id;
-id	IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2))))
+SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) as exp FROM t1 ORDER BY id;
+id	exp
 1	2259	108C
 2	22593ACB	1037
 3	22593ACC	1038
@@ -15373,3 +15373,39 @@ DROP TABLE t1;
 #
 # End of MariaDB-10.2 tests
 #
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-34417 Wrong result set with utf8mb4_danish_ci and BNLH join
+#
+CREATE TABLE t1 (a VARCHAR(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_danish_ci);
+INSERT INTO t1 VALUES ('aaaa'),('åå');
+SELECT * FROM t1 WHERE a='aaaa';
+a
+aaaa
+åå
+SET join_cache_level=1;
+SELECT * FROM t1 NATURAL JOIN t1 t2;
+a
+aaaa
+åå
+aaaa
+åå
+# Expect a BNHL join
+SET join_cache_level=3;
+EXPLAIN SELECT * FROM t1 NATURAL JOIN t1 t2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t2	hash_ALL	NULL	#hash#$hj	2003	test.t1.a	2	Using where; Using join buffer (flat, BNLH join)
+SELECT * FROM t1 NATURAL JOIN t1 t2;
+a
+aaaa
+åå
+aaaa
+åå
+DROP TABLE t1;
+SET join_cache_level=DEFAULT;
+#
+# End of 10.5 tests
+#
diff --git a/mysql-test/main/ctype_uca.test b/mysql-test/main/ctype_uca.test
index 8ccda3e680c..a88db7ea512 100644
--- a/mysql-test/main/ctype_uca.test
+++ b/mysql-test/main/ctype_uca.test
@@ -696,3 +696,32 @@ DROP TABLE t1;
 --echo #
 --echo # End of MariaDB-10.2 tests
 --echo #
+
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-34417 Wrong result set with utf8mb4_danish_ci and BNLH join
+--echo #
+
+CREATE TABLE t1 (a VARCHAR(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_danish_ci);
+INSERT INTO t1 VALUES ('aaaa'),('åå');
+SELECT * FROM t1 WHERE a='aaaa';
+
+SET join_cache_level=1;
+SELECT * FROM t1 NATURAL JOIN t1 t2;
+
+--echo # Expect a BNHL join
+SET join_cache_level=3;
+EXPLAIN SELECT * FROM t1 NATURAL JOIN t1 t2;
+SELECT * FROM t1 NATURAL JOIN t1 t2;
+
+DROP TABLE t1;
+SET join_cache_level=DEFAULT;
+
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result
index cde787cbccf..e17213c98a2 100644
--- a/mysql-test/main/ctype_ucs.result
+++ b/mysql-test/main/ctype_ucs.result
@@ -985,8 +985,8 @@ DROP TABLE t1;
 SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
 @@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
 ucs2	00F7
-SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
-STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR)) as exp;
+exp
 2001-01-01
 CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
 SHOW COLUMNS FROM t1;
@@ -2735,8 +2735,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 0032
 create table t1 as select concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -2745,8 +2745,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))));
-hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))))
+select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)')))) as exp;
+exp
 0032
 create table t1 as select concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))) as c1;
 show create table t1;
@@ -2755,8 +2755,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 0030
 create table t1 as select concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -2765,8 +2765,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))));
-hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))))
+select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')))) as exp;
+exp
 0031
 create table t1 as select concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))) as c1;
 show create table t1;
@@ -2775,8 +2775,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))));
-hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsEmpty(GeomFromText('POINT(1 1)')))) as exp;
+exp
 0030
 create table t1 as select concat(IsEmpty(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -2785,8 +2785,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(21) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
-hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsSimple(GeomFromText('POINT(1 1)')))) as exp;
+exp
 0031
 create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -2795,8 +2795,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))));
-hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))))
+select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)')))) as exp;
+exp
 0030
 create table t1 as select concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))) as c1;
 show create table t1;
@@ -2805,13 +2805,13 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))));
-hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))))
+select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)')))) as exp;
+exp
 0031
 create table t1 as select concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))) as c1;
 drop table t1;
-select hex(concat(x(GeomFromText('Point(1 2)'))));
-hex(concat(x(GeomFromText('Point(1 2)'))))
+select hex(concat(x(GeomFromText('Point(1 2)')))) as exp;
+exp
 0031
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -2820,8 +2820,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(y(GeomFromText('Point(1 2)'))));
-hex(concat(y(GeomFromText('Point(1 2)'))))
+select hex(concat(y(GeomFromText('Point(1 2)')))) as exp;
+exp
 0032
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -2830,8 +2830,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))));
-hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))))
+select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)')))) as exp;
+exp
 0031
 create table t1 as select concat(GLength(GeomFromText('LineString(1 2, 2 2)'))) as c1;
 show create table t1;
@@ -2840,8 +2840,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))));
-hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))))
+select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))')))) as exp;
+exp
 0031
 create table t1 as select concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))) as c1;
 show create table t1;
@@ -2850,8 +2850,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GeometryType(GeomFromText('Point(1 2)'))));
-hex(concat(GeometryType(GeomFromText('Point(1 2)'))))
+select hex(concat(GeometryType(GeomFromText('Point(1 2)')))) as exp;
+exp
 0050004F0049004E0054
 create table t1 as select concat(GeometryType(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -2860,8 +2860,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(20) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(AsText(GeomFromText('Point(1 2)'))));
-hex(concat(AsText(GeomFromText('Point(1 2)'))))
+select hex(concat(AsText(GeomFromText('Point(1 2)')))) as exp;
+exp
 0050004F0049004E005400280031002000320029
 create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -3130,8 +3130,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')));
-hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')))
+select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00'))) as exp;
+exp
 00320034003A00300030003A00300030
 create table t1 as select concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')) as c1;
 show create table t1;
@@ -3170,8 +3170,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')));
-hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')))
+select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00'))) as exp;
+exp
 0032003000300033002D00310032002D00330031002000320030003A00300030003A00300030
 create table t1 as select concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')) as c1;
 show create table t1;
@@ -3180,8 +3180,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)));
-hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)))
+select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day))) as exp;
+exp
 0032003000300034002D00300031002D00300032002000310032003A00300030003A00300030
 create table t1 as select concat(date_add('2004-01-01 12:00:00', interval 1 day)) as c1;
 show create table t1;
@@ -5872,20 +5872,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -6010,20 +6010,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_general_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -6270,20 +6270,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -6408,20 +6408,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_nopad_bin', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_ucs.test b/mysql-test/main/ctype_ucs.test
index 518a67cca85..58b355dcd4e 100644
--- a/mysql-test/main/ctype_ucs.test
+++ b/mysql-test/main/ctype_ucs.test
@@ -613,6 +613,7 @@ deallocate prepare stmt;
 #
 # Bug#22638 SOUNDEX broken for international characters
 #
+--disable_service_connection
 set names latin1;
 set character_set_connection=ucs2;
 select soundex(''),soundex('he'),soundex('hello all folks'),soundex('#3556 in bugdb');
@@ -623,6 +624,7 @@ select hex(soundex(_ucs2 0x041004110412));
 # Make sure that "U+00BF INVERTED QUESTION MARK" is not considered as letter
 select hex(soundex(_ucs2 0x00BF00C0));
 set names latin1;
+--enable_service_connection
 
 #
 # Bug #14290: character_maximum_length for text fields
@@ -794,10 +796,12 @@ DROP TABLE t1;
 --echo # Start of 5.5 tests
 --echo #
 
+--disable_service_connection
 SET NAMES latin1;
 SET collation_connection=ucs2_general_ci;
 --source include/ctype_numconv.inc
 SET NAMES latin1;
+--enable_service_connection
 
 --echo #
 --echo # Bug #13832953 	MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED
@@ -1035,8 +1039,10 @@ DROP TABLE t1;
 --echo #
 --echo # MDEV-9178 Wrong result for CAST(CONVERT('1IJ3' USING ucs2) AS SIGNED)
 --echo #
+--disable_service_connection
 SET NAMES utf8;
 SELECT CAST(CONVERT('1IJ3' USING ucs2) AS SIGNED);
+--enable_service_connection
 
 --echo #
 --echo # End of 10.1 tests
@@ -1073,6 +1079,7 @@ EXECUTE IMMEDIATE @stmt;
 --echo #
 --echo # MDEV-10866 Extend PREPARE and EXECUTE IMMEDIATE to understand expressions
 --echo #
+--disable_service_connection
 SET NAMES utf8, collation_connection=ucs2_bin;
 SET @stmt='SELECT COLLATION(''a'')';
 EXECUTE IMMEDIATE @stmt;
@@ -1100,6 +1107,7 @@ EXECUTE IMMEDIATE @stmt;
 PREPARE stmt FROM @stmt;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
+--enable_service_connection
 
 --echo #
 --echo # End of 10.2 tests
diff --git a/mysql-test/main/ctype_ucs2_uca.result b/mysql-test/main/ctype_ucs2_uca.result
index 317f86b1a4f..e1ce91a553c 100644
--- a/mysql-test/main/ctype_ucs2_uca.result
+++ b/mysql-test/main/ctype_ucs2_uca.result
@@ -100,20 +100,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -238,20 +238,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -377,20 +377,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -515,20 +515,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ucs2_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ucs2_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_ujis.result b/mysql-test/main/ctype_ujis.result
index 35bfce8eb5a..435837859c6 100644
--- a/mysql-test/main/ctype_ujis.result
+++ b/mysql-test/main/ctype_ujis.result
@@ -322,14 +322,14 @@ locate('LO','hello' collate ujis_bin,2)
 select locate(_ujis 0xa1a3,_ujis 0xa1a2a1a3);
 locate(_ujis 0xa1a3,_ujis 0xa1a2a1a3)
 2
-select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%');
-0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%')
+select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%') as exp;
+exp
 1
-select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%');
-_ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%')
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') as exp;
+exp
 0
-select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin;
-_ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin as exp;
+exp
 0
 select 'a' like 'a';
 'a' like 'a'
@@ -2810,8 +2810,8 @@ DROP TABLE t2;
 # Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
 #
 SET NAMES utf8;
-SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis);
-CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis)
+SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis) as exp;
+exp
 
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: 'a'
@@ -26624,20 +26624,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ujis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ujis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ujis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -26762,20 +26762,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ujis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ujis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ujis_japanese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ujis_japanese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ujis_japanese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -26901,20 +26901,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ujis_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ujis_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ujis_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ujis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ujis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ujis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ujis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ujis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ujis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ujis_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ujis_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -27039,20 +27039,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'ujis_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'ujis_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'ujis_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'ujis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'ujis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'ujis_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'ujis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'ujis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'ujis_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'ujis_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'ujis_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'ujis_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_ujis.test b/mysql-test/main/ctype_ujis.test
index 320231a9762..249c523ebec 100644
--- a/mysql-test/main/ctype_ujis.test
+++ b/mysql-test/main/ctype_ujis.test
@@ -45,13 +45,10 @@ select locate('HE','hello' collate ujis_bin,2);
 select locate('LO','hello' collate ujis_bin,2);
 select locate(_ujis 0xa1a3,_ujis 0xa1a2a1a3);
 
-select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%');
-select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%');
+select 0xa1a2a1a3 like concat(_binary'%',0xa2a1,_binary'%') as exp;
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') as exp;
 
-# enable view-protocol after fix MDEV-27871
---disable_view_protocol
-select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin;
---disable_view_protocol
+select _ujis 0xa1a2a1a3 like concat(_ujis'%',_ujis 0xa2a1, _ujis'%') collate ujis_bin as exp;
 
 select 'a' like 'a';
 select 'A' like 'a';
@@ -1231,11 +1228,8 @@ DROP TABLE t2;
 --echo #
 --echo # Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
 SET NAMES utf8;
-SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis);
---enable_view_protocol
+SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis) as exp;
 
 set names default;
 set character_set_database=@save_character_set_server;
@@ -1357,8 +1351,6 @@ DROP TABLE t1;
 --echo # WL#3664 WEIGHT_STRING
 --echo #
 
-# enable view-protocol after fix MDEV-27871
---disable_view_protocol
 set names ujis;
 --source include/weight_string.inc
 --source include/weight_string_l1.inc
@@ -1372,7 +1364,6 @@ set collation_connection=ujis_bin;
 --source include/weight_string_A1A1.inc
 --source include/weight_string_8EA1.inc
 --source include/weight_string_8FA2C3.inc
---enable_view_protocol
 
 --echo #
 --echo # End of 5.6 tests
diff --git a/mysql-test/main/ctype_utf16.result b/mysql-test/main/ctype_utf16.result
index 5cd0fac64ce..f394c38cc14 100644
--- a/mysql-test/main/ctype_utf16.result
+++ b/mysql-test/main/ctype_utf16.result
@@ -2358,20 +2358,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -2496,20 +2496,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_general_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -2756,20 +2756,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_nopad_bin', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_nopad_bin', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -2894,20 +2894,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_nopad_bin', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_nopad_bin', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_utf16_uca.result b/mysql-test/main/ctype_utf16_uca.result
index 99a8526c700..0b064b6c836 100644
--- a/mysql-test/main/ctype_utf16_uca.result
+++ b/mysql-test/main/ctype_utf16_uca.result
@@ -5330,8 +5330,8 @@ INSERT INTO t1 (s1) VALUES
 (_ucs2 0x1011103910191004103A1038 /* cooked rice */),
 (_ucs2 0x101C1000103A10181000103A),
 (_ucs2 0x101C103910181000103A /* tea */);
-SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id;
-id	IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2))))
+SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) as exp FROM t1 ORDER BY id;
+id	exp
 1	2259	108C
 2	22593ACB	1037
 3	22593ACC	1038
@@ -7416,20 +7416,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -7554,20 +7554,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -7693,20 +7693,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
@@ -7831,20 +7831,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 0061006200630020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 00610062006300200020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result
index 991968dd3dc..5c31f2157ab 100644
--- a/mysql-test/main/ctype_utf16le.result
+++ b/mysql-test/main/ctype_utf16le.result
@@ -2543,20 +2543,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16le_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16le_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16le_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  ')) as exp;
+exp
 6100620063002000
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  ')) as exp;
+exp
 61006200630020002000
 #
 # Collation mix
@@ -2681,20 +2681,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16le_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16le_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16le_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16le_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  ')) as exp;
+exp
 6100620063002000
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_general_nopad_ci', 'abc  ')) as exp;
+exp
 61006200630020002000
 #
 # Collation mix
@@ -2941,20 +2941,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16le_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16le_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16le_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16le_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16le_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16le_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16le_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16le_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16le_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  ')) as exp;
+exp
 6100620063002000
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  ')) as exp;
+exp
 61006200630020002000
 #
 # Collation mix
@@ -3079,20 +3079,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf16le_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf16le_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf16le_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf16le_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf16le_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf16le_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf16le_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf16le_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf16le_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  ')) as exp;
+exp
 6100620063002000
-SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf16le_nopad_bin', 'abc  ')) as exp;
+exp
 61006200630020002000
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_utf32.result b/mysql-test/main/ctype_utf32.result
index 286bc323120..cb7247497bb 100644
--- a/mysql-test/main/ctype_utf32.result
+++ b/mysql-test/main/ctype_utf32.result
@@ -70,29 +70,29 @@ hex(word2)
 00000420
 00002004
 DROP TABLE t1;
-SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0421'));
-hex(LPAD(_utf32 X'0420',10,_utf32 X'0421'))
+SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0421')) as exp;
+exp
 00000421000004210000042100000421000004210000042100000421000004210000042100000420
-SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'));
-hex(LPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'))
+SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0000042100000422')) as exp;
+exp
 00000421000004220000042100000422000004210000042200000421000004220000042100000420
-SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'));
-hex(LPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'))
+SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423')) as exp;
+exp
 00000421000004220000042300000421000004220000042300000421000004220000042300000420
-SELECT hex(LPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'));
-hex(LPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'))
+SELECT hex(LPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423')) as exp;
+exp
 00000420000004210000042200000423000004240000042500000426000004270000042800000429
-SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0421'));
-hex(RPAD(_utf32 X'0420',10,_utf32 X'0421'))
+SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0421')) as exp;
+exp
 00000420000004210000042100000421000004210000042100000421000004210000042100000421
-SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'));
-hex(RPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'))
+SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0000042100000422')) as exp;
+exp
 00000420000004210000042200000421000004220000042100000422000004210000042200000421
-SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'));
-hex(RPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'))
+SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423')) as exp;
+exp
 00000420000004210000042200000423000004210000042200000423000004210000042200000423
-SELECT hex(RPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'));
-hex(RPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'))
+SELECT hex(RPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423')) as exp;
+exp
 00000420000004210000042200000423000004240000042500000426000004270000042800000429
 CREATE TABLE t1 SELECT 
 LPAD(_utf32 X'0420',10,_utf32 X'0421') l,
@@ -329,11 +329,11 @@ SELECT * FROM t1 WHERE word LIKE _utf32 x'00000063000000610000005F';
 word
 cat
 DROP TABLE t1;
-select insert(_utf32 0x000000610000006200000063,10,2,_utf32 0x000000640000006500000066);
-insert(_utf32 0x000000610000006200000063,10,2,_utf32 0x000000640000006500000066)
+select insert(_utf32 0x000000610000006200000063,10,2,_utf32 0x000000640000006500000066) as exp;
+exp
 abc
-select insert(_utf32 0x000000610000006200000063,1,2,_utf32 0x000000640000006500000066);
-insert(_utf32 0x000000610000006200000063,1,2,_utf32 0x000000640000006500000066)
+select insert(_utf32 0x000000610000006200000063,1,2,_utf32 0x000000640000006500000066) as exp;
+exp
 defc
 SET NAMES latin1;
 CREATE TABLE t1 (
@@ -1645,8 +1645,8 @@ Warning	1260	Row 1 was cut by group_concat()
 #
 # incorrect charset for val_str_ascii
 #
-SELECT '2010-10-10 10:10:10' + INTERVAL GeometryType(GeomFromText('POINT(1 1)')) hour_second;
-'2010-10-10 10:10:10' + INTERVAL GeometryType(GeomFromText('POINT(1 1)')) hour_second
+SELECT '2010-10-10 10:10:10' + INTERVAL GeometryType(GeomFromText('POINT(1 1)')) hour_second as exp;
+exp
 2010-10-10 10:10:10
 #
 # MDEV-5745 analyze MySQL fix for bug#12368495
@@ -2413,20 +2413,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
@@ -2551,20 +2551,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_general_nopad_ci', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
@@ -2811,20 +2811,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_nopad_bin', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_nopad_bin', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
@@ -2949,20 +2949,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_nopad_bin', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_nopad_bin', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
@@ -3267,9 +3267,100 @@ HEX(DATE_FORMAT(TIME'11:22:33',@format))
 # End of 10.4 tests
 #
 #
+# Start of 10.11 tests
+#
+#
+# MDEV-10865 COLLATE keyword doesn't work in PREPARE query
+#
+#
+# The collation is not applicable to the PS parameter
+#
+SET NAMES utf8mb4;
+CREATE TABLE t1 (
+c1 varchar(500) COLLATE utf32_unicode_ci NOT NULL
+);
+INSERT INTO t1 VALUES ('jj');
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1 LIKE ? COLLATE utf32_unicode_ci';
+EXECUTE stmt USING 'jj';
+ERROR 42000: COLLATION 'utf32_unicode_ci' is not valid for CHARACTER SET 'utf8mb4'
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE utf32_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+ERROR 42000: COLLATION 'utf32_unicode_ci' is not valid for CHARACTER SET 'utf8mb4'
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(?) COLLATE utf32_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+ERROR 42000: COLLATION 'utf32_unicode_ci' is not valid for CHARACTER SET 'utf8mb4'
+CREATE TABLE t1 AS SELECT NULL COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+#
+# The collation is applicable to the PS parameter
+#
+SET NAMES utf8mb4, collation_connection=utf32_general_ci;
+CREATE TABLE t1 (
+c1 varchar(500) COLLATE utf32_unicode_ci NOT NULL
+);
+INSERT INTO t1 VALUES ('jj');
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1 LIKE ? COLLATE utf32_unicode_ci';
+EXECUTE stmt USING 'jj';
+c1
+jj
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE utf32_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(4) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(?) COLLATE utf32_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(4) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT NULL COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+SET NAMES utf8mb4;
+#
+# End of 10.11 tests
+#
+#
+# Start of 11.4 tests
+#
+#
 # MDEV-33729 UBSAN negation of -X cannot be represented in type 'long long int'; cast to an unsigned type to negate this value to itself in my_strntoll_mb2_or_mb4
 #
 SET NAMES utf8mb3, character_set_connection=utf32;
 SELECT CONV('-AzL8n0Y58m8', -62, -10);
 CONV('-AzL8n0Y58m8', -62, -10)
 -9223372036854775808
+#
+# End of 11.4 tests
+#
diff --git a/mysql-test/main/ctype_utf32.test b/mysql-test/main/ctype_utf32.test
index 9de28dd9520..2c448b6190b 100644
--- a/mysql-test/main/ctype_utf32.test
+++ b/mysql-test/main/ctype_utf32.test
@@ -60,21 +60,15 @@ DROP TABLE t1;
 #
 # Check LPAD/RPAD
 #
-SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0421'));
-SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'));
-SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'));
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT hex(LPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'));
---enable_view_protocol
+SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0421')) as exp;
+SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'0000042100000422')) as exp;
+SELECT hex(LPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423')) as exp;
+SELECT hex(LPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423')) as exp;
 
-SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0421'));
-SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0000042100000422'));
-SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423'));
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT hex(RPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423'));
---enable_view_protocol
+SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0421')) as exp;
+SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'0000042100000422')) as exp;
+SELECT hex(RPAD(_utf32 X'0420',10,_utf32 X'000004210000042200000423')) as exp;
+SELECT hex(RPAD(_utf32 X'000004200000042100000422000004230000042400000425000004260000042700000428000004290000042A0000042B',10,_utf32 X'000004210000042200000423')) as exp;
 
 CREATE TABLE t1 SELECT 
 LPAD(_utf32 X'0420',10,_utf32 X'0421') l,
@@ -124,11 +118,8 @@ DROP TABLE t1;
 #
 # Check that INSERT() works fine. 
 # This invokes charpos() function.
-#enable after fix MDEV-27871
---disable_view_protocol
-select insert(_utf32 0x000000610000006200000063,10,2,_utf32 0x000000640000006500000066);
-select insert(_utf32 0x000000610000006200000063,1,2,_utf32 0x000000640000006500000066);
---enable_view_protocol
+select insert(_utf32 0x000000610000006200000063,10,2,_utf32 0x000000640000006500000066) as exp;
+select insert(_utf32 0x000000610000006200000063,1,2,_utf32 0x000000640000006500000066) as exp;
 
 #######################################################
 
@@ -884,10 +875,7 @@ ORDER BY l DESC;
 --echo #
 --echo # incorrect charset for val_str_ascii
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT '2010-10-10 10:10:10' + INTERVAL GeometryType(GeomFromText('POINT(1 1)')) hour_second;
---enable_view_protocol
+SELECT '2010-10-10 10:10:10' + INTERVAL GeometryType(GeomFromText('POINT(1 1)')) hour_second as exp;
 
 --echo #
 --echo # MDEV-5745 analyze MySQL fix for bug#12368495
@@ -1169,11 +1157,95 @@ SELECT HEX(DATE_FORMAT(TIME'11:22:33',@format));
 --echo # End of 10.4 tests
 --echo #
 
+--echo #
+--echo # Start of 10.11 tests
+--echo #
+
+--echo #
+--echo # MDEV-10865 COLLATE keyword doesn't work in PREPARE query
+--echo #
+
+--echo #
+--echo # The collation is not applicable to the PS parameter
+--echo #
+
+SET NAMES utf8mb4;
+CREATE TABLE t1 (
+   c1 varchar(500) COLLATE utf32_unicode_ci NOT NULL
+);
+INSERT INTO t1 VALUES ('jj');
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1 LIKE ? COLLATE utf32_unicode_ci';
+--error ER_COLLATION_CHARSET_MISMATCH
+EXECUTE stmt USING 'jj';
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE utf32_unicode_ci AS c1';
+--error ER_COLLATION_CHARSET_MISMATCH
+EXECUTE stmt USING 'test';
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(?) COLLATE utf32_unicode_ci AS c1';
+--error ER_COLLATION_CHARSET_MISMATCH
+EXECUTE stmt USING 'test';
+
+CREATE TABLE t1 AS SELECT NULL COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+
+--echo #
+--echo # The collation is applicable to the PS parameter
+--echo #
+
+SET NAMES utf8mb4, collation_connection=utf32_general_ci;
+CREATE TABLE t1 (
+   c1 varchar(500) COLLATE utf32_unicode_ci NOT NULL
+);
+INSERT INTO t1 VALUES ('jj');
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1 LIKE ? COLLATE utf32_unicode_ci';
+EXECUTE stmt USING 'jj';
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE utf32_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(?) COLLATE utf32_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT NULL COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE utf32_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+SET NAMES utf8mb4;
+
+--echo #
+--echo # End of 10.11 tests
+--echo #
+
 --enable_service_connection
 
+--echo #
+--echo # Start of 11.4 tests
+--echo #
+
 --echo #
 --echo # MDEV-33729 UBSAN negation of -X cannot be represented in type 'long long int'; cast to an unsigned type to negate this value to itself in my_strntoll_mb2_or_mb4
 --echo #
 
 SET NAMES utf8mb3, character_set_connection=utf32;
 SELECT CONV('-AzL8n0Y58m8', -62, -10);
+
+--echo #
+--echo # End of 11.4 tests
+--echo #
diff --git a/mysql-test/main/ctype_utf32_uca.result b/mysql-test/main/ctype_utf32_uca.result
index 7a5cef53e22..90e22d9ccf2 100644
--- a/mysql-test/main/ctype_utf32_uca.result
+++ b/mysql-test/main/ctype_utf32_uca.result
@@ -5350,8 +5350,8 @@ INSERT INTO t1 (s1) VALUES
 (_ucs2 0x1011103910191004103A1038 /* cooked rice */),
 (_ucs2 0x101C1000103A10181000103A),
 (_ucs2 0x101C103910181000103A /* tea */);
-SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id;
-id	IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2))))
+SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) as exp FROM t1 ORDER BY id;
+id	exp
 1	2259	108C
 2	22593ACB	1037
 3	22593ACC	1038
@@ -7436,20 +7436,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
@@ -7574,20 +7574,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
@@ -7713,20 +7713,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
@@ -7851,20 +7851,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf32_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf32_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf32_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf32_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 00000061000000620000006300000020
-SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf32_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 0000006100000062000000630000002000000020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result
index c76c33f39d0..b3487ae2321 100644
--- a/mysql-test/main/ctype_utf8.result
+++ b/mysql-test/main/ctype_utf8.result
@@ -67,17 +67,17 @@ select 'A' like 'a';
 select 'A' like 'a' collate utf8_bin;
 'A' like 'a' collate utf8_bin
 0
-select _utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%');
-_utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%')
+select _utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%') as exp;
+exp
 1
-select convert(_latin1'G�nter Andr�' using utf8) like CONVERT(_latin1'G�NTER%' USING utf8);
-convert(_latin1'G\xFCnter Andr\xE9' using utf8) like CONVERT(_latin1'G\xDCNTER%' USING utf8)
+select convert(_latin1'G�nter Andr�' using utf8) like CONVERT(_latin1'G�NTER%' USING utf8) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8);
-CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8) LIKE CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8)
+select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8);
-CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8)
+select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8) as exp;
+exp
 1
 select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es');
 insert('txs',2,1,'hi')	insert('is ',4,0,'a')	insert('txxxxt',2,4,'es')
@@ -800,17 +800,17 @@ select * from t1 where soundex(a) = soundex('test');
 id	a
 1	Test
 drop table t1;
-select soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB);
-soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)
+select soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB) as exp;
+exp
 阅000
-select hex(soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB));
-hex(soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB))
+select hex(soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)) as exp;
+exp
 E99885303030
-select soundex(_utf8 0xD091D092D093);
-soundex(_utf8 0xD091D092D093)
+select soundex(_utf8 0xD091D092D093) as exp;
+exp
 Б000
-select hex(soundex(_utf8 0xD091D092D093));
-hex(soundex(_utf8 0xD091D092D093))
+select hex(soundex(_utf8 0xD091D092D093)) as exp;
+exp
 D091303030
 SET collation_connection='utf8_general_ci';
 create table t1 select repeat('a',4000) a;
@@ -1036,8 +1036,8 @@ DROP TABLE t1;
 SELECT @@character_set_connection, HEX(CAST(_utf8'÷' AS CHAR));
 @@character_set_connection	HEX(CAST(_utf8'÷' AS CHAR))
 utf8mb3	C3B7
-SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR));
-STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR))
+SELECT STR_TO_DATE(CAST(_utf8'2001÷01÷01' AS CHAR),CAST(_utf8'%Y÷%m÷%d' AS CHAR)) as exp;
+exp
 2001-01-01
 CREATE TABLE t1 AS SELECT REPEAT(' ', 64) AS subject, REPEAT(' ',64) AS pattern LIMIT 0;
 SHOW COLUMNS FROM t1;
@@ -1170,8 +1170,8 @@ concat(concat(_latin1'->',f1),_latin1'<-')
 -><-
 -><-
 drop table t1;
-select convert(_koi8r'�' using utf8) < convert(_koi8r'�' using utf8);
-convert(_koi8r'\xC9' using utf8) < convert(_koi8r'\xCA' using utf8)
+select convert(_koi8r'�' using utf8) < convert(_koi8r'�' using utf8) as exp;
+exp
 1
 set names latin1;
 create table t1 (a varchar(10)) character set utf8;
@@ -3480,8 +3480,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumGeometries(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -3490,8 +3490,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))));
-hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))))
+select hex(concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)')))) as exp;
+exp
 32
 create table t1 as select concat(NumPoints(MultiPointFromText('LINESTRING(0 0,10 10)'))) as c1;
 show create table t1;
@@ -3500,8 +3500,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))));
-hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))))
+select hex(concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)')))) as exp;
+exp
 30
 create table t1 as select concat(SRID(MultiPointFromText('MULTIPOINT(0 0,10 10)'))) as c1;
 show create table t1;
@@ -3510,8 +3510,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))));
-hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))))
+select hex(concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')))) as exp;
+exp
 31
 create table t1 as select concat(NumInteriorRings(PolygonFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'))) as c1;
 show create table t1;
@@ -3520,8 +3520,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))));
-hex(concat(IsEmpty(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsEmpty(GeomFromText('POINT(1 1)')))) as exp;
+exp
 30
 create table t1 as select concat(IsEmpty(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -3530,8 +3530,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(21) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
-hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
+select hex(concat(IsSimple(GeomFromText('POINT(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
 show create table t1;
@@ -3540,8 +3540,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))));
-hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))))
+select hex(concat(IsClosed(GeomFromText('LineString(1 1,2 2)')))) as exp;
+exp
 30
 create table t1 as select concat(IsClosed(GeomFromText('LineString(1 1,2 2)'))) as c1;
 show create table t1;
@@ -3550,13 +3550,13 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(2) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))));
-hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))))
+select hex(concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)')))) as exp;
+exp
 31
 create table t1 as select concat(Equals(GeomFromText('Point(1 1)'),GeomFromText('Point(1 1)'))) as c1;
 drop table t1;
-select hex(concat(x(GeomFromText('Point(1 2)'))));
-hex(concat(x(GeomFromText('Point(1 2)'))))
+select hex(concat(x(GeomFromText('Point(1 2)')))) as exp;
+exp
 31
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -3565,8 +3565,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(y(GeomFromText('Point(1 2)'))));
-hex(concat(y(GeomFromText('Point(1 2)'))))
+select hex(concat(y(GeomFromText('Point(1 2)')))) as exp;
+exp
 32
 create table t1 as select concat(x(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -3575,8 +3575,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))));
-hex(concat(GLength(GeomFromText('LineString(1 2,2 2)'))))
+select hex(concat(GLength(GeomFromText('LineString(1 2,2 2)')))) as exp;
+exp
 31
 create table t1 as select concat(GLength(GeomFromText('LineString(1 2, 2 2)'))) as c1;
 show create table t1;
@@ -3585,8 +3585,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))));
-hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))))
+select hex(concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))')))) as exp;
+exp
 31
 create table t1 as select concat(Area(GeomFromText('Polygon((0 0,1 0,1 1,0 1,0 0))'))) as c1;
 show create table t1;
@@ -3595,8 +3595,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(23) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(GeometryType(GeomFromText('Point(1 2)'))));
-hex(concat(GeometryType(GeomFromText('Point(1 2)'))))
+select hex(concat(GeometryType(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E54
 create table t1 as select concat(GeometryType(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -3605,8 +3605,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(AsText(GeomFromText('Point(1 2)'))));
-hex(concat(AsText(GeomFromText('Point(1 2)'))))
+select hex(concat(AsText(GeomFromText('Point(1 2)')))) as exp;
+exp
 504F494E542831203229
 create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
@@ -3875,8 +3875,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')));
-hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')))
+select hex(concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00'))) as exp;
+exp
 32343A30303A3030
 create table t1 as select concat(timediff('2001-01-02 00:00:00', '2001-01-01 00:00:00')) as c1;
 show create table t1;
@@ -3915,8 +3915,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')));
-hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')))
+select hex(concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00'))) as exp;
+exp
 323030332D31322D33312032303A30303A3030
 create table t1 as select concat(convert_tz('2004-01-01 12:00:00','+10:00','-6:00')) as c1;
 show create table t1;
@@ -3925,8 +3925,8 @@ t1	CREATE TABLE `t1` (
   `c1` varchar(19) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
-select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)));
-hex(concat(date_add('2004-01-01 12:00:00', interval 1 day)))
+select hex(concat(date_add('2004-01-01 12:00:00', interval 1 day))) as exp;
+exp
 323030342D30312D30322031323A30303A3030
 create table t1 as select concat(date_add('2004-01-01 12:00:00', interval 1 day)) as c1;
 show create table t1;
@@ -9895,20 +9895,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10033,20 +10033,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10172,20 +10172,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -10310,20 +10310,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test
index a5607942d6a..a94f1cee00c 100644
--- a/mysql-test/main/ctype_utf8.test
+++ b/mysql-test/main/ctype_utf8.test
@@ -3,9 +3,6 @@
 # Tests with the utf8 character set
 #
 
-# Enable after fix MDEV-27904
--- source include/no_view_protocol.inc
-
 let $MYSQLD_DATADIR= `select @@datadir`;
 
 let collation=utf8mb3_unicode_ci;
@@ -58,15 +55,15 @@ select length(_utf8 0xD0B1), bit_length(_utf8 0xD0B1), char_length(_utf8 0xD0B1)
 select 'a' like 'a';
 select 'A' like 'a';
 select 'A' like 'a' collate utf8_bin;
-select _utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%');
+select _utf8 0xD0B0D0B1D0B2 like concat(_utf8'%',_utf8 0xD0B1,_utf8 '%') as exp;
 
 # Bug #6040: can't retrieve records with umlaut
 # characters in case insensitive manner.
 # Case insensitive search LIKE comparison
 # was broken for multibyte characters:
-select convert(_latin1'G�nter Andr�' using utf8) like CONVERT(_latin1'G�NTER%' USING utf8);
-select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8);
-select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8);
+select convert(_latin1'G�nter Andr�' using utf8) like CONVERT(_latin1'G�NTER%' USING utf8) as exp;
+select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8) as exp;
+select CONVERT(_koi8r'����' USING utf8) LIKE CONVERT(_koi8r'����' USING utf8) as exp;
 
 #
 # Fix this, it should return 1:
@@ -604,6 +601,7 @@ DROP TABLE t1;
 #
 # Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 table
 #
+--disable_service_connection
 SET NAMES latin1;
 CREATE TABLE t1 (
     id int unsigned NOT NULL auto_increment,
@@ -619,6 +617,7 @@ SELECT id, term FROM t1 where (list_id = 1) AND (term = "test
 SELECT id, term FROM t1 where (list_id = 1) AND (term = "testetest");
 SELECT id, term FROM t1 where (list_id = 1) AND (term = "test�test");
 DROP TABLE t1;
+--enable_service_connection
 
 #
 # Bug #6019 SELECT tries to use too short prefix index on utf8 data
@@ -671,10 +670,10 @@ drop table t1;
 #
 # Bug#22638 SOUNDEX broken for international characters
 #
-select soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB);
-select hex(soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB));
-select soundex(_utf8 0xD091D092D093);
-select hex(soundex(_utf8 0xD091D092D093));
+select soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB) as exp;
+select hex(soundex(_utf8 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)) as exp;
+select soundex(_utf8 0xD091D092D093) as exp;
+select hex(soundex(_utf8 0xD091D092D093)) as exp;
 
 
 SET collation_connection='utf8_general_ci';
@@ -710,7 +709,7 @@ drop table t1;
 #
 # Bug#8385: utf8_general_ci treats Cyrillic letters I and SHORT I as the same
 #
-select convert(_koi8r'�' using utf8) < convert(_koi8r'�' using utf8);
+select convert(_koi8r'�' using utf8) < convert(_koi8r'�' using utf8) as exp;
 
 #
 # Bugs#5980: NULL requires a characterset in a union
@@ -1088,6 +1087,7 @@ DROP TABLE t1;
 #            (see bug #16674 as well)
 #
 
+--disable_service_connection
 SET NAMES latin2;
 
 CREATE TABLE t1 (
@@ -1114,6 +1114,7 @@ ALTER TABLE t1 ADD KEY idx (tid,val(11));
 SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLN� ADSL'; 
 
 DROP TABLE t1;
+--enable_service_connection
 
 #
 # Bug 20709: problem with utf8 fields in temporary tables
@@ -1321,6 +1322,7 @@ drop table t1;
 # Conversion is possible if string repertoire is ASCII.
 # Conversion is not possible if the string have extended characters
 #
+--disable_service_connection
 set names utf8;
 create table t1 (a varchar(10) character set latin1, b int);
 insert into t1 values ('a',1);
@@ -1355,6 +1357,7 @@ select concat(a, if(b>10, 'x' 'x', 'y' 'y')) from t1;
 --error 1267
 select concat(a, if(b>10, 'x' 'æ', 'y' 'ß')) from t1;
 drop table t1;
+--enable_service_connection
 
 #
 # Bug#19960: Inconsistent results when joining
@@ -1471,7 +1474,10 @@ SELECT HEX(RPAD(_utf8 0xD18F, 3, 0x20));
 SELECT HEX(LPAD(_utf8 0xD18F, 3, 0x20));
 
 SELECT HEX(INSERT(_utf8 0xD18F, 2, 1, 0x20));
+#Enable view-protocol after fix MDEV-33942
+--disable_view_protocol
 SELECT HEX(INSERT(_utf8 0xD18FD18E, 2, 1, 0x20));
+--enable_view_protocol
 
 --echo #
 --echo # Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8_GENERAL_CI
@@ -1548,6 +1554,7 @@ CREATE TABLE t1 (
   s3 MEDIUMTEXT CHARACTER SET utf8,
   s4 LONGTEXT CHARACTER SET utf8
 );
+--disable_view_protocol
 --enable_metadata
 SET NAMES utf8, @@character_set_results=NULL;
 SELECT *, HEX(s1) FROM t1;
@@ -1556,6 +1563,7 @@ SELECT *, HEX(s1) FROM t1;
 SET NAMES utf8;
 SELECT *, HEX(s1) FROM t1;
 --disable_metadata
+--enable_view_protocol
 CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1;
 SHOW CREATE TABLE t2;
 DROP TABLE t1, t2;
diff --git a/mysql-test/main/ctype_utf8_uca.result b/mysql-test/main/ctype_utf8_uca.result
index 49e1dc65b8f..9506b231431 100644
--- a/mysql-test/main/ctype_utf8_uca.result
+++ b/mysql-test/main/ctype_utf8_uca.result
@@ -100,20 +100,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -238,20 +238,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -377,20 +377,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -515,20 +515,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result
index a7c69cdaebd..49814c6cecf 100644
--- a/mysql-test/main/ctype_utf8mb4.result
+++ b/mysql-test/main/ctype_utf8mb4.result
@@ -3048,20 +3048,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3186,20 +3186,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3325,20 +3325,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3463,20 +3463,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -3565,24 +3565,6 @@ DROP TABLE t1;
 # End of 10.2 tests
 #
 #
-# Start of 10.5 tests
-#
-#
-# MDEV-24584 Selecting INT column with COLLATE utf8mb4_general_ci throws an error
-#
-SET NAMES utf8mb4;
-SELECT 1 COLLATE utf8mb4_general_ci;
-1 COLLATE utf8mb4_general_ci
-1
-SELECT 1 COLLATE utf8mb4_bin;
-1 COLLATE utf8mb4_bin
-1
-SELECT 1 COLLATE latin1_swedish_ci;
-ERROR 42000: COLLATION 'latin1_swedish_ci' is not valid for CHARACTER SET 'utf8mb4'
-#
-# End of 10.5 tests
-#
-#
 # Start of 10.6 tests
 #
 #
@@ -3610,3 +3592,67 @@ DROP TABLE t1;
 #
 # End of 10.6 tests
 #
+#
+# Start of 10.11 tests
+#
+#
+# MDEV-24584 Selecting INT column with COLLATE utf8mb4_general_ci throws an error
+#
+SET NAMES utf8mb4;
+SELECT 1 COLLATE utf8mb4_general_ci;
+1 COLLATE utf8mb4_general_ci
+1
+SELECT 1 COLLATE utf8mb4_bin;
+1 COLLATE utf8mb4_bin
+1
+SELECT 1 COLLATE latin1_swedish_ci;
+ERROR 42000: COLLATION 'latin1_swedish_ci' is not valid for CHARACTER SET 'utf8mb4'
+#
+# MDEV-10865 COLLATE keyword doesn't work in PREPARE query
+#
+SET NAMES utf8mb4;
+CREATE TABLE t1 (
+c1 varchar(500) COLLATE utf8mb4_unicode_ci NOT NULL
+) CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+INSERT INTO t1 VALUES ('jj');
+SELECT * FROM t1 WHERE c1 LIKE 'jj' COLLATE utf8mb4_unicode_ci;
+c1
+jj
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1 LIKE ? COLLATE utf8mb4_unicode_ci';
+EXECUTE stmt USING 'jj';
+c1
+jj
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE utf8mb4_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(?) COLLATE utf8mb4_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT NULL COLLATE utf8mb4_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE utf8mb4_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` char(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+#
+# End of 10.11 tests
+#
diff --git a/mysql-test/main/ctype_utf8mb4.test b/mysql-test/main/ctype_utf8mb4.test
index f213ac63c4d..e14999c45d0 100644
--- a/mysql-test/main/ctype_utf8mb4.test
+++ b/mysql-test/main/ctype_utf8mb4.test
@@ -2027,25 +2027,6 @@ DROP TABLE t1;
 --echo # End of 10.2 tests
 --echo #
 
-
---echo #
---echo # Start of 10.5 tests
---echo #
-
---echo #
---echo # MDEV-24584 Selecting INT column with COLLATE utf8mb4_general_ci throws an error
---echo #
-
-SET NAMES utf8mb4;
-SELECT 1 COLLATE utf8mb4_general_ci;
-SELECT 1 COLLATE utf8mb4_bin;
---error ER_COLLATION_CHARSET_MISMATCH
-SELECT 1 COLLATE latin1_swedish_ci;
-
---echo #
---echo # End of 10.5 tests
---echo #
-
 --echo #
 --echo # Start of 10.6 tests
 --echo #
@@ -2071,3 +2052,55 @@ DROP TABLE t1;
 --echo #
 --echo # End of 10.6 tests
 --echo #
+
+
+--echo #
+--echo # Start of 10.11 tests
+--echo #
+
+--echo #
+--echo # MDEV-24584 Selecting INT column with COLLATE utf8mb4_general_ci throws an error
+--echo #
+
+SET NAMES utf8mb4;
+SELECT 1 COLLATE utf8mb4_general_ci;
+SELECT 1 COLLATE utf8mb4_bin;
+--error ER_COLLATION_CHARSET_MISMATCH
+SELECT 1 COLLATE latin1_swedish_ci;
+
+--echo #
+--echo # MDEV-10865 COLLATE keyword doesn't work in PREPARE query
+--echo #
+
+SET NAMES utf8mb4;
+CREATE TABLE t1 (
+   c1 varchar(500) COLLATE utf8mb4_unicode_ci NOT NULL
+) CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+INSERT INTO t1 VALUES ('jj');
+SELECT * FROM t1 WHERE c1 LIKE 'jj' COLLATE utf8mb4_unicode_ci;
+PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1 LIKE ? COLLATE utf8mb4_unicode_ci';
+EXECUTE stmt USING 'jj';
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT ? COLLATE utf8mb4_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+PREPARE stmt FROM 'CREATE TABLE t1 AS SELECT CONCAT(?) COLLATE utf8mb4_unicode_ci AS c1';
+EXECUTE stmt USING 'test';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT NULL COLLATE utf8mb4_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT CONCAT(NULL) COLLATE utf8mb4_unicode_ci AS c1;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+
+--echo #
+--echo # End of 10.11 tests
+--echo #
diff --git a/mysql-test/main/ctype_utf8mb4_heap.result b/mysql-test/main/ctype_utf8mb4_heap.result
index b8794a85b1d..7a6cf8d5626 100644
--- a/mysql-test/main/ctype_utf8mb4_heap.result
+++ b/mysql-test/main/ctype_utf8mb4_heap.result
@@ -36,23 +36,23 @@ locate('HE','hello' collate utf8mb4_bin,2)
 select locate('LO','hello' collate utf8mb4_bin,2);
 locate('LO','hello' collate utf8mb4_bin,2)
 0
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2);
-locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2)
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin);
-locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin)
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin) as exp;
+exp
 0
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin) as exp;
+exp
 0
-select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1);
-length(_utf8mb4 0xD0B1)	bit_length(_utf8mb4 0xD0B1)	char_length(_utf8mb4 0xD0B1)
+select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1) as exp;
+length(_utf8mb4 0xD0B1)	bit_length(_utf8mb4 0xD0B1)	exp
 2	16	1
 select 'a' like 'a';
 'a' like 'a'
@@ -63,17 +63,17 @@ select 'A' like 'a';
 select 'A' like 'a' collate utf8mb4_bin;
 'A' like 'a' collate utf8mb4_bin
 0
-select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%');
-_utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%')
+select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%') as exp;
+exp
 1
-select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4);
-convert(_latin1'G\xFCnter Andr\xE9' using utf8mb4) like CONVERT(_latin1'G\xDCNTER%' USING utf8mb4)
+select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
-CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) LIKE CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4)
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
-CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4)
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
+exp
 1
 SELECT 'a' = 'a ' collate utf8mb4_general_ci;
 'a' = 'a ' collate utf8mb4_general_ci
@@ -871,17 +871,17 @@ select * from t1 where soundex(a) = soundex('test');
 id	a
 1	Test
 drop table t1;
-select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB);
-soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)
+select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB) as exp;
+exp
 阅000
-select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB));
-hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB))
+select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)) as exp;
+exp
 E99885303030
-select soundex(_utf8mb4 0xD091D092D093);
-soundex(_utf8mb4 0xD091D092D093)
+select soundex(_utf8mb4 0xD091D092D093) as exp;
+exp
 Б000
-select hex(soundex(_utf8mb4 0xD091D092D093));
-hex(soundex(_utf8mb4 0xD091D092D093))
+select hex(soundex(_utf8mb4 0xD091D092D093)) as exp;
+exp
 D091303030
 SET collation_connection='utf8mb4_general_ci';
 create table t1 select repeat('a',4000) a;
@@ -1222,8 +1222,8 @@ concat(concat(_latin1'->',f1),_latin1'<-')
 -><-
 -><-
 drop table t1;
-select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4);
-convert(_koi8r'\xC9' using utf8mb4) < convert(_koi8r'\xCA' using utf8mb4)
+select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4) as exp;
+exp
 1
 set names latin1;
 create table t1 (a varchar(10)) character set utf8mb4 engine heap;
diff --git a/mysql-test/main/ctype_utf8mb4_innodb.result b/mysql-test/main/ctype_utf8mb4_innodb.result
index 4a3bf6ec6a4..a721294bda2 100644
--- a/mysql-test/main/ctype_utf8mb4_innodb.result
+++ b/mysql-test/main/ctype_utf8mb4_innodb.result
@@ -36,23 +36,23 @@ locate('HE','hello' collate utf8mb4_bin,2)
 select locate('LO','hello' collate utf8mb4_bin,2);
 locate('LO','hello' collate utf8mb4_bin,2)
 0
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2);
-locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2)
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin);
-locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin)
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin) as exp;
+exp
 0
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin) as exp;
+exp
 0
-select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1);
-length(_utf8mb4 0xD0B1)	bit_length(_utf8mb4 0xD0B1)	char_length(_utf8mb4 0xD0B1)
+select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1) as exp;
+length(_utf8mb4 0xD0B1)	bit_length(_utf8mb4 0xD0B1)	exp
 2	16	1
 select 'a' like 'a';
 'a' like 'a'
@@ -63,17 +63,17 @@ select 'A' like 'a';
 select 'A' like 'a' collate utf8mb4_bin;
 'A' like 'a' collate utf8mb4_bin
 0
-select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%');
-_utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%')
+select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%') as exp;
+exp
 1
-select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4);
-convert(_latin1'G\xFCnter Andr\xE9' using utf8mb4) like CONVERT(_latin1'G\xDCNTER%' USING utf8mb4)
+select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
-CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) LIKE CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4)
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
-CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4)
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
+exp
 1
 SELECT 'a' = 'a ' collate utf8mb4_general_ci;
 'a' = 'a ' collate utf8mb4_general_ci
@@ -934,17 +934,17 @@ select * from t1 where soundex(a) = soundex('test');
 id	a
 1	Test
 drop table t1;
-select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB);
-soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)
+select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB) as exp;
+exp
 阅000
-select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB));
-hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB))
+select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)) as exp;
+exp
 E99885303030
-select soundex(_utf8mb4 0xD091D092D093);
-soundex(_utf8mb4 0xD091D092D093)
+select soundex(_utf8mb4 0xD091D092D093) as exp;
+exp
 Б000
-select hex(soundex(_utf8mb4 0xD091D092D093));
-hex(soundex(_utf8mb4 0xD091D092D093))
+select hex(soundex(_utf8mb4 0xD091D092D093)) as exp;
+exp
 D091303030
 SET collation_connection='utf8mb4_general_ci';
 create table t1 select repeat('a',4000) a;
@@ -1285,8 +1285,8 @@ concat(concat(_latin1'->',f1),_latin1'<-')
 -><-
 -><-
 drop table t1;
-select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4);
-convert(_koi8r'\xC9' using utf8mb4) < convert(_koi8r'\xCA' using utf8mb4)
+select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4) as exp;
+exp
 1
 set names latin1;
 create table t1 (a varchar(10)) character set utf8mb4 engine InnoDB;
diff --git a/mysql-test/main/ctype_utf8mb4_innodb.test b/mysql-test/main/ctype_utf8mb4_innodb.test
index 75667e04d5f..3bf0612a1ab 100644
--- a/mysql-test/main/ctype_utf8mb4_innodb.test
+++ b/mysql-test/main/ctype_utf8mb4_innodb.test
@@ -1,6 +1,3 @@
-# Enable after fix MDEV-27904
--- source include/no_view_protocol.inc
-
 --source include/have_utf8mb4.inc
 --source include/have_innodb.inc
 
diff --git a/mysql-test/main/ctype_utf8mb4_myisam.result b/mysql-test/main/ctype_utf8mb4_myisam.result
index 069d9cce26e..29d2879fb80 100644
--- a/mysql-test/main/ctype_utf8mb4_myisam.result
+++ b/mysql-test/main/ctype_utf8mb4_myisam.result
@@ -36,23 +36,23 @@ locate('HE','hello' collate utf8mb4_bin,2)
 select locate('LO','hello' collate utf8mb4_bin,2);
 locate('LO','hello' collate utf8mb4_bin,2)
 0
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2);
-locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2)
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2) as exp;
+exp
 2
-select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin);
-locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin)
+select locate(_utf8mb4 0xD091, _utf8mb4 0xD0B0D0B1D0B2 collate utf8mb4_bin) as exp;
+exp
 0
-select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin);
-locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin)
+select locate(_utf8mb4 0xD0B1, _utf8mb4 0xD0B0D091D0B2 collate utf8mb4_bin) as exp;
+exp
 0
-select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1);
-length(_utf8mb4 0xD0B1)	bit_length(_utf8mb4 0xD0B1)	char_length(_utf8mb4 0xD0B1)
+select length(_utf8mb4 0xD0B1), bit_length(_utf8mb4 0xD0B1), char_length(_utf8mb4 0xD0B1) as exp;
+length(_utf8mb4 0xD0B1)	bit_length(_utf8mb4 0xD0B1)	exp
 2	16	1
 select 'a' like 'a';
 'a' like 'a'
@@ -63,17 +63,17 @@ select 'A' like 'a';
 select 'A' like 'a' collate utf8mb4_bin;
 'A' like 'a' collate utf8mb4_bin
 0
-select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%');
-_utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%')
+select _utf8mb4 0xD0B0D0B1D0B2 like concat(_utf8mb4'%',_utf8mb4 0xD0B1,_utf8mb4 '%') as exp;
+exp
 1
-select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4);
-convert(_latin1'G\xFCnter Andr\xE9' using utf8mb4) like CONVERT(_latin1'G\xDCNTER%' USING utf8mb4)
+select convert(_latin1'G�nter Andr�' using utf8mb4) like CONVERT(_latin1'G�NTER%' USING utf8mb4) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
-CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4) LIKE CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4)
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
+exp
 1
-select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4);
-CONVERT(_koi8r'\xF7\xE1\xF3\xF1' USING utf8mb4) LIKE CONVERT(_koi8r'\xD7\xC1\xD3\xD1' USING utf8mb4)
+select CONVERT(_koi8r'����' USING utf8mb4) LIKE CONVERT(_koi8r'����' USING utf8mb4) as exp;
+exp
 1
 SELECT 'a' = 'a ' collate utf8mb4_general_ci;
 'a' = 'a ' collate utf8mb4_general_ci
@@ -937,17 +937,17 @@ select * from t1 where soundex(a) = soundex('test');
 id	a
 1	Test
 drop table t1;
-select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB);
-soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)
+select soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB) as exp;
+exp
 阅000
-select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB));
-hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB))
+select hex(soundex(_utf8mb4 0xE99885E8A788E99A8FE697B6E69BB4E696B0E79A84E696B0E997BB)) as exp;
+exp
 E99885303030
-select soundex(_utf8mb4 0xD091D092D093);
-soundex(_utf8mb4 0xD091D092D093)
+select soundex(_utf8mb4 0xD091D092D093) as exp;
+exp
 Б000
-select hex(soundex(_utf8mb4 0xD091D092D093));
-hex(soundex(_utf8mb4 0xD091D092D093))
+select hex(soundex(_utf8mb4 0xD091D092D093)) as exp;
+exp
 D091303030
 SET collation_connection='utf8mb4_general_ci';
 create table t1 select repeat('a',4000) a;
@@ -1288,8 +1288,8 @@ concat(concat(_latin1'->',f1),_latin1'<-')
 -><-
 -><-
 drop table t1;
-select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4);
-convert(_koi8r'\xC9' using utf8mb4) < convert(_koi8r'\xCA' using utf8mb4)
+select convert(_koi8r'�' using utf8mb4) < convert(_koi8r'�' using utf8mb4) as exp;
+exp
 1
 set names latin1;
 create table t1 (a varchar(10)) character set utf8mb4 engine MyISAM;
diff --git a/mysql-test/main/ctype_utf8mb4_uca.result b/mysql-test/main/ctype_utf8mb4_uca.result
index 21391040417..3d4efe6818f 100644
--- a/mysql-test/main/ctype_utf8mb4_uca.result
+++ b/mysql-test/main/ctype_utf8mb4_uca.result
@@ -4031,8 +4031,8 @@ INSERT INTO t1 (s1) VALUES
 (_ucs2 0x1011103910191004103A1038 /* cooked rice */),
 (_ucs2 0x101C1000103A10181000103A),
 (_ucs2 0x101C103910181000103A /* tea */);
-SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) FROM t1 ORDER BY id;
-id	IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2))))
+SELECT id, IF(LEFT(s1,1)='-',s1,CONCAT(HEX(WEIGHT_STRING(s1)),'\t', HEX(CONVERT(s1 USING ucs2)))) as exp FROM t1 ORDER BY id;
+id	exp
 1	2259	108C
 2	22593ACB	1037
 3	22593ACC	1038
@@ -6117,20 +6117,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6255,20 +6255,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6394,20 +6394,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -6532,20 +6532,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8mb4_unicode_520_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8mb4_unicode_520_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/main/date_formats.result b/mysql-test/main/date_formats.result
index 9db6b3212e3..2c5adc691ef 100644
--- a/mysql-test/main/date_formats.result
+++ b/mysql-test/main/date_formats.result
@@ -1,9 +1,9 @@
 select str_to_date(concat('15-01-2001',' 2:59:58.999'),
-concat('%d-%m-%Y',' ','%H:%i:%s.%f')) as s;
-s
+concat('%d-%m-%Y',' ','%H:%i:%s.%f')) as exp;
+exp
 2001-01-15 02:59:58.999000
-select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T');
-STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T')
+select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T') as exp;
+exp
 NULL
 Warnings:
 Warning	1411	Incorrect time value: '22.30.61' for function str_to_date
@@ -238,8 +238,8 @@ Tuesday 52 2001	%W %V %X	00:00:00.000000
 15-01-2001	%d-%m-%Y %H:%i:%S	00:00:00.000000
 15-01-20	%d-%m-%y	00:00:00.000000
 15-2001-1	%d-%Y-%c	00:00:00.000000
-select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')) as s;
-s
+select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')) as exp;
+exp
 2003-01-02 08:11:02.123456
 truncate table t1;
 insert into t1 values
@@ -533,8 +533,8 @@ Thursday 01 January 2009
 # Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr'
 #
 SET NAMES utf8;
-SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) as s;
-s
+SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) as exp;
+exp
 %
 SET NAMES latin1;
 #
diff --git a/mysql-test/main/date_formats.test b/mysql-test/main/date_formats.test
index 691966de892..679158c9814 100644
--- a/mysql-test/main/date_formats.test
+++ b/mysql-test/main/date_formats.test
@@ -7,8 +7,8 @@
 #
 
 select str_to_date(concat('15-01-2001',' 2:59:58.999'),
-	           concat('%d-%m-%Y',' ','%H:%i:%s.%f')) as s;
-select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T');
+	           concat('%d-%m-%Y',' ','%H:%i:%s.%f')) as exp;
+select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T') as exp;
 
 create table t1 (date char(30), format char(30) not null);
 insert into t1 values
@@ -53,7 +53,7 @@ select date,format,DATE(str_to_date(date, format)) as date2 from t1;
 select date,format,TIME(str_to_date(date, format)) as time from t1;
 select date,format,concat(TIME(str_to_date(date, format))) as time2 from t1;
 # Test small bug in %f handling
-select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')) as s;
+select concat('',str_to_date('8:11:2.123456 03-01-02','%H:%i:%S.%f %y-%m-%d')) as exp;
 
 # Test wrong dates or converion specifiers
 
@@ -241,7 +241,7 @@ SELECT DATE_FORMAT("2009-01-01",'%W %d %M %Y') as valid_date;
 --echo # Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr'
 --echo #
 SET NAMES utf8;
-SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) as s;
+SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535))) as exp;
 SET NAMES latin1;
 
 --echo #
diff --git a/mysql-test/main/desc_index_range.result b/mysql-test/main/desc_index_range.result
index 1dc17702a9f..8c7985dc9ee 100644
--- a/mysql-test/main/desc_index_range.result
+++ b/mysql-test/main/desc_index_range.result
@@ -7,9 +7,9 @@ set optimizer_trace=1;
 explain select * from t1 force index(a) where a in (2, 4, 6);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	a	a	5	NULL	3	Using where; Using index
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+jd
 [
     [
         "(6) <= (a DESC) <= (6)",
@@ -38,18 +38,18 @@ set optimizer_trace=1;
 explain select * from t1 force index(ab) where a>=8 and b>=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	ab	ab	4	NULL	51	Using where; Using index
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+jd
 [
     ["(8) <= (a)"]
 ]
 explain select * from t1 force index(ab) where a>=8 and b<=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	ab	ab	8	NULL	46	Using where; Using index
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+jd
 [
     ["(8,50) <= (a,b DESC)"]
 ]
@@ -91,9 +91,9 @@ explain
 select * from t1 where a between 2 and 4 and b between 50 and 80;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	ab	ab	8	NULL	17	Using where; Using index
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+jd
 [
     ["(2,80) <= (a,b DESC) <= (4,50)"]
 ]
@@ -122,9 +122,9 @@ explain
 select * from t2 where a between 2 and 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	range	ab	ab	4	NULL	40	Using where; Using index
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+jd
 [
     ["(4) <= (a DESC) <= (2)"]
 ]
@@ -132,9 +132,9 @@ explain
 select * from t2 where a between 2 and 4 and b between 50 and 80;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	range	ab	ab	8	NULL	31	Using where; Using index
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+jd
 [
     ["(4,80) <= (a DESC,b DESC) <= (2,50)"]
 ]
@@ -147,9 +147,9 @@ insert into t1 select 2,seq from seq_0_to_1000;
 EXPLAIN select MIN(a) from t1 where p = 2 group by p;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	PRIMARY	PRIMARY	4	const	1000	Using index
-select json_detailed(json_extract(trace, '$**.potential_group_range_indexes'))
+select json_detailed(json_extract(trace, '$**.potential_group_range_indexes')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.potential_group_range_indexes'))
+jd
 [
     [
         {
diff --git a/mysql-test/main/desc_index_range.test b/mysql-test/main/desc_index_range.test
index ec52e254fe7..f3ad4495f35 100644
--- a/mysql-test/main/desc_index_range.test
+++ b/mysql-test/main/desc_index_range.test
@@ -16,12 +16,12 @@ insert into t1 select seq from seq_1_to_1000;
 set optimizer_trace=1;
 explain select * from t1 force index(a) where a in (2, 4, 6);
 
-#enable after fix MDEV-27871
+#Enable after fix MDEV-32034
 --disable_view_protocol
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
---enable_view_protocol
 set optimizer_trace=default;
+--enable_view_protocol
 
 --echo # These should go in reverse order:
 select * from t1 force index(a) where a in (2, 4, 6);
@@ -38,26 +38,29 @@ create table t1 (
 
 insert into t1 select A.seq, B.seq*10 from seq_1_to_10 A, seq_1_to_10 B;
 
-#enable after fix MDEV-27871
---disable_view_protocol
 set optimizer_trace=1;
 explain select * from t1 force index(ab) where a>=8 and b>=50;
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 explain select * from t1 force index(ab) where a>=8 and b<=50;
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
 --enable_view_protocol
 
 select * from t1 force index(ab) where a>=8 and b<=50;
 select * from t1 ignore index(ab) where a>=8 and b<=50 order by a, b desc;
 
-#enable after fix MDEV-27871
---disable_view_protocol
 explain
 select * from t1 where a between 2 and 4 and b between 50 and 80;
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
 --enable_view_protocol
 
@@ -72,16 +75,19 @@ create table t2 (
 );
 insert into t2 select A.seq, B.seq*10 from seq_1_to_10 A, seq_1_to_10 B;
 
-#enable after fix MDEV-27871
---disable_view_protocol
 explain
 select * from t2 where a between 2 and 4;
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 explain
 select * from t2 where a between 2 and 4 and b between 50 and 80;
-select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.range_access_plan.ranges')) as jd
 from information_schema.optimizer_trace;
 --enable_view_protocol
 
@@ -93,9 +99,9 @@ drop table t2;
 CREATE TABLE t1 (p int NOT NULL, a int NOT NULL, PRIMARY KEY (p,a desc));
 insert into t1 select 2,seq from seq_0_to_1000;
 EXPLAIN select MIN(a) from t1 where p = 2 group by p;
-#enable after fix MDEV-27871
+#Enable after fix MDEV-32034
 --disable_view_protocol
-select json_detailed(json_extract(trace, '$**.potential_group_range_indexes'))
+select json_detailed(json_extract(trace, '$**.potential_group_range_indexes')) as jd
 from information_schema.optimizer_trace;
 --enable_view_protocol
 drop table t1;
diff --git a/mysql-test/main/distinct_notembedded.test b/mysql-test/main/distinct_notembedded.test
index 9ef2f45913c..84d39f975a6 100644
--- a/mysql-test/main/distinct_notembedded.test
+++ b/mysql-test/main/distinct_notembedded.test
@@ -6,6 +6,8 @@
 --echo # MDEV-30660 COUNT DISTINCT seems unnecessarily slow when run on a PK
 --echo #
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 set @save_optimizer_trace = @@optimizer_trace;
 SET optimizer_trace='enabled=on';
 let $trace=
@@ -104,6 +106,8 @@ eval $trace;
 DROP TABLE t1, t2, t3;
 DROP VIEW v1;
 SET optimizer_trace = @save_optimizer_trace;
+--enable_view_protocol
+
 --echo #
 --echo # end of 10.5 tests
 --echo #
diff --git a/mysql-test/main/fulltext_left_join.result b/mysql-test/main/fulltext_left_join.result
index d5373037538..230ab39150d 100644
--- a/mysql-test/main/fulltext_left_join.result
+++ b/mysql-test/main/fulltext_left_join.result
@@ -16,16 +16,16 @@ author     VARCHAR(255) NOT NULL
 INSERT INTO t2 VALUES('123', 'moi');
 INSERT INTO t2 VALUES('123', 'lui');
 INSERT INTO t2 VALUES('456', 'lui');
-select round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5)
+select round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5) as exp
 from t1 left join t2 on t2.id=t1.id;
-round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5)
+exp
 0.00000
 0.00000
 0.67003
 0.00000
-select match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE)
+select match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE) as exp
 from t1 left join t2 on t2.id=t1.id;
-match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE)
+exp
 0
 0
 1
diff --git a/mysql-test/main/fulltext_left_join.test b/mysql-test/main/fulltext_left_join.test
index 8d08fba4301..1763c1802b1 100644
--- a/mysql-test/main/fulltext_left_join.test
+++ b/mysql-test/main/fulltext_left_join.test
@@ -24,13 +24,10 @@ INSERT INTO t2 VALUES('123', 'moi');
 INSERT INTO t2 VALUES('123', 'lui');
 INSERT INTO t2 VALUES('456', 'lui');
 
-select round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5)
+select round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5) as exp
        from t1 left join t2 on t2.id=t1.id;
-#enable after fix MDEV-27871
---disable_view_protocol
-select match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE)
+select match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE) as exp
        from t1 left join t2 on t2.id=t1.id;
---enable_view_protocol
 
 drop table t1, t2;
 
diff --git a/mysql-test/main/func_gconcat.result b/mysql-test/main/func_gconcat.result
index cf2cb137ca8..3a90b46a09b 100644
--- a/mysql-test/main/func_gconcat.result
+++ b/mysql-test/main/func_gconcat.result
@@ -1269,8 +1269,8 @@ SELECT * FROM v1;
 a	GROUP_CONCAT(a ORDER BY a)
 NULL	10,20,30
 DROP VIEW v1;
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP HAVING GROUP_CONCAT(a ORDER BY a)='10,20,30');
-(SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP HAVING GROUP_CONCAT(a ORDER BY a)='10,20,30')
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP HAVING GROUP_CONCAT(a ORDER BY a)='10,20,30') as exp;
+exp
 10,20,30
 CREATE VIEW v1 AS
 SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP HAVING GROUP_CONCAT(a ORDER BY a)='10,20,30');
diff --git a/mysql-test/main/func_gconcat.test b/mysql-test/main/func_gconcat.test
index c9787ce4471..09703db334a 100644
--- a/mysql-test/main/func_gconcat.test
+++ b/mysql-test/main/func_gconcat.test
@@ -950,10 +950,7 @@ SELECT * FROM (SELECT a,GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLU
 SELECT * FROM v1;
 DROP VIEW v1;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP HAVING GROUP_CONCAT(a ORDER BY a)='10,20,30');
---enable_view_protocol
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP HAVING GROUP_CONCAT(a ORDER BY a)='10,20,30') as exp;
 CREATE VIEW v1 AS
 SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP HAVING GROUP_CONCAT(a ORDER BY a)='10,20,30');
 SELECT * FROM v1;
diff --git a/mysql-test/main/func_group_innodb.result b/mysql-test/main/func_group_innodb.result
index 9f69f424f33..478ec4ef474 100644
--- a/mysql-test/main/func_group_innodb.result
+++ b/mysql-test/main/func_group_innodb.result
@@ -5,8 +5,8 @@ set global innodb_stats_persistent= 1;
 set global innodb_stats_persistent_sample_pages=100;
 create table t1 (USR_ID integer not null, MAX_REQ integer not null, constraint PK_SEA_USER primary key (USR_ID)) engine=InnoDB;
 insert into t1 values (1, 3);
-select count(*) + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ from t1 group by MAX_REQ;
-count(*) + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ
+select count(*) + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ  as exp from t1 group by MAX_REQ;
+exp
 1
 select Case When Count(*) < MAX_REQ Then 1 Else 0 End from t1 where t1.USR_ID = 1 group by MAX_REQ;
 Case When Count(*) < MAX_REQ Then 1 Else 0 End
diff --git a/mysql-test/main/func_group_innodb.test b/mysql-test/main/func_group_innodb.test
index ca6b083848c..3b885ae6c1b 100644
--- a/mysql-test/main/func_group_innodb.test
+++ b/mysql-test/main/func_group_innodb.test
@@ -15,10 +15,7 @@ set global innodb_stats_persistent_sample_pages=100;
 create table t1 (USR_ID integer not null, MAX_REQ integer not null, constraint PK_SEA_USER primary key (USR_ID)) engine=InnoDB;
 --enable_warnings
 insert into t1 values (1, 3);
-#enable after fix MDEV-27871
---disable_view_protocol
-select count(*) + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ from t1 group by MAX_REQ;
---enable_view_protocol
+select count(*) + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ  as exp from t1 group by MAX_REQ;
 select Case When Count(*) < MAX_REQ Then 1 Else 0 End from t1 where t1.USR_ID = 1 group by MAX_REQ;
 drop table t1;
 
diff --git a/mysql-test/main/func_in.result b/mysql-test/main/func_in.result
index 1ddb5257314..d6f21fade49 100644
--- a/mysql-test/main/func_in.result
+++ b/mysql-test/main/func_in.result
@@ -863,15 +863,15 @@ DROP TABLE t1;
 #
 # MDEV-11514 IN with a mixture of TIME and DATETIME returns a wrong result
 #
-SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32');
-TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32')
+SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32') as exp;
+exp
 1
-PREPARE stmt FROM "SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32')";
+PREPARE stmt FROM "SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32') as exp";
 EXECUTE stmt;
-TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32')
+exp
 1
 EXECUTE stmt;
-TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32')
+exp
 1
 DEALLOCATE PREPARE stmt;
 #
diff --git a/mysql-test/main/func_in.test b/mysql-test/main/func_in.test
index b88b68f2724..f78d691487f 100644
--- a/mysql-test/main/func_in.test
+++ b/mysql-test/main/func_in.test
@@ -652,14 +652,11 @@ DROP TABLE t1;
 --echo #
 --echo # MDEV-11514 IN with a mixture of TIME and DATETIME returns a wrong result
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32');
-PREPARE stmt FROM "SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32')";
+SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32') as exp;
+PREPARE stmt FROM "SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32') as exp";
 EXECUTE stmt;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
---enable_view_protocol
 
 --echo #
 --echo # MDEV-11497 Wrong result for (int_expr IN (mixture of signed and unsigned expressions))
diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
index 97329b343ac..193f2b4bf52 100644
--- a/mysql-test/main/func_json.result
+++ b/mysql-test/main/func_json.result
@@ -5215,5 +5215,15 @@ JSON_ARRAY_INTERSECT(c1, c2)
 [4]
 DROP TABLE t1;
 #
+# MDEV-31543: ASAN heap-buffer-overflow in strncpy when fetching keys using JSON_OBJECT_FILTER_KEYS function
+#
+SET @arr1='[1,2,"c"]';
+SET character_set_database=ucs2;
+SET CHARACTER SET utf8;
+SET @obj1='{ "a": 1,"b": 2,"c": 3}';
+SELECT JSON_OBJECT_FILTER_KEYS (@obj1,@arr1);
+JSON_OBJECT_FILTER_KEYS (@obj1,@arr1)
+NULL
+#
 # End of 11.2 Test
 #
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
index e1f45055d5d..9c58338488d 100644
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test
@@ -4096,6 +4096,16 @@ SELECT JSON_ARRAY_INTERSECT(c1, c2) FROM t1;
 DROP TABLE t1;
 
 
+--echo #
+--echo # MDEV-31543: ASAN heap-buffer-overflow in strncpy when fetching keys using JSON_OBJECT_FILTER_KEYS function
+--echo #
+
+SET @arr1='[1,2,"c"]';
+SET character_set_database=ucs2;
+SET CHARACTER SET utf8;
+SET @obj1='{ "a": 1,"b": 2,"c": 3}';
+SELECT JSON_OBJECT_FILTER_KEYS (@obj1,@arr1);
+
 --echo #
 --echo # End of 11.2 Test
 --echo #
diff --git a/mysql-test/main/func_misc.result b/mysql-test/main/func_misc.result
index 434745c66e3..14a621d1e76 100644
--- a/mysql-test/main/func_misc.result
+++ b/mysql-test/main/func_misc.result
@@ -1746,3 +1746,16 @@ RELEASE_ALL_LOCKS()
 SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
 FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
 LOCK_MODE	LOCK_TYPE	TABLE_SCHEMA
+#
+# MDEV-32583 UUID() should be treated as stochastic for the purposes of
+#   forcing query materialization
+#
+create table t1 as WITH cte AS (SELECT UUID() as r  FROM seq_1_to_10)
+SELECT r as r1, r FROM cte;
+select count(*) from t1 where r1!=r;
+count(*)
+0
+drop table t1;
+#
+# End of 10.5 tests
+#
diff --git a/mysql-test/main/func_misc.test b/mysql-test/main/func_misc.test
index 5b2c350497d..34186db6cf9 100644
--- a/mysql-test/main/func_misc.test
+++ b/mysql-test/main/func_misc.test
@@ -1367,3 +1367,18 @@ FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHE
 
 --enable_ps2_protocol
 --enable_view_protocol
+
+--echo #
+--echo # MDEV-32583 UUID() should be treated as stochastic for the purposes of
+--echo #   forcing query materialization
+--echo #
+
+--source include/have_sequence.inc
+create table t1 as WITH cte AS (SELECT UUID() as r  FROM seq_1_to_10)
+SELECT r as r1, r FROM cte;
+select count(*) from t1 where r1!=r;
+drop table t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
diff --git a/mysql-test/main/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result
index 7378aafa71a..afb2ab3dc5e 100644
--- a/mysql-test/main/func_regexp_pcre.result
+++ b/mysql-test/main/func_regexp_pcre.result
@@ -720,17 +720,17 @@ REGEXP_INSTR('вася','с')
 SELECT REGEXP_INSTR('вася','я');
 REGEXP_INSTR('вася','я')
 4
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('в' USING koi8r));
-REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('в' USING koi8r))
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('в' USING koi8r)) as exp;
+exp
 1
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('а' USING koi8r));
-REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('а' USING koi8r))
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('а' USING koi8r)) as exp;
+exp
 2
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('с' USING koi8r));
-REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('с' USING koi8r))
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('с' USING koi8r)) as exp;
+exp
 3
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('я' USING koi8r));
-REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('я' USING koi8r))
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('я' USING koi8r)) as exp;
+exp
 4
 #
 # Checking REGEXP_SUBSTR
@@ -757,8 +757,8 @@ t1	CREATE TABLE `t1` (
   `REGEXP_SUBSTR('abc','b')+0` double NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
-SELECT REGEXP_SUBSTR('See https://mariadb.org/en/foundation/ for details', 'https?://[^/]*');
-REGEXP_SUBSTR('See https://mariadb.org/en/foundation/ for details', 'https?://[^/]*')
+SELECT REGEXP_SUBSTR('See https://mariadb.org/en/foundation/ for details', 'https?://[^/]*') as exp;
+exp
 https://mariadb.org
 #
 # MDEV-6027 RLIKE: "." no longer matching new line
@@ -792,14 +792,14 @@ SELECT 'a\nb' RLIKE '(?-s)a.b';
 'a\nb' RLIKE '(?-s)a.b'
 0
 SET default_regex_flags=DEFAULT;
-SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
+SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$') as exp;
 ERROR 42000: Regex error 'two named subpatterns have the same name (PCRE2_DUPNAMES not set) at offset 30'
 SET default_regex_flags='DUPNAMES';
-SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
-REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$')
+SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$') as exp;
+exp
 Monday Mon
-SELECT REGEXP_SUBSTR('Tuesday Tue','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
-REGEXP_SUBSTR('Tuesday Tue','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$')
+SELECT REGEXP_SUBSTR('Tuesday Tue','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$') as exp;
+exp
 Tuesday Tue
 SET default_regex_flags=DEFAULT;
 SELECT 'AB' RLIKE 'A B';
@@ -850,8 +850,8 @@ SET default_regex_flags=DEFAULT;
 #
 # MDEV-6965 non-captured group \2 in regexp_replace
 #
-SELECT REGEXP_REPLACE('1 foo and bar', '(\\d+) foo and (\\d+ )?bar', '\\1 this and \\2that');
-REGEXP_REPLACE('1 foo and bar', '(\\d+) foo and (\\d+ )?bar', '\\1 this and \\2that')
+SELECT REGEXP_REPLACE('1 foo and bar', '(\\d+) foo and (\\d+ )?bar', '\\1 this and \\2that') as exp;
+exp
 1 this and that
 #
 # MDEV-8102 REGEXP function fails to match hex values when expression is stored as a variable
diff --git a/mysql-test/main/func_regexp_pcre.test b/mysql-test/main/func_regexp_pcre.test
index f3c4a25fe64..3629b0e7f45 100644
--- a/mysql-test/main/func_regexp_pcre.test
+++ b/mysql-test/main/func_regexp_pcre.test
@@ -326,13 +326,10 @@ SELECT REGEXP_INSTR('вася','в');
 SELECT REGEXP_INSTR('вася','а');
 SELECT REGEXP_INSTR('вася','с');
 SELECT REGEXP_INSTR('вася','я');
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('в' USING koi8r));
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('а' USING koi8r));
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('с' USING koi8r));
-SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('я' USING koi8r));
---enable_view_protocol
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('в' USING koi8r)) as exp;
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('а' USING koi8r)) as exp;
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('с' USING koi8r)) as exp;
+SELECT REGEXP_INSTR(CONVERT('вася' USING koi8r), CONVERT('я' USING koi8r)) as exp;
 
 --echo #
 --echo # Checking REGEXP_SUBSTR
@@ -352,10 +349,7 @@ CREATE TABLE t1 AS SELECT REGEXP_SUBSTR('abc','b')+0;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT REGEXP_SUBSTR('See https://mariadb.org/en/foundation/ for details', 'https?://[^/]*');
---enable_view_protocol
+SELECT REGEXP_SUBSTR('See https://mariadb.org/en/foundation/ for details', 'https?://[^/]*') as exp;
 
 --echo #
 --echo # MDEV-6027 RLIKE: "." no longer matching new line
@@ -372,16 +366,13 @@ SELECT 'a\nb' RLIKE 'a.b';
 SELECT 'a\nb' RLIKE '(?-s)a.b';
 SET default_regex_flags=DEFAULT;
 
-#enable after fix MDEV-27871
---disable_view_protocol
 # note that old pcre2 reports a different offset
 --replace_result 29 30
 --error ER_REGEXP_ERROR
-SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
+SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$') as exp;
 SET default_regex_flags='DUPNAMES';
-SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
-SELECT REGEXP_SUBSTR('Tuesday Tue','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
---enable_view_protocol
+SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$') as exp;
+SELECT REGEXP_SUBSTR('Tuesday Tue','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$') as exp;
 SET default_regex_flags=DEFAULT;
 
 SELECT 'AB' RLIKE 'A B';
@@ -417,10 +408,7 @@ SET default_regex_flags=DEFAULT;
 --echo #
 --echo # MDEV-6965 non-captured group \2 in regexp_replace
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT REGEXP_REPLACE('1 foo and bar', '(\\d+) foo and (\\d+ )?bar', '\\1 this and \\2that');
---enable_view_protocol
+SELECT REGEXP_REPLACE('1 foo and bar', '(\\d+) foo and (\\d+ )?bar', '\\1 this and \\2that') as exp;
 
 --echo #
 --echo # MDEV-8102 REGEXP function fails to match hex values when expression is stored as a variable
@@ -461,9 +449,6 @@ SELECT CAST(0xE001 AS BINARY) REGEXP @regCheck;
 SELECT 1 FROM dual WHERE ('Alpha,Bravo,Charlie,Delta,Echo,Foxtrot,StrataCentral,Golf,Hotel,India,Juliet,Kilo,Lima,Mike,StrataL3,November,Oscar,StrataL2,Sand,P3,P4SwitchTest,Arsys,Poppa,ExtensionMgr,Arp,Quebec,Romeo,StrataApiV2,PtReyes,Sierra,SandAcl,Arrow,Artools,BridgeTest,Tango,SandT,PAlaska,Namespace,Agent,Qos,PatchPanel,ProjectReport,Ark,Gimp,Agent,SliceAgent,Arnet,Bgp,Ale,Tommy,Central,AsicPktTestLib,Hsc,SandL3,Abuild,Pca9555,Standby,ControllerDut,CalSys,SandLib,Sb820,PointV2,BfnLib,Evpn,BfnSdk,Sflow,ManagementActive,AutoTest,GatedTest,Bgp,Sand,xinetd,BfnAgentLib,bf-utils,Hello,BfnState,Eos,Artest,Qos,Scd,ThermoMgr,Uniform,EosUtils,Eb,FanController,Central,BfnL3,BfnL2,tcp_wrappers,Victor,Environment,Route,Failover,Whiskey,Xray,Gimp,BfnFixed,Strata,SoCal,XApi,Msrp,XpProfile,tcpdump,PatchPanel,ArosTest,FhTest,Arbus,XpAcl,MacConc,XpApi,telnet,QosTest,Alpha2,BfnVlan,Stp,VxlanControllerTest,MplsAgent,Bravo2,Lanz,BfnMbb,Intf,XCtrl,Unicast,SandTunnel,L3Unicast,Ipsec,MplsTest,Rsvp,EthIntf,StageMgr,Sol,MplsUtils,Nat,Ira,P4NamespaceDut,Counters,Charlie2,Aqlc,Mlag,Power,OpenFlow,Lag,RestApi,BfdTest,strongs,Sfa,CEosUtils,Adt746,MaintenanceMode,MlagDut,EosImage,IpEth,MultiProtocol,Launcher,Max3179,Snmp,Acl,IpEthTest,PhyEee,bf-syslibs,tacc,XpL2,p4-ar-switch,p4-bf-switch,LdpTest,BfnPhy,Mirroring,Phy6,Ptp'  REGEXP '^((?!\b(Strata|StrataApi|StrataApiV2)\b).)*$');
 --enable_result_log
 --enable_warnings
-#enable after fix MDEV-27871
---disable_view_protocol
---enable_view_protocol
 
 #
 # MDEV-12942 REGEXP_INSTR returns 1 when using brackets
diff --git a/mysql-test/main/func_str.result b/mysql-test/main/func_str.result
index 027cc107cd4..74ae6ce295b 100644
--- a/mysql-test/main/func_str.result
+++ b/mysql-test/main/func_str.result
@@ -39,11 +39,11 @@ position(binary 'll' in 'hello')	position('a' in binary 'hello')
 select left('hello',null), right('hello',null);
 left('hello',null)	right('hello',null)
 NULL	NULL
-select left('hello',2),right('hello',2),substring('hello',2,2),mid('hello',1,5) ;
+select left('hello',2),right('hello',2),substring('hello',2,2),mid('hello',1,5);
 left('hello',2)	right('hello',2)	substring('hello',2,2)	mid('hello',1,5)
 he	lo	el	hello
-select concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1)) ;
-concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1))
+select concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1)) as exp;
+exp
 happy
 select substring_index('www.tcx.se','.',-2),substring_index('www.tcx.se','.',1);
 substring_index('www.tcx.se','.',-2)	substring_index('www.tcx.se','.',1)
@@ -171,23 +171,23 @@ the king of
 select substring_index('the king of the the hill','the',3);
 substring_index('the king of the the hill','the',3)
 the king of the 
-select concat(':',ltrim('  left  '),':',rtrim('  right  '),':');
-concat(':',ltrim('  left  '),':',rtrim('  right  '),':')
+select concat(':',ltrim('  left  '),':',rtrim('  right  '),':') as exp;
+exp
 :left  :  right:
-select concat(':',trim(leading from '  left  '),':',trim(trailing from '  right  '),':');
-concat(':',trim(leading from '  left  '),':',trim(trailing from '  right  '),':')
+select concat(':',trim(leading from '  left  '),':',trim(trailing from '  right  '),':') as exp;
+exp
 :left  :  right:
-select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':');
-concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':')
+select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':') as exp;
+exp
 :left: right:
-select concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':');
-concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':')
+select concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':') as exp;
+exp
 :m:y:s:
-select concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':');
-concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':')
+select concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':') as exp;
+exp
 :my:sql:
-select concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':');
-concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':')
+select concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':') as exp;
+exp
 :my:sql:
 select TRIM("foo" FROM "foo"), TRIM("foo" FROM "foook"), TRIM("foo" FROM "okfoo");
 TRIM("foo" FROM "foo")	TRIM("foo" FROM "foook")	TRIM("foo" FROM "okfoo")
@@ -201,8 +201,8 @@ NULL
 select concat_ws(',','',NULL,'a');
 concat_ws(',','',NULL,'a')
 ,a
-SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"');
-CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"')
+SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"') as exp;
+exp
 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";"cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc";"dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"
 select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es');
 insert('txs',2,1,'hi')	insert('is ',4,0,'a')	insert('txxxxt',2,4,'es')
@@ -215,8 +215,8 @@ Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is
 def					replace('aaaa','a','bbbb')	253	16	16	Y	0	39	8
 replace('aaaa','a','bbbb')
 bbbbbbbbbbbbbbbb
-select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ;
-replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL')
+select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') as exp;
+exp
 this is a REAL test
 select soundex(''),soundex('he'),soundex('hello all folks'),soundex('#3556 in bugdb');
 soundex('')	soundex('he')	soundex('hello all folks')	soundex('#3556 in bugdb')
@@ -311,11 +311,11 @@ NULL	NULL
 select least(1,2,3) | greatest(16,32,8), least(5,4)*1,greatest(-1.0,1.0)*1,least(3,2,1)*1.0,greatest(1,1.1,1.0),least("10",9),greatest("A","B","0");
 least(1,2,3) | greatest(16,32,8)	least(5,4)*1	greatest(-1.0,1.0)*1	least(3,2,1)*1.0	greatest(1,1.1,1.0)	least("10",9)	greatest("A","B","0")
 33	4	1.0	1.0	1.1	9	B
-select decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000);
-decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000)
+select decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000) as exp;
+exp
 1
-select decode(encode("abcdef","monty"),"monty")="abcdef";
-decode(encode("abcdef","monty"),"monty")="abcdef"
+select decode(encode("abcdef","monty"),"monty")="abcdef" as exp;
+exp
 1
 select quote('\'\"\\test');
 quote('\'\"\\test')
@@ -331,11 +331,11 @@ Warning	1365	Division by 0
 select length(quote(concat(char(0),"test")));
 length(quote(concat(char(0),"test")))
 8
-select hex(quote(concat(char(224),char(227),char(230),char(231),char(232),char(234),char(235))));
-hex(quote(concat(char(224),char(227),char(230),char(231),char(232),char(234),char(235))))
+select hex(quote(concat(char(224),char(227),char(230),char(231),char(232),char(234),char(235)))) as exp;
+exp
 27E0E3E6E7E8EAEB27
-select unhex(hex("foobar")), hex(unhex("1234567890ABCDEF")), unhex("345678"), unhex(NULL);
-unhex(hex("foobar"))	hex(unhex("1234567890ABCDEF"))	unhex("345678")	unhex(NULL)
+select unhex(hex("foobar")), hex(unhex("1234567890ABCDEF")), unhex("345678"), unhex(NULL) as exp;
+unhex(hex("foobar"))	hex(unhex("1234567890ABCDEF"))	unhex("345678")	exp
 foobar	1234567890ABCDEF	4Vx	NULL
 select hex(unhex("1")), hex(unhex("12")), hex(unhex("123")), hex(unhex("1234")), hex(unhex("12345")), hex(unhex("123456"));
 hex(unhex("1"))	hex(unhex("12"))	hex(unhex("123"))	hex(unhex("1234"))	hex(unhex("12345"))	hex(unhex("123456"))
@@ -408,17 +408,17 @@ bugstatus int(10) unsigned default NULL,
 submitter int(10) unsigned default NULL
 ) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1,'Link',1,1,1,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa','2001-02-28 08:40:16',20010228084016,0,4);
-SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter), '"') FROM t1;
-CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter), '"')
+SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter), '"') as exp FROM t1;
+exp
 "Link";"1";"1";"1";"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";"2001-02-28 08:40:16";"20010228084016";"0";"4"
-SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') FROM t1;
-CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"')
+SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') as exp FROM t1;
+exp
 "Link";"1";"1";"1";"0";"4"
-SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter) FROM t1;
-CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter)
+SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter) as exp FROM t1;
+exp
 Link";"1";"1";"1";"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";"2001-02-28 08:40:16";"20010228084016";"0";"4
-SELECT bugdesc, REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb') from t1 group by bugdesc;
-bugdesc	REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb')
+SELECT bugdesc, REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb') as exp from t1 group by bugdesc;
+bugdesc	exp
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 drop table t1;
 CREATE TABLE t1 (id int(11) NOT NULL auto_increment, tmp text NOT NULL, KEY id (id)) ENGINE=MyISAM;
@@ -747,7 +747,7 @@ t1	CREATE TABLE `t1` (
   `bin(130)` varchar(64) DEFAULT NULL,
   `oct(130)` varchar(64) DEFAULT NULL,
   `conv(130,16,10)` varchar(64) DEFAULT NULL,
-  `hex(130)` varchar(6) DEFAULT NULL,
+  `hex(130)` varchar(16) DEFAULT NULL,
   `char(130)` varbinary(4) DEFAULT NULL,
   `format(130,10)` varchar(25) DEFAULT NULL,
   `left(_latin2'a',1)` varchar(1) CHARACTER SET latin2 COLLATE latin2_general_ci DEFAULT NULL,
@@ -2016,35 +2016,35 @@ hello
 select insert('hello', 4294967297, 4294967297, 'hi');
 insert('hello', 4294967297, 4294967297, 'hi')
 hello
-select insert('hello', -18446744073709551615, -18446744073709551615, 'hi');
-insert('hello', -18446744073709551615, -18446744073709551615, 'hi')
+select insert('hello', -18446744073709551615, -18446744073709551615, 'hi') as exp;
+exp
 hello
 Warnings:
 Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated
 Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated
-select insert('hello', 18446744073709551615, 18446744073709551615, 'hi');
-insert('hello', 18446744073709551615, 18446744073709551615, 'hi')
+select insert('hello', 18446744073709551615, 18446744073709551615, 'hi') as exp;
+exp
 hello
-select insert('hello', -18446744073709551616, -18446744073709551616, 'hi');
-insert('hello', -18446744073709551616, -18446744073709551616, 'hi')
+select insert('hello', -18446744073709551616, -18446744073709551616, 'hi') as exp;
+exp
 hello
 Warnings:
 Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated
 Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated
-select insert('hello', 18446744073709551616, 18446744073709551616, 'hi');
-insert('hello', 18446744073709551616, 18446744073709551616, 'hi')
+select insert('hello', 18446744073709551616, 18446744073709551616, 'hi') as exp;
+exp
 hello
 Warnings:
 Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated
 Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated
-select insert('hello', -18446744073709551617, -18446744073709551617, 'hi');
-insert('hello', -18446744073709551617, -18446744073709551617, 'hi')
+select insert('hello', -18446744073709551617, -18446744073709551617, 'hi') as exp;
+exp
 hello
 Warnings:
 Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated
 Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated
-select insert('hello', 18446744073709551617, 18446744073709551617, 'hi');
-insert('hello', 18446744073709551617, 18446744073709551617, 'hi')
+select insert('hello', 18446744073709551617, 18446744073709551617, 'hi') as exp;
+exp
 hello
 Warnings:
 Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated
@@ -2766,25 +2766,25 @@ CREATE TABLE t1 (a VARCHAR(20), b INT);
 CREATE TABLE t2 (a VARCHAR(20), b INT);
 INSERT INTO t1 VALUES ('ABC', 1);
 INSERT INTO t2 VALUES ('ABC', 1);
-SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
+SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a) as exp
 FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
-DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
+exp
 secret
-SELECT DECODE((SELECT ENCODE('secret', 'ABC') FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
+SELECT DECODE((SELECT ENCODE('secret', 'ABC') FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a) as exp
 FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
-DECODE((SELECT ENCODE('secret', 'ABC') FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
+exp
 secret
-SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), 'ABC')
+SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), 'ABC') as exp
 FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
-DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), 'ABC')
+exp
 secret
 TRUNCATE TABLE t1;
 TRUNCATE TABLE t2;
 INSERT INTO t1 VALUES ('EDF', 3), ('BCD', 2), ('ABC', 1);
 INSERT INTO t2 VALUES ('EDF', 3), ('BCD', 2), ('ABC', 1);
-SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b LIMIT 1), t2.a)
+SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b LIMIT 1), t2.a) as exp
 FROM t2 WHERE t2.b = 1 GROUP BY t2.b;
-DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b LIMIT 1), t2.a)
+exp
 secret
 DROP TABLE t1, t2;
 #
@@ -3066,10 +3066,8 @@ SELECT (rpad(1.0,2048,1)) IS NOT FALSE;
 1
 SELECT ((+0) IN
 ((0b111111111111111111111111111111111111111111111111111),(rpad(1.0,2048,1)),
-(32767.1)));
-((+0) IN
-((0b111111111111111111111111111111111111111111111111111),(rpad(1.0,2048,1)),
-(32767.1)))
+(32767.1))) as exp;
+exp
 0
 SELECT ((rpad(1.0,2048,1)) = ('4(') ^ (0.1));
 ((rpad(1.0,2048,1)) = ('4(') ^ (0.1))
@@ -5023,8 +5021,8 @@ DROP TABLE t1;
 #
 # MDEV-24742 Server crashes in Charset::numchars / String::numchars
 #
-SELECT NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux');
-NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux')
+SELECT NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux') as exp;
+exp
 NULL
 #
 # Bug#31374305 - FORMAT() NOT DISPLAYING WHOLE NUMBER SIDE CORRECTLY
diff --git a/mysql-test/main/func_str.test b/mysql-test/main/func_str.test
index 2b3ab87ed2a..889d8583130 100644
--- a/mysql-test/main/func_str.test
+++ b/mysql-test/main/func_str.test
@@ -28,14 +28,11 @@ select position(binary 'll' in 'hello'),position('a' in binary 'hello');
 # strange undocumented behaviour, strict mode
 #
 select left('hello',null), right('hello',null);
-select left('hello',2),right('hello',2),substring('hello',2,2),mid('hello',1,5) ;
-#enable after fix MDEV-27871
---disable_view_protocol
-select concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1)) ;
+select left('hello',2),right('hello',2),substring('hello',2,2),mid('hello',1,5);
+select concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1)) as exp;
 select substring_index('www.tcx.se','.',-2),substring_index('www.tcx.se','.',1);
 select substring_index('www.tcx.se','tcx',1),substring_index('www.tcx.se','tcx',-1);
 select substring_index('.tcx.se','.',-2),substring_index('.tcx.se','.tcx',-1);
---enable_view_protocol
 select substring_index('aaaaaaaaa1','a',1);
 select substring_index('aaaaaaaaa1','aa',1);
 select substring_index('aaaaaaaaa1','aa',2);
@@ -79,32 +76,28 @@ select substring_index('the king of the the hill','the',1);
 select substring_index('the king of the the hill','the',2);
 select substring_index('the king of the the hill','the',3);
 
-select concat(':',ltrim('  left  '),':',rtrim('  right  '),':');
-#enable after fix MDEV-27871
---disable_view_protocol
-select concat(':',trim(leading from '  left  '),':',trim(trailing from '  right  '),':');
-select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':');
-select concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':');
-select concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':');
-select concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':');
+select concat(':',ltrim('  left  '),':',rtrim('  right  '),':') as exp;
+select concat(':',trim(leading from '  left  '),':',trim(trailing from '  right  '),':') as exp;
+select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':') as exp;
+select concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':') as exp;
+select concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':') as exp;
+select concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':') as exp;
 select TRIM("foo" FROM "foo"), TRIM("foo" FROM "foook"), TRIM("foo" FROM "okfoo");
---enable_view_protocol
 
 select concat_ws(', ','monty','was here','again');
 select concat_ws(NULL,'a'),concat_ws(',',NULL,'');
 select concat_ws(',','',NULL,'a');
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"');
+SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"') as exp;
 
 select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es');
 select replace('aaaa','a','b'),replace('aaaa','aa','b'),replace('aaaa','a','bb'),replace('aaaa','','b'),replace('bbbb','a','c');
+--disable_view_protocol
 --enable_metadata
 select replace('aaaa','a','bbbb');
 --disable_metadata
-select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ;
-select soundex(''),soundex('he'),soundex('hello all folks'),soundex('#3556 in bugdb');
 --enable_view_protocol
+select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') as exp;
+select soundex(''),soundex('he'),soundex('hello all folks'),soundex('#3556 in bugdb');
 select 'mood' sounds like 'mud';
 select 'Glazgo' sounds like 'Liverpool';
 select null sounds like 'null';
@@ -137,32 +130,22 @@ select rpad('abcd',7),lpad('abcd',7);
 select LEAST(NULL,'HARRY','HARRIOT',NULL,'HAROLD'),GREATEST(NULL,'HARRY','HARRIOT',NULL,'HAROLD');
 select least(1,2,3) | greatest(16,32,8), least(5,4)*1,greatest(-1.0,1.0)*1,least(3,2,1)*1.0,greatest(1,1.1,1.0),least("10",9),greatest("A","B","0");
 
-#enable after fix MDEV-27871
---disable_view_protocol
-select decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000);
---enable_view_protocol
-select decode(encode("abcdef","monty"),"monty")="abcdef";
+select decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000) as exp;
+select decode(encode("abcdef","monty"),"monty")="abcdef" as exp;
 
 select quote('\'\"\\test');
 select quote(concat('abc\'', '\\cba'));
 select quote(1/0), quote('\0\Z');
 select length(quote(concat(char(0),"test")));
-#enable after fix MDEV-27871
---disable_view_protocol
-select hex(quote(concat(char(224),char(227),char(230),char(231),char(232),char(234),char(235))));
-select unhex(hex("foobar")), hex(unhex("1234567890ABCDEF")), unhex("345678"), unhex(NULL);
---enable_view_protocol
+select hex(quote(concat(char(224),char(227),char(230),char(231),char(232),char(234),char(235)))) as exp;
+select unhex(hex("foobar")), hex(unhex("1234567890ABCDEF")), unhex("345678"), unhex(NULL) as exp;
 select hex(unhex("1")), hex(unhex("12")), hex(unhex("123")), hex(unhex("1234")), hex(unhex("12345")), hex(unhex("123456"));
 select length(unhex(md5("abrakadabra")));
 
 #
 # Bug #6564: QUOTE(NULL
 #
-
-#enable after fix MDEV-28651
---disable_view_protocol
 select concat('a', quote(NULL));
---enable_view_protocol
 
 #
 # Wrong usage of functions
@@ -211,14 +194,11 @@ CREATE TABLE t1 (
   submitter int(10) unsigned default NULL
 ) ENGINE=MyISAM;
 
-#enable after fix MDEV-27871
---disable_view_protocol
 INSERT INTO t1 VALUES (1,'Link',1,1,1,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa','2001-02-28 08:40:16',20010228084016,0,4);
-SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter), '"') FROM t1;
-SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') FROM t1;
-SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter) FROM t1;
-SELECT bugdesc, REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb') from t1 group by bugdesc;
---enable_view_protocol
+SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter), '"') as exp FROM t1;
+SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') as exp FROM t1;
+SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified+0,bugstatus,submitter) as exp FROM t1;
+SELECT bugdesc, REPLACE(bugdesc, 'xxxxxxxxxxxxxxxxxxxx', 'bbbbbbbbbbbbbbbbbbbb') as exp from t1 group by bugdesc;
 drop table t1;
 
 #
@@ -1138,15 +1118,12 @@ select insert('hello', -4294967296, -4294967296, 'hi');
 select insert('hello', 4294967296, 4294967296, 'hi');
 select insert('hello', -4294967297, -4294967297, 'hi');
 select insert('hello', 4294967297, 4294967297, 'hi');
-#enable after fix MDEV-27871
---disable_view_protocol
-select insert('hello', -18446744073709551615, -18446744073709551615, 'hi');
-select insert('hello', 18446744073709551615, 18446744073709551615, 'hi');
-select insert('hello', -18446744073709551616, -18446744073709551616, 'hi');
-select insert('hello', 18446744073709551616, 18446744073709551616, 'hi');
-select insert('hello', -18446744073709551617, -18446744073709551617, 'hi');
-select insert('hello', 18446744073709551617, 18446744073709551617, 'hi');
---enable_view_protocol
+select insert('hello', -18446744073709551615, -18446744073709551615, 'hi') as exp;
+select insert('hello', 18446744073709551615, 18446744073709551615, 'hi') as exp;
+select insert('hello', -18446744073709551616, -18446744073709551616, 'hi') as exp;
+select insert('hello', 18446744073709551616, 18446744073709551616, 'hi') as exp;
+select insert('hello', -18446744073709551617, -18446744073709551617, 'hi') as exp;
+select insert('hello', 18446744073709551617, 18446744073709551617, 'hi') as exp;
 
 select repeat('hello', -1);
 select repeat('hello', -4294967295);
@@ -1491,17 +1468,14 @@ CREATE TABLE t2 (a VARCHAR(20), b INT);
 INSERT INTO t1 VALUES ('ABC', 1);
 INSERT INTO t2 VALUES ('ABC', 1);
 
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
+SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a) as exp
   FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
 
-SELECT DECODE((SELECT ENCODE('secret', 'ABC') FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a)
+SELECT DECODE((SELECT ENCODE('secret', 'ABC') FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), t2.a) as exp
   FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
 
-SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), 'ABC')
+SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b), 'ABC') as exp
   FROM t1,t2 WHERE t1.b = t1.b > 0 GROUP BY t2.b;
---enable_view_protocol
 
 TRUNCATE TABLE t1;
 TRUNCATE TABLE t2;
@@ -1509,11 +1483,8 @@ TRUNCATE TABLE t2;
 INSERT INTO t1 VALUES ('EDF', 3), ('BCD', 2), ('ABC', 1);
 INSERT INTO t2 VALUES ('EDF', 3), ('BCD', 2), ('ABC', 1);
 
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b LIMIT 1), t2.a)
+SELECT DECODE((SELECT ENCODE('secret', t1.a) FROM t1,t2 WHERE t1.a = t2.a GROUP BY t1.b LIMIT 1), t2.a) as exp
   FROM t2 WHERE t2.b = 1 GROUP BY t2.b;
---enable_view_protocol
 
 DROP TABLE t1, t2;
 
@@ -1679,14 +1650,11 @@ SELECT CONV(1,-2147483648,-2147483648);
 --echo # Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORY
 --echo #
 
-#enable after fix MDEV-27871
---disable_view_protocol
 SELECT (rpad(1.0,2048,1)) IS NOT FALSE;
 SELECT ((+0) IN
 ((0b111111111111111111111111111111111111111111111111111),(rpad(1.0,2048,1)),
-(32767.1)));
+(32767.1))) as exp;
 SELECT ((rpad(1.0,2048,1)) = ('4(') ^ (0.1));
---enable_view_protocol
 
 --error 1690
 SELECT
@@ -2114,10 +2082,7 @@ DROP TABLE t1;
 --echo # MDEV-24742 Server crashes in Charset::numchars / String::numchars
 --echo #
 
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux');
---enable_view_protocol
+SELECT NULL IN (RIGHT(AES_ENCRYPT('foo','bar'), LAST_INSERT_ID()), 'qux') as exp;
 
 --echo #
 --echo # Bug#31374305 - FORMAT() NOT DISPLAYING WHOLE NUMBER SIDE CORRECTLY
diff --git a/mysql-test/main/func_time_hires.result b/mysql-test/main/func_time_hires.result
index 24221eeed16..7bbf557a5ed 100644
--- a/mysql-test/main/func_time_hires.result
+++ b/mysql-test/main/func_time_hires.result
@@ -162,17 +162,17 @@ cast(cast(@a as time(2)) as time(6))
 12:13:14.120000
 select CAST(@a AS DATETIME(7));
 ERROR 42000: Too big precision specified for '@`a`'. Maximum is 6
-SELECT CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00');
-CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00')
+SELECT CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00') as exp;
+exp
 2011-01-02 15:00:00
-SELECT CONVERT_TZ('2011-01-02 12:00:00.123', '+00:00', '+03:00');
-CONVERT_TZ('2011-01-02 12:00:00.123', '+00:00', '+03:00')
+SELECT CONVERT_TZ('2011-01-02 12:00:00.123', '+00:00', '+03:00') as exp;
+exp
 2011-01-02 15:00:00.123
-SELECT CONVERT_TZ('2011-01-02 12:00:00.123456', '+00:00', '+03:00');
-CONVERT_TZ('2011-01-02 12:00:00.123456', '+00:00', '+03:00')
+SELECT CONVERT_TZ('2011-01-02 12:00:00.123456', '+00:00', '+03:00') as exp;
+exp
 2011-01-02 15:00:00.123456
-SELECT CONVERT_TZ(CAST('2010-10-10 10:10:10.123456' AS DATETIME(4)), '+00:00', '+03:00');
-CONVERT_TZ(CAST('2010-10-10 10:10:10.123456' AS DATETIME(4)), '+00:00', '+03:00')
+SELECT CONVERT_TZ(CAST('2010-10-10 10:10:10.123456' AS DATETIME(4)), '+00:00', '+03:00') as exp;
+exp
 2010-10-10 13:10:10.1234
 create table t1 (a varchar(200));
 insert t1 values (now(6));
diff --git a/mysql-test/main/func_time_hires.test b/mysql-test/main/func_time_hires.test
index dca8d458f8a..507c7ac240f 100644
--- a/mysql-test/main/func_time_hires.test
+++ b/mysql-test/main/func_time_hires.test
@@ -80,13 +80,10 @@ select CAST(@a AS DATETIME(7));
 #
 # CONVERT_TZ
 #
-SELECT CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00');
-SELECT CONVERT_TZ('2011-01-02 12:00:00.123', '+00:00', '+03:00');
-SELECT CONVERT_TZ('2011-01-02 12:00:00.123456', '+00:00', '+03:00');
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT CONVERT_TZ(CAST('2010-10-10 10:10:10.123456' AS DATETIME(4)), '+00:00', '+03:00');
---enable_view_protocol
+SELECT CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00') as exp;
+SELECT CONVERT_TZ('2011-01-02 12:00:00.123', '+00:00', '+03:00') as exp;
+SELECT CONVERT_TZ('2011-01-02 12:00:00.123456', '+00:00', '+03:00') as exp;
+SELECT CONVERT_TZ(CAST('2010-10-10 10:10:10.123456' AS DATETIME(4)), '+00:00', '+03:00') as exp;
 
 #
 # Field::store_time()
diff --git a/mysql-test/main/gis-debug.result b/mysql-test/main/gis-debug.result
index 7d143ad3f45..7c217c16393 100644
--- a/mysql-test/main/gis-debug.result
+++ b/mysql-test/main/gis-debug.result
@@ -238,30 +238,26 @@ dist	buffer	buf_area
 -1	POLYGON	16.00
 SELECT ST_CONTAINS(
 GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)'));
-ST_CONTAINS(
-GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)'))
+GeomFromText('POINT(5 10)')) as geom;
+geom
 0
 SELECT AsText(ST_UNION(
 GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)')));
-AsText(ST_UNION(
-GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)')))
+GeomFromText('POINT(5 10)'))) as geom;
+geom
 GEOMETRYCOLLECTION(POLYGON((0 0,0 5,5 5,5 0,0 0)),POLYGON((6 6,6 11,11 11,11 6,6 6)),POINT(5 10))
 DROP PROCEDURE p1;
 #
 # Bug #13833019 ASSERTION `T1->RESULT_RANGE' FAILED IN GCALC_OPERATION_REDUCER::END_COUPLE
 #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3));
-GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3))
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3)) as geom;
+geom
 POLYGON
 #
 # Bug #13832749 	HANDLE_FATAL_SIGNAL IN GCALC_FUNCTION::COUNT_INTERNAL
 #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1));
-GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1))
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1)) as geom;
+geom
 POLYGON
 #
 # Bug#13358363 - ASSERTION: N > 0 && N < SINUSES_CALCULATED*2+1 | GET_N_SINCOS/ADD_EDGE_BUFFER
@@ -272,27 +268,21 @@ Warning	1292	Truncated incorrect DOUBLE value: ''
 SELECT ST_WITHIN(
 LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
 ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) '))));
-ST_WITHIN(
-LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
-ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) ')
+ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) ')))) as st;
+st
 0
 SELECT ST_DIMENSION(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((3 5,2 5,2 4,3 4,3 5)) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))'))));
-ST_DIMENSION(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((3 5,2 5,2 4,3 4,3 5)) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))'))))
+ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))')))) as st;
+st
 2
 SELECT ST_NUMINTERIORRINGS(
 ST_ENVELOPE(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5))) '),
-SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) ')))));
-ST_NUMINTERIORRINGS(
-ST_ENVELOPE(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5))) '),
-SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) ')))))
+SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) '))))) as st;
+st
 0
 SELECT ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
-SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))));
-ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
-SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))))
+SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) ')))) as st;
+st
 POLYGON((9 9,5 2,4 5,9 9))
 #
 # Start of 10.2 tests
diff --git a/mysql-test/main/gis-precise.result b/mysql-test/main/gis-precise.result
index 513d8b6e8c2..a75b71f4c8b 100644
--- a/mysql-test/main/gis-precise.result
+++ b/mysql-test/main/gis-precise.result
@@ -1,21 +1,21 @@
 DROP TABLE IF EXISTS t1;
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 0,20 20,0 20,0 0))'), GeomFromText('POLYGON((10 10,30 10,30 30,10 30,10 10))'));
-1	ST_Intersects(GeomFromText('POLYGON((0 0,20 0,20 20,0 20,0 0))'), GeomFromText('POLYGON((10 10,30 10,30 30,10 30,10 10))'))
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 0,20 20,0 20,0 0))'), GeomFromText('POLYGON((10 10,30 10,30 30,10 30,10 10))')) as result;
+1	result
 1	1
-select 0, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 40, 40 50, 20 70, 10 40))'));
-0	ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 40, 40 50, 20 70, 10 40))'))
+select 0, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 40, 40 50, 20 70, 10 40))')) as result;
+0	result
 0	0
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POINT(10 10)'));
-1	ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POINT(10 10)'))
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POINT(10 10)')) as result;
+1	result
 1	1
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
-1	ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'))
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
+1	result
 1	1
-select 0, ST_Within(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
-0	ST_Within(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'))
+select 0, ST_Within(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
+0	result
 0	0
-select 1, ST_Within(GeomFromText('POLYGON((1 1,20 10,10 30, 1 1))'), GeomFromText('POLYGON((0 0,30 5,10 40, 0 0))'));
-1	ST_Within(GeomFromText('POLYGON((1 1,20 10,10 30, 1 1))'), GeomFromText('POLYGON((0 0,30 5,10 40, 0 0))'))
+select 1, ST_Within(GeomFromText('POLYGON((1 1,20 10,10 30, 1 1))'), GeomFromText('POLYGON((0 0,30 5,10 40, 0 0))')) as result;
+1	result
 1	1
 create table t1 (g point);
 insert into t1 values 
@@ -66,89 +66,89 @@ POINT(6 2)
 POINT(6 6)
 POINT(8 4)
 DROP TABLE t1;
-select 0, ST_Within(GeomFromText('LINESTRING(15 15, 50 50, 60 60)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
-0	ST_Within(GeomFromText('LINESTRING(15 15, 50 50, 60 60)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'))
+select 0, ST_Within(GeomFromText('LINESTRING(15 15, 50 50, 60 60)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
+0	result
 0	0
-select 1, ST_Within(GeomFromText('LINESTRING(15 15, 16 16)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
-1	ST_Within(GeomFromText('LINESTRING(15 15, 16 16)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'))
+select 1, ST_Within(GeomFromText('LINESTRING(15 15, 16 16)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
+1	result
 1	1
-select 1, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(50 15, 15 50)'));
-1	ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(50 15, 15 50)'))
+select 1, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(50 15, 15 50)')) as result;
+1	result
 1	1
-select 0, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(16 16, 51 51)'));
-0	ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(16 16, 51 51)'))
+select 0, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(16 16, 51 51)')) as result;
+0	result
 0	1
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'));
-1	ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'))
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')) as result;
+1	result
 1	1
-select astext(ST_Union(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))')));
-astext(ST_Union(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))')))
+select astext(ST_Union(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))'))) as result;
+result
 POLYGON((0 0,1 2,2 0,0 0))
-select astext(ST_Intersection(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))')));
-astext(ST_Intersection(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))')))
+select astext(ST_Intersection(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))'))) as result;
+result
 POINT(1 1)
-select ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'));
-ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'))
+select ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'))  as result;
+result
 1
-select ST_contains(GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)), ((6 6, 6 11, 11 11, 11 6, 6 6)))'), GeomFromText('POINT(5 10)'));
-ST_contains(GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)), ((6 6, 6 11, 11 11, 11 6, 6 6)))'), GeomFromText('POINT(5 10)'))
+select ST_contains(GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)), ((6 6, 6 11, 11 11, 11 6, 6 6)))'), GeomFromText('POINT(5 10)')) as result;
+result
 0
-select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))'));
-ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))'))
+select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')) as result;
+result
 1
-select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))'));
-ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))'))
+select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))')) as result;
+result
 0
-select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))'));
-ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))'))
+select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))')) as result;
+result
 1
-select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((1 1, 1 4, 4 4, 4 1, 1 1))'));
-ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((1 1, 1 4, 4 4, 4 1, 1 1))'))
+select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((1 1, 1 4, 4 4, 4 1, 1 1))')) as result;
+result
 0
-select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'));
-ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'))
+select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))')) as result;
+result
 0.7071067811865475
-select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('linestring(0 1, 1 0)'));
-ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('linestring(0 1, 1 0)'))
+select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('linestring(0 1, 1 0)')) as result;
+result
 0
-select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'));
-ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'))
+select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))')) as result;
+result
 0
-select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0),(2 2, 3 4, 4 3, 2 2))'), geomfromtext('point(3 3)'));
-ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0),(2 2, 3 4, 4 3, 2 2))'), geomfromtext('point(3 3)'))
+select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0),(2 2, 3 4, 4 3, 2 2))'), geomfromtext('point(3 3)')) as result;
+result
 0.4472135954999579
-select ST_DISTANCE(geomfromtext('linestring(0 0, 3 6, 6 3, 0 0)'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'));
-ST_DISTANCE(geomfromtext('linestring(0 0, 3 6, 6 3, 0 0)'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'))
+select ST_DISTANCE(geomfromtext('linestring(0 0, 3 6, 6 3, 0 0)'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))')) as result;
+result
 0.8944271909999159
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')));
-astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')))
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'))) as result;
+result
 POLYGON((26.47058823529412 23.823529411764707,21.951219512195124 27.439024390243905,23.855421686746986 29.819277108433734,29.289940828402365 26.36094674556213,26.47058823529412 23.823529411764707))
-select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
-astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')))
+select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)'))) as result;
+result
 MULTIPOINT(26.47058823529412 23.823529411764707,29.289940828402365 26.36094674556213,21.951219512195124 27.439024390243905,23.855421686746986 29.819277108433734)
-select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
-astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45)')))
+select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45)'))) as result;
+result
 POINT(29.289940828402365 26.36094674556213)
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POINT(20 20)')));
-astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POINT(20 20)')))
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POINT(20 20)'))) as result;
+result
 POINT(20 20)
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200)')));
-astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200)')))
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200)'))) as result;
+result
 LINESTRING(0 0,46.666666666666664 46.666666666666664)
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
-astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')))
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)'))) as result;
+result
 MULTILINESTRING((0 0,46.666666666666664 46.666666666666664),(8 10,45.33333333333333 47.33333333333333))
-select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
-astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')))
+select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)'))) as result;
+result
 GEOMETRYCOLLECTION(LINESTRING(-10 -10,0 0),LINESTRING(-11 -9,8 10),POLYGON((0 0,40 50,50 45,0 0)),LINESTRING(46.666666666666664 46.666666666666664,200 200,199 201,45.33333333333333 47.33333333333333))
-select astext(ST_intersection(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))')));
-astext(ST_intersection(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))')))
+select astext(ST_intersection(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))'))) as result;
+result
 POLYGON((0 0,0 1,0.5 0.5,0 0))
-select astext(ST_symdifference(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))')));
-astext(ST_symdifference(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))')))
+select astext(ST_symdifference(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))'))) as result;
+result
 MULTIPOLYGON(((0 0,0.5 0.5,1 0,0 0)),((0.5 0.5,0 1,0 2,1 1,0.5 0.5)))
-select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
-astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')))
+select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)'))) as result;
+result
 GEOMETRYCOLLECTION(LINESTRING(-10 -10,0 0),LINESTRING(-11 -9,8 10),POLYGON((0 0,40 50,50 45,0 0)),LINESTRING(46.666666666666664 46.666666666666664,200 200,199 201,45.33333333333333 47.33333333333333))
 select astext(ST_buffer(geometryfromtext('point(1 1)'), 1));
 astext(ST_buffer(geometryfromtext('point(1 1)'), 1))
@@ -170,26 +170,26 @@ select ST_NUMPOINTS(ST_EXTERIORRING(@buff));
 ST_NUMPOINTS(ST_EXTERIORRING(@buff))
 202
 DROP TABLE t1;
-select st_touches(geomfromtext('point(0 0)'), geomfromtext('point(1 1)'));
-st_touches(geomfromtext('point(0 0)'), geomfromtext('point(1 1)'))
+select st_touches(geomfromtext('point(0 0)'), geomfromtext('point(1 1)')) as result;
+result
 0
-select st_touches(geomfromtext('point(1 1)'), geomfromtext('point(1 1)'));
-st_touches(geomfromtext('point(1 1)'), geomfromtext('point(1 1)'))
+select st_touches(geomfromtext('point(1 1)'), geomfromtext('point(1 1)')) as result;
+result
 0
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 1)'));
-st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 1)'))
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 1)')) as result;
+result
 1
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 0)'));
-st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 0)'))
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 0)')) as result;
+result
 0
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 2)'));
-st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 2)'))
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 2)')) as result;
+result
 0
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1.2, 1 0, 2 0, 1 1.2))'));
-st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1.2, 1 0, 2 0, 1 1.2))'))
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1.2, 1 0, 2 0, 1 1.2))')) as result;
+result
 0
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1, 1 0, 2 0, 1 1))'));
-st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1, 1 0, 2 0, 1 1))'))
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1, 1 0, 2 0, 1 1))')) as result;
+result
 1
 SELECT ST_Equals(PolyFromText('POLYGON((67 13, 67 18, 67 18, 59 18, 59 13, 67 13) )'),PolyFromText('POLYGON((67 13, 67 18, 59 19, 59 13, 59 13, 67 13) )')) as result;
 result
@@ -226,16 +226,14 @@ SELECT ASTEXT(TOUCHES(@a, GEOMFROMTEXT('point(0 0)'))) t;
 ERROR HY000: Illegal parameter data type boolean for operation 'st_astext'
 SELECT astext(ST_UNION (
 PolyFromText('POLYGON(( 2 2 ,3 2,2 7,2 2),( 0 0,8 2,1 9,0 0))'),
-ExteriorRing( Envelope( MultiLineStringFromText('MULTILINESTRING((3 4,5 3),(3 0,0 5))')))));
-astext(ST_UNION (
-PolyFromText('POLYGON(( 2 2 ,3 2,2 7,2 2),( 0 0,8 2,1 9,0 0))'),
-ExteriorRing( Envelope( MultiLineStringFromText('MULTILINESTRING((3 4,5 3),(3 0,0 5))')))))
+ExteriorRing( Envelope( MultiLineStringFromText('MULTILINESTRING((3 4,5 3),(3 0,0 5))'))))) as result;
+result
 GEOMETRYCOLLECTION(POLYGON((0 0,1 9,8 2,0 0),(2 2,2 7,3 2,2 2)),LINESTRING(0.5555555555555556 5,0 5,0 0,5 0,5 1.25),LINESTRING(2 5,2.4 5))
 SELECT astext(ST_BUFFER(LineStringFromText('LINESTRING(0 0,1 1)'),0));
 astext(ST_BUFFER(LineStringFromText('LINESTRING(0 0,1 1)'),0))
 LINESTRING(0 0,1 1)
-SELECT Round(ST_Area(ST_BUFFER(MultipointFromText('MULTIPOINT(7 7,3 7,7 2,7 4 ,7 7)'), 3)), 5);
-Round(ST_Area(ST_BUFFER(MultipointFromText('MULTIPOINT(7 7,3 7,7 2,7 4 ,7 7)'), 3)), 5)
+SELECT Round(ST_Area(ST_BUFFER(MultipointFromText('MULTIPOINT(7 7,3 7,7 2,7 4 ,7 7)'), 3)), 5) as result;
+result
 78.68426
 SELECT ST_INTERSECTION(NULL, NULL);
 ST_INTERSECTION(NULL, NULL)
@@ -247,21 +245,14 @@ MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4))
 MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 4,2 5,3 5)),
                         ((2 2,9 2,0 2,2 6,2 2)),
                         ((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)),
-                        ((9 9,6 8,7 0,9 9)))')));
-ASTEXT(ST_INTERSECTION(
-MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),
-                        ((0 5,3 5,3 0,0 0,0 1,2 1,2 2,0 2,0 5), (1 3,2 3,2 4,1 4,1 3)),
-                        ((2 2,5 2,4 4,2 8,2 2)))'),
-MULTIPOLY
+                        ((9 9,6 8,7 0,9 9)))'))) as result;
+result
 POLYGON((0 2,1 4,1 3,2 3,2 4,1 4,1.5 5,2 5,2 8,8 8,8 2,0 2),(4 4,4 6,6 6,6 4,4 4))
 SELECT ROUND(ST_LENGTH(ST_UNION(
 MULTILINESTRINGFROMTEXT('MULTILINESTRING((6 2,4 0,3 5,3 6,4 3,6 4,3 9,0 7,3 7,8 4,2 9,5 0),
                                                  (8 2,1 3,9 0,4 4))'),
-MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 5,6 7,9 7,5 2,1 6,3 6))'))), 7);
-ROUND(ST_LENGTH(ST_UNION(
-MULTILINESTRINGFROMTEXT('MULTILINESTRING((6 2,4 0,3 5,3 6,4 3,6 4,3 9,0 7,3 7,8 4,2 9,5 0),
-                                                 (8 2,1 3,9 0,4 4))'),
-MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 5,6 7,9 7,5 2,1 6,3 6)
+MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 5,6 7,9 7,5 2,1 6,3 6))'))), 7) as result;
+result
 90.2783626
 SELECT ST_NUMGEOMETRIES((ST_UNION(ST_UNION(
 MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 0,4 2,0 2,1 5,0 3,7 0,8 5,5 8),
@@ -274,18 +265,13 @@ MULTILINESTRINGFROMTEXT('MULTILINESTRING((6 0,9 3,2 5,3 6,3 2),
 MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((7 7,3 7,3 1,7 8,7 7)),
                                        ((3 5,2 4,2 5,3 5)),
                                        ((7 7,8 7,3 7,7 7,7 7)),
-                                       ((0 5,3 5,3 4,1 4,1 3,3 3,3 0,0 0,0 5), (1 1,2 1,2 2,1 2,1 1)))'))));
-ST_NUMGEOMETRIES((ST_UNION(ST_UNION(
-MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 0,4 2,0 2,1 5,0 3,7 0,8 5,5 8),
-                                                 (6 2,4 0,3 5,3 6,4 3,6 4,3 9,0 7,3 7,8 4,2 9,5 0),
-                                          
+                                       ((0 5,3 5,3 4,1 4,1 3,3 3,3 0,0 0,0 5), (1 1,2 1,2 2,1 2,1 1)))')))) as result;
+result
 192
 SELECT Round(ST_AREA(ST_BUFFER( ST_UNION(
 POLYGONFROMTEXT('POLYGON((7 7, 7 7, 7 4, 7 7, 7 7))'),
-POLYGONFROMTEXT('POLYGON((7 7, 4 7, 2 9, 7 6, 7 7))')), 1)), 6);
-Round(ST_AREA(ST_BUFFER( ST_UNION(
-POLYGONFROMTEXT('POLYGON((7 7, 7 7, 7 4, 7 7, 7 7))'),
-POLYGONFROMTEXT('POLYGON((7 7, 4 7, 2 9, 7 6, 7 7))')), 1)), 6)
+POLYGONFROMTEXT('POLYGON((7 7, 4 7, 2 9, 7 6, 7 7))')), 1)), 6) as result;
+result
 21.901344
 SELECT AsText(ST_UNION(MultiPolygonFromText('
         MULTIPOLYGON(((2 2, 2 8, 8 8, 8 2, 2 2), (4 4, 4 6, 6 6, 6 4, 4 4)),
@@ -294,21 +280,14 @@ SELECT AsText(ST_UNION(MultiPolygonFromText('
 MultiPolygonFromText(' MULTIPOLYGON(((0 0, 1 9, 4 6, 0 0)),
                      ((0 5, 3 5, 3 4, 1 4, 1 3, 3 3, 3 0, 0 0, 0 5), (1 1, 2 1, 2 2, 1 2, 1 1)),
                      ((7 7, 4 7, 6 3, 7 2, 7 7)),
-                     ((0 5, 3 5, 3 4, 1 4, 1 3, 3 3, 3 0, 0 0, 0 5), (1 1, 2 1, 2 2, 1 2, 1 1))) ')));
-AsText(ST_UNION(MultiPolygonFromText('
-        MULTIPOLYGON(((2 2, 2 8, 8 8, 8 2, 2 2), (4 4, 4 6, 6 6, 6 4, 4 4)),
-                     ((0 0, 8 3, 7 4, 0 0)),
-                     ((2 2, 2 8, 8 8, 8 2, 2 2), (4 4, 4 6, 6 6, 6 4, 4 4)))'),
-MultiPolygonFr
+                     ((0 5, 3 5, 3 4, 1 4, 1 3, 3 3, 3 0, 0 0, 0 5), (1 1, 2 1, 2 2, 1 2, 1 1))) '))) as result;
+result
 POLYGON((0 0,0 5,0.5555555555555556 5,1 9,2 8,8 8,8 2,5.333333333333334 2,3 1.125,3 0,0 0),(1 1,1 1.5,1.3333333333333333 2,2 2,2 1.1428571428571428,1.75 1,1 1),(3 1.7142857142857142,3 2,3.5 2,3 1.7142857142857142),(4 4,4 6,4.5 6,5.5 4,4 4))
 SELECT AsText(ST_SYMDIFFERENCE(
 MultiLineStringFromText('MULTILINESTRING((7 7, 1 7, 8 5, 7 8, 7 7),
                                                  (6 3, 3 4, 1 1, 9 9, 9 0, 8 4, 9 9))'),
-Envelope(GeometryFromText('MULTIPOINT(7 9, 0 0, 3 7, 1 6, 0 0)'))));
-AsText(ST_SYMDIFFERENCE(
-MultiLineStringFromText('MULTILINESTRING((7 7, 1 7, 8 5, 7 8, 7 7),
-                                                 (6 3, 3 4, 1 1, 9 9, 9 0, 8 4, 9 9))'),
-Envelope(GeometryFromText('MULTIPOINT(7 9, 0 0, 3 7, 1 6, 0 0)'))))
+Envelope(GeometryFromText('MULTIPOINT(7 9, 0 0, 3 7, 1 6, 0 0)')))) as result;
+result
 GEOMETRYCOLLECTION(POLYGON((0 0,0 9,7 9,7 0,0 0)),LINESTRING(9 9,8 4,9 0,9 9),LINESTRING(7 5.285714285714286,8 5,7.25 7.25),LINESTRING(7 7,7.25 7.25),LINESTRING(7.25 7.25,7 8),LINESTRING(7.25 7.25,9 9))
 SELECT AsText(ST_UNION(
 MultiPolygonFromText('MULTIPOLYGON(((9 9, 7 9, 1 1, 9 9)),
@@ -316,50 +295,38 @@ MultiPolygonFromText('MULTIPOLYGON(((9 9, 7 9, 1 1, 9 9)),
                                            ((0 0, 7 5, 9 6, 0 0)),
                                            ((7 7, 5 7, 1 5, 7 1, 7 7)))'),
 MultiPolygonFromText('MULTIPOLYGON(((2 2, 2 2, 1 5, 2 7, 2 2)),
-                                           ((0 5, 3 5, 3 0, 0 0, 0 5), (1 1, 2 1, 2 4, 1 4, 1 1)))')));
-AsText(ST_UNION(
-MultiPolygonFromText('MULTIPOLYGON(((9 9, 7 9, 1 1, 9 9)),
-                                           ((2 2, 1 2, 3 3, 2 2, 2 2)),
-                                           ((0 0, 7 5, 9 6, 0 0)),
-                                        
+                                           ((0 5, 3 5, 3 0, 0 0, 0 5), (1 1, 2 1, 2 4, 1 4, 1 1)))'))) as result;
+result
 POLYGON((0 0,0 5,1 5,2 7,2 5.5,5 7,5.5 7,7 9,9 9,7 7,7 5,9 6,7 4.666666666666667,7 1,4.25 2.833333333333333,3 2,3 0,0 0),(1 1,1 4,1.3333333333333333 4,1.8571428571428572 2.4285714285714284,1 2,1.75 2,1 1,2 2,2 1.4285714285714284,1.4 1,1 1),(1.5 1,2 1.3333333333333333,2 1,1.5 1),(3 2.142857142857143,3 3,3.4 3.4,4.1034482758620685 2.9310344827586206,3 2.142857142857143))
 SELECT AsText( ST_INTERSECTION(
 LinestringFromText('LINESTRING( 3 5, 2 5, 2 4, 3 4, 3 5 ) ') ,
 LinestringFromText('LINESTRING( 3 5, 2 4, 2 5, 3 5 ) ')
-));
-AsText( ST_INTERSECTION(
-LinestringFromText('LINESTRING( 3 5, 2 5, 2 4, 3 4, 3 5 ) ') ,
-LinestringFromText('LINESTRING( 3 5, 2 4, 2 5, 3 5 ) ')
-))
+)) as result;
+result
 LINESTRING(2 4,2 5,3 5)
 SELECT AsText( ST_UNION(
 PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 7 5 , 2 0 , 2 2 ) ) ') ,
-PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 3 3 , 2 5 , 2 2 ) ) ') ) );
-AsText( ST_UNION(
-PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 7 5 , 2 0 , 2 2 ) ) ') ,
-PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 3 3 , 2 5 , 2 2 ) ) ') ) )
+PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 3 3 , 2 5 , 2 2 ) ) ') ) ) as result;
+result
 POLYGON((2 0,2 5,3 3,3 2,7 5,2 0))
-SELECT AsText(ST_INTERSECTION(LinestringFromText('LINESTRING(1 1, 2 2)'), GeometryFromText('LINESTRING(3 3, 4 4)')));
-AsText(ST_INTERSECTION(LinestringFromText('LINESTRING(1 1, 2 2)'), GeometryFromText('LINESTRING(3 3, 4 4)')))
+SELECT AsText(ST_INTERSECTION(LinestringFromText('LINESTRING(1 1, 2 2)'), GeometryFromText('LINESTRING(3 3, 4 4)'))) as result;
+result
 GEOMETRYCOLLECTION EMPTY
-SELECT AsText(ST_UNION(GEOMETRYFROMTEXT('POINT(8 1)') ,MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 5, 2 5, 2 4, 3 4, 3 5))')));
-AsText(ST_UNION(GEOMETRYFROMTEXT('POINT(8 1)') ,MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 5, 2 5, 2 4, 3 4, 3 5))')))
+SELECT AsText(ST_UNION(GEOMETRYFROMTEXT('POINT(8 1)') ,MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 5, 2 5, 2 4, 3 4, 3 5))'))) as result;
+result
 GEOMETRYCOLLECTION(POINT(8 1),LINESTRING(2 4,2 5,3 5,3 4,2 4))
 SELECT ST_DISTANCE(POINTFROMTEXT('POINT(7 1)'),MULTILINESTRINGFROMTEXT('MULTILINESTRING(
-                (4 7,9 7,6 1,3 4,1 1), (3 5, 2 5, 2 4, 3 4, 3 5))'));
-ST_DISTANCE(POINTFROMTEXT('POINT(7 1)'),MULTILINESTRINGFROMTEXT('MULTILINESTRING(
-                (4 7,9 7,6 1,3 4,1 1), (3 5, 2 5, 2 4, 3 4, 3 5))'))
+                (4 7,9 7,6 1,3 4,1 1), (3 5, 2 5, 2 4, 3 4, 3 5))')) as result;
+result
 1
-SELECT AsText(ST_UNION(POLYGONFROMTEXT('POLYGON((12 9, 3 6, 3 0, 12 9))'), POLYGONFROMTEXT('POLYGON((2 2, 7 2, 4 2, 2 0, 2 2))')));
-AsText(ST_UNION(POLYGONFROMTEXT('POLYGON((12 9, 3 6, 3 0, 12 9))'), POLYGONFROMTEXT('POLYGON((2 2, 7 2, 4 2, 2 0, 2 2))')))
+SELECT AsText(ST_UNION(POLYGONFROMTEXT('POLYGON((12 9, 3 6, 3 0, 12 9))'), POLYGONFROMTEXT('POLYGON((2 2, 7 2, 4 2, 2 0, 2 2))'))) as result;
+result
 GEOMETRYCOLLECTION(POLYGON((2 0,2 2,3 2,3 6,12 9,3 0,3 1,2 0)),LINESTRING(5 2,7 2))
 SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER(ST_UNION(
 MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 4, 2 5, 7 6, 1 8),(0 0 ,1 6 ,0 1, 8 9, 2 4, 6 1, 3 5, 4 8), (9 3, 5 4, 1 8, 4 2, 5 8, 3 0))' ) ,
 MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 4, 3 1, 2 7, 4 2, 6 2, 1 5))')
-), 16)));
-ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER(ST_UNION(
-MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 4, 2 5, 7 6, 1 8),(0 0 ,1 6 ,0 1, 8 9, 2 4, 6 1, 3 5, 4 8), (9 3, 5 4, 1 8, 4 2, 5 8, 3 0))' ) ,
-MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 4, 3 1, 2 7, 4 2, 6 2
+), 16))) as result;
+result
 278
 SELECT ST_NUMGEOMETRIES(ST_DIFFERENCE (
 ST_UNION (
@@ -372,10 +339,8 @@ MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) ' )
 )
 ),
 MULTILINESTRINGFROMTEXT( ' MULTILINESTRING( ( 2 9 , 1 3 , 7 3 , 8 5 ) , ( 5 0 , 8 1 , 2 0 , 7 4 , 1 0 ) , ( 9 2 , 5 2 , 6 5 , 8 8 , 0 2 ) , ( 0 8 , 3 9 , 4 0 , 1 0 ) , ( 0 0 , 7 6 , 8 3 , 0 0 ) ) ' )
-));
-ST_NUMGEOMETRIES(ST_DIFFERENCE (
-ST_UNION (
-MULTILINESTRINGFROMTEXT( ' MULTILINESTRING( ( 2 4 , 5 0 , 2 9 , 6 2 , 0 2 ) , ( 4 3 , 5 6 , 9 4 , 0 7 , 7 2 , 2 0 , 8 2 ) , ( 5 0 , 1 5 , 3 7 , 7 7 ) , ( 2 3 , 9 5 , 2 0 , 8 1 ) , ( 0 9 , 9 3 , 2 8 , 8 1 , 9 4 )
+)) as result;
+result
 125
 SELECT ASTEXT(ST_DIFFERENCE (
 POLYGONFROMTEXT( ' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ' ) ,
@@ -389,21 +354,14 @@ GEOMETRYFROMTEXT( ' MULTILINESTRING( ( 3 7 , 7 3 , 5 8 , 4 8 ) , ( 3 2 , 5 0 , 9
 )
 )
 )
-));
-ASTEXT(ST_DIFFERENCE (
-POLYGONFROMTEXT( ' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ' ) ,
-ST_UNION (
-MULTILINESTRINGFROMTEXT( ' MULTILINESTRING( (3 5, 2 5, 2 4, 3 4, 3 5) ) ' ) ,
-ST_SYMDIFFERENCE (
-MULTILINESTRINGFROMTEX
+)) as result;
+result
 POLYGON((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4))
 SELECT ST_NUMGEOMETRIES(ST_UNION (
 MULTILINESTRINGFROMTEXT( ' MULTILINESTRING( ( 0 8 , 1 9 , 5 7 , 2 8 , 5 8 , 6 7 ) , ( 4 5 , 8 4 , 0 3 , 5 1 ) , ( 6 8 , 2 7 , 1 6 , 9 9 , 7 2 ) , ( 9 5 , 2 8 , 1 2 , 9 6 , 2 0 ) ) ' ) ,
 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 7 7 , 2 7, 6 8, 7 1 , 7 7 ) ) ) ' )
-));
-ST_NUMGEOMETRIES(ST_UNION (
-MULTILINESTRINGFROMTEXT( ' MULTILINESTRING( ( 0 8 , 1 9 , 5 7 , 2 8 , 5 8 , 6 7 ) , ( 4 5 , 8 4 , 0 3 , 5 1 ) , ( 6 8 , 2 7 , 1 6 , 9 9 , 7 2 ) , ( 9 5 , 2 8 , 1 2 , 9 6 , 2 0 ) ) ' ) ,
-MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (
+)) as result;
+result
 50
 SELECT ST_BUFFER (
 LINESTRINGFROMTEXT( ' LINESTRING( 5 4 , 3 8 , 2 6 , 5 5 , 7 9 ) ' ) ,
@@ -414,49 +372,50 @@ MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) ' ) ,
 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) , ( ( 0 0 , 3 8 , 9 4 , 0 0 ) ) ) ' )
 )
 )
-) ;
-ST_BUFFER (
-LINESTRINGFROMTEXT( ' LINESTRING( 5 4 , 3 8 , 2 6 , 5 5 , 7 9 ) ' ) ,
-ST_DISTANCE (
-MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 4, 2 5, 3 5) ) , ( (3 5, 2 5, 2 4, 3 4, 3 5) ) , ( ( 0 0 , 8 3 , 9 5 , 0 0 ) ) ) ' ) ,
+) as result;
+result
+NULL
+SELECT   ST_DISTANCE (
 ST_DIFFERENCE (
-MULTIPOL
+MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) ' ) ,
+MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) , ( ( 0 0 , 3 8 , 9 4 , 0 0 ) ) ) ' )
+),
+MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 4, 2 5, 3 5) ) , ( (3 5, 2 5, 2 4, 3 4, 3 5) ) , ( ( 0 0 , 8 3 , 9 5 , 0 0 ) ) ) ' )
+) as result;
+result
 NULL
-SELECT   ST_DISTANCE (     ST_DIFFERENCE (                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) ' ) ,                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) , ( ( 0 0 , 3 8 , 9 4 , 0 0 ) ) ) ' )                         ),                         MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 4, 2 5, 3 5) ) , ( (3 5, 2 5, 2 4, 3 4, 3 5) ) , ( ( 0 0 , 8 3 , 9 5 , 0 0 ) ) ) ' ) )  ;
-ST_DISTANCE (     ST_DIFFERENCE (                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) ' ) ,                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 ,
-NULL
-SELECT ASTEXT(ST_INTERSECTION( GEOMETRYFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(7 7,5.33333333333333 7),LINESTRING(5.33333333333333 7,0 7,5 8,5.33333333333333 7),LINESTRING(5.33333333333333 7,7 2,7 7),POLYGON((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5)))'), geomETRYFROMTEXT(' MULTILINESTRING( ( 5 1 , 3 7 , 6 1 , 7 0 ) , ( 1 6 , 8 5 , 7 5 , 5 6 ) )') ));
-ASTEXT(ST_INTERSECTION( GEOMETRYFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(7 7,5.33333333333333 7),LINESTRING(5.33333333333333 7,0 7,5 8,5.33333333333333 7),LINESTRING(5.33333333333333 7,7 2,7 7),POLYGON((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))
+SELECT ASTEXT(ST_INTERSECTION( GEOMETRYFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(7 7,5.33333333333333 7),LINESTRING(5.33333333333333 7,0 7,5 8,5.33333333333333 7),LINESTRING(5.33333333333333 7,7 2,7 7),POLYGON((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5)))'), geomETRYFROMTEXT(' MULTILINESTRING( ( 5 1 , 3 7 , 6 1 , 7 0 ) , ( 1 6 , 8 5 , 7 5 , 5 6 ) )') )) as result;
+result
 MULTIPOINT(7 5,7 5.142857142857142,5.899999999999998 5.300000000000001,5.799999999999997 5.600000000000001,3 7)
-SELECT ST_CROSSES( GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 4, 2 5, 3 5) ) ') , POLYGONFROMTEXT(' POLYGON((2 4,3 4,3 5,2 5,2 4)) '));
-ST_CROSSES( GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 4, 2 5, 3 5) ) ') , POLYGONFROMTEXT(' POLYGON((2 4,3 4,3 5,2 5,2 4)) '))
+SELECT ST_CROSSES( GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 4, 2 5, 3 5) ) ') , POLYGONFROMTEXT(' POLYGON((2 4,3 4,3 5,2 5,2 4)) ')) as result;
+result
 0
-SELECT ST_WITHIN( POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 2 0 , 1 0, 2 4 , 0 4, 0 5) ) ') , POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 1 4 , 1 3 , 3 3 , 3 0 , 0 0 , 0 5), ( 1 1 , 2 1 , 2 2 , 1 2 , 1 1 ) ) ') );
-ST_WITHIN( POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 2 0 , 1 0, 2 4 , 0 4, 0 5) ) ') , POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 1 4 , 1 3 , 3 3 , 3 0 , 0 0 , 0 5), ( 1 1 , 2 1 , 2 2 , 1 2 , 1 1 ) ) ') )
+SELECT ST_WITHIN( POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 2 0 , 1 0, 2 4 , 0 4, 0 5) ) ') , POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 1 4 , 1 3 , 3 3 , 3 0 , 0 0 , 0 5), ( 1 1 , 2 1 , 2 2 , 1 2 , 1 1 ) ) ') ) as result;
+result
 0
-SELECT ST_WITHIN( POINTFROMTEXT(' POINT(1 2 ) ') , MULTIPOLYGONFROMTEXT(' MULTIPOLYGON( ( (0 5, 3 5, 3 0, 0 0, 0 5), ( 1 1 , 2 1 , 2 4, 1 4, 1 1 ) ) ) '));
-ST_WITHIN( POINTFROMTEXT(' POINT(1 2 ) ') , MULTIPOLYGONFROMTEXT(' MULTIPOLYGON( ( (0 5, 3 5, 3 0, 0 0, 0 5), ( 1 1 , 2 1 , 2 4, 1 4, 1 1 ) ) ) '))
+SELECT ST_WITHIN( POINTFROMTEXT(' POINT(1 2 ) ') , MULTIPOLYGONFROMTEXT(' MULTIPOLYGON( ( (0 5, 3 5, 3 0, 0 0, 0 5), ( 1 1 , 2 1 , 2 4, 1 4, 1 1 ) ) ) ')) as result;
+result
 1
-select ST_ASTEXT(envelope(ST_GEOMCOLLFROMTEXT('GEOMETRYCOLLECTION EMPTY')));
-ST_ASTEXT(envelope(ST_GEOMCOLLFROMTEXT('GEOMETRYCOLLECTION EMPTY')))
+select ST_ASTEXT(envelope(ST_GEOMCOLLFROMTEXT('GEOMETRYCOLLECTION EMPTY'))) as result;
+result
 GEOMETRYCOLLECTION EMPTY
-SELECT ST_EQUALS( GEOMETRYFROMTEXT(' MULTILINESTRING( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') , GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') );
-ST_EQUALS( GEOMETRYFROMTEXT(' MULTILINESTRING( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') , GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') )
+SELECT ST_EQUALS( GEOMETRYFROMTEXT(' MULTILINESTRING( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') , GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') ) as result;
+result
 0
-SELECT ST_TOUCHES( GEOMETRYFROMTEXT(' LINESTRING( 1 1 , 1 4 , 5 0 , 8 3 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ') );
-ST_TOUCHES( GEOMETRYFROMTEXT(' LINESTRING( 1 1 , 1 4 , 5 0 , 8 3 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ') )
+SELECT ST_TOUCHES( GEOMETRYFROMTEXT(' LINESTRING( 1 1 , 1 4 , 5 0 , 8 3 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ') ) as result;
+result
 0
-SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT(' MULTIPOINT( 5 8 , 5 2 , 1 8 , 3 0 , 3 0 , 7 8 ) ') );
-ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT(' MULTIPOINT( 5 8 , 5 2 , 1 8 , 3 0 , 3 0 , 7 8 ) ') )
+SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT(' MULTIPOINT( 5 8 , 5 2 , 1 8 , 3 0 , 3 0 , 7 8 ) ') ) as result;
+result
 0
-SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') );
-ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') )
+SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') ) as result;
+result
 1
-SELECT ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) '));
-ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) '))
+SELECT ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ')) as result;
+result
 0
-SELECT ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29)') );
-ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,
+SELECT ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29)') ) as result;
+result
 1
 SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0 -3.0,
   -2.910427500435995 0.727606875108998,
@@ -464,26 +423,20 @@ SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0
   7.664100588675687 1.503849116986468,
   1.664100588675687 -2.496150883013531,
   0.0 -3.0
-))' ), 3 )));
-ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0 -3.0,
-  -2.910427500435995 0.727606875108998,
-  -0.910427500435995 8.727606875108998,
-  7.664100588675687 1.503849116986468,
-  1.664100588675687 -2.496150883013531,
-  0.0 -3.0
-))' ),
+))' ), 3 ))) as result;
+result
 136
-select astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1));
-astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1))
+select astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1)) as result;
+result
 GEOMETRYCOLLECTION EMPTY
-select ST_Touches(ST_LineFromText('LINESTRING(0 0,5 5)'),ST_PointFromText('POINT(0 0)'));
-ST_Touches(ST_LineFromText('LINESTRING(0 0,5 5)'),ST_PointFromText('POINT(0 0)'))
+select ST_Touches(ST_LineFromText('LINESTRING(0 0,5 5)'),ST_PointFromText('POINT(0 0)')) as result;
+result
 1
-select ST_Touches(ST_PolygonFromText('POLYGON((0 0,0 5,5 5,5 0,0 0))'),ST_PointFromText('POINT(0 0)'));
-ST_Touches(ST_PolygonFromText('POLYGON((0 0,0 5,5 5,5 0,0 0))'),ST_PointFromText('POINT(0 0)'))
+select ST_Touches(ST_PolygonFromText('POLYGON((0 0,0 5,5 5,5 0,0 0))'),ST_PointFromText('POINT(0 0)')) as result;
+result
 1
-select ST_Touches(ST_PointFromText('POINT(0 0)'),ST_PointFromText('POINT(0 0)'));
-ST_Touches(ST_PointFromText('POINT(0 0)'),ST_PointFromText('POINT(0 0)'))
+select ST_Touches(ST_PointFromText('POINT(0 0)'),ST_PointFromText('POINT(0 0)')) as result;
+result
 0
 SELECT ST_RELATE(
 ST_DIFFERENCE(
@@ -750,30 +703,26 @@ dist	buffer	buf_area
 -1	POLYGON	16.00
 SELECT ST_CONTAINS(
 GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)'));
-ST_CONTAINS(
-GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)'))
+GeomFromText('POINT(5 10)')) as geom;
+geom
 0
 SELECT AsText(ST_UNION(
 GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)')));
-AsText(ST_UNION(
-GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)')))
+GeomFromText('POINT(5 10)'))) as geom;
+geom
 GEOMETRYCOLLECTION(POLYGON((0 0,0 5,5 5,5 0,0 0)),POLYGON((6 6,6 11,11 11,11 6,6 6)),POINT(5 10))
 DROP PROCEDURE p1;
 #
 # Bug #13833019 ASSERTION `T1->RESULT_RANGE' FAILED IN GCALC_OPERATION_REDUCER::END_COUPLE
 #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3));
-GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3))
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3)) as geom;
+geom
 POLYGON
 #
 # Bug #13832749 	HANDLE_FATAL_SIGNAL IN GCALC_FUNCTION::COUNT_INTERNAL
 #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1));
-GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1))
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1)) as geom;
+geom
 POLYGON
 #
 # Bug#13358363 - ASSERTION: N > 0 && N < SINUSES_CALCULATED*2+1 | GET_N_SINCOS/ADD_EDGE_BUFFER
@@ -784,27 +733,21 @@ Warning	1292	Truncated incorrect DOUBLE value: ''
 SELECT ST_WITHIN(
 LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
 ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) '))));
-ST_WITHIN(
-LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
-ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) ')
+ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) ')))) as st;
+st
 0
 SELECT ST_DIMENSION(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((3 5,2 5,2 4,3 4,3 5)) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))'))));
-ST_DIMENSION(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((3 5,2 5,2 4,3 4,3 5)) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))'))))
+ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))')))) as st;
+st
 2
 SELECT ST_NUMINTERIORRINGS(
 ST_ENVELOPE(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5))) '),
-SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) ')))));
-ST_NUMINTERIORRINGS(
-ST_ENVELOPE(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5))) '),
-SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) ')))))
+SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) '))))) as st;
+st
 0
 SELECT ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
-SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))));
-ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
-SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))))
+SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) ')))) as st;
+st
 POLYGON((9 9,5 2,4 5,9 9))
 #
 # MDEV-13467 Feature request: Support for ST_Distance_Sphere()
@@ -832,74 +775,74 @@ ERROR 22023: Invalid GIS data provided to function ST_Distance_Sphere.
 SELECT ST_DISTANCE_SPHERE(1, 1, NULL);
 ST_DISTANCE_SPHERE(1, 1, NULL)
 NULL
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'));
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)')) as result;
 ERROR HY000: Internal error: st_distance_sphere
 # Test Points and radius
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'))
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)')) as result;
+result
 157249.0357231545
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10);
-TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10)
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10) as result;
+result
 157225.0865419108
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1);
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1)
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1) as result;
+result
 0.024682056391766436
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 0);
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 0) as result;
 ERROR HY000: Internal error: Radius must be greater than zero.
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), -1);
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), -1) as result;
 ERROR HY000: Internal error: Radius must be greater than zero.
 # Test longitude/lattitude
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
-TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10)
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10) as result;
+result
 157225.0865419108
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10);
-TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10)
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10) as result;
+result
 222355.4901806686
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
-TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10)
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10) as result;
+result
 222389.3645969269
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)'));
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)'))
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)')) as result;
+result
 157249.0357231545
 # Test Points - Multipoints
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)'));
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)'))
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)')) as result;
+result
 157249.0357231545
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'));
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'))
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)')) as result;
+result
 157249.0357231545
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'));
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'))
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)')) as result;
+result
 157249.0357231545
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'));
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'))
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)')) as result;
+result
 157249.0357231545
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1);
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1)
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1) as result;
+result
 0.024682056391766436
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1);
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1)
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1) as result;
+result
 0.024682056391766436
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1);
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1)
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1) as result;
+result
 0.024682056391766436
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1);
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1)
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1) as result;
+result
 0.024682056391766436
 # Test Multipoints - Multipoints
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'));
-ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'))
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')) as result;
+result
 0
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10);
-TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10)
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10) as result;
+result
 314282.5644496733
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10);
-TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10)
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10) as result;
+result
 314282.5644496733
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17);
-TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17)
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17) as result;
+result
 0.04933028646581131
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),0);
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),0) as result;
 ERROR HY000: Internal error: Radius must be greater than zero.
 set @pt1 = ST_GeomFromText('POINT(190 -30)');
 set @pt2 = ST_GeomFromText('POINT(-30  50)');
diff --git a/mysql-test/main/gis-precise.test b/mysql-test/main/gis-precise.test
index ceaf1f1b89a..666c443e5fe 100644
--- a/mysql-test/main/gis-precise.test
+++ b/mysql-test/main/gis-precise.test
@@ -9,15 +9,12 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
-#enable after fix MDEV-27871
---disable_view_protocol
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 0,20 20,0 20,0 0))'), GeomFromText('POLYGON((10 10,30 10,30 30,10 30,10 10))'));
-select 0, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 40, 40 50, 20 70, 10 40))'));
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POINT(10 10)'));
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
-select 0, ST_Within(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
-select 1, ST_Within(GeomFromText('POLYGON((1 1,20 10,10 30, 1 1))'), GeomFromText('POLYGON((0 0,30 5,10 40, 0 0))'));
---enable_view_protocol 
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 0,20 20,0 20,0 0))'), GeomFromText('POLYGON((10 10,30 10,30 30,10 30,10 10))')) as result;
+select 0, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 40, 40 50, 20 70, 10 40))')) as result;
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POINT(10 10)')) as result;
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
+select 0, ST_Within(GeomFromText('POLYGON((0 0,20 10,10 30, 0 0))'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
+select 1, ST_Within(GeomFromText('POLYGON((1 1,20 10,10 30, 1 1))'), GeomFromText('POLYGON((0 0,30 5,10 40, 0 0))')) as result;
 
 create table t1 (g point);
 insert into t1 values 
@@ -38,53 +35,49 @@ select astext(g) from t1 where ST_Contains(GeomFromText('POLYGON((5 1, 7 1, 7 7,
 
 DROP TABLE t1;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-select 0, ST_Within(GeomFromText('LINESTRING(15 15, 50 50, 60 60)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
-select 1, ST_Within(GeomFromText('LINESTRING(15 15, 16 16)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))'));
+select 0, ST_Within(GeomFromText('LINESTRING(15 15, 50 50, 60 60)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
+select 1, ST_Within(GeomFromText('LINESTRING(15 15, 16 16)'), GeomFromText('POLYGON((10 10,30 20,20 40, 10 10))')) as result;
 
 
-select 1, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(50 15, 15 50)'));
-select 0, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(16 16, 51 51)'));
+select 1, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(50 15, 15 50)')) as result;
+select 0, ST_Intersects(GeomFromText('LINESTRING(15 15, 50 50)'), GeomFromText('LINESTRING(16 16, 51 51)')) as result;
 
-select 1, ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'));
+select 1, ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')) as result;
 
-select astext(ST_Union(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))')));
-select astext(ST_Intersection(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))')));
+select astext(ST_Union(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))'))) as result;
+select astext(ST_Intersection(geometryfromtext('point(1 1)'), geometryfromtext('polygon((0 0, 2 0, 1 2, 0 0))'))) as result;
 
-select ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'));
-select ST_contains(GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)), ((6 6, 6 11, 11 11, 11 6, 6 6)))'), GeomFromText('POINT(5 10)'));
-select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))'));
-select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))'));
-select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))'));
-select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((1 1, 1 4, 4 4, 4 1, 1 1))'));
+select ST_Intersects(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'))  as result;
+select ST_contains(GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)), ((6 6, 6 11, 11 11, 11 6, 6 6)))'), GeomFromText('POINT(5 10)')) as result;
+select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')) as result;
+select ST_Disjoint(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))')) as result;
+select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((10 10, 10 4, 4 4, 4 10, 10 10))')) as result;
+select ST_Overlaps(GeomFromText('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'), GeomFromText('POLYGON((1 1, 1 4, 4 4, 4 1, 1 1))')) as result;
 
 # Distance tests
-select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'));
-select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('linestring(0 1, 1 0)'));
-select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'));
-select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0),(2 2, 3 4, 4 3, 2 2))'), geomfromtext('point(3 3)'));
-select ST_DISTANCE(geomfromtext('linestring(0 0, 3 6, 6 3, 0 0)'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))'));
+select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))')) as result;
+select ST_DISTANCE(geomfromtext('polygon((0 0, 1 2, 2 1, 0 0))'), geomfromtext('linestring(0 1, 1 0)')) as result;
+select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0))'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))')) as result;
+select ST_DISTANCE(geomfromtext('polygon((0 0, 3 6, 6 3, 0 0),(2 2, 3 4, 4 3, 2 2))'), geomfromtext('point(3 3)')) as result;
+select ST_DISTANCE(geomfromtext('linestring(0 0, 3 6, 6 3, 0 0)'), geomfromtext('polygon((2 2, 3 4, 4 3, 2 2))')) as result;
 
 
 # Operations tests
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')));
-select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
-select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POINT(20 20)')));
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200)')));
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))'))) as result;
+select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)'))) as result;
+select astext(ST_Intersection(GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), GeomFromText('LINESTRING(50 5, 55 10, 0 45)'))) as result;
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('POINT(20 20)'))) as result;
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200)'))) as result;
 --replace_result 7.999999999999999 8
-select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
+select astext(ST_Intersection(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)'))) as result;
 --replace_result 7.999999999999999 8
-select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
+select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)'))) as result;
 
-select astext(ST_intersection(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))')));
+select astext(ST_intersection(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))'))) as result;
 
-select astext(ST_symdifference(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))')));
+select astext(ST_symdifference(geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))'), geomfromtext('polygon((0 0, 1 1, 0 2, 0 0))'))) as result;
 --replace_result 7.999999999999999 8
-select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
-
---enable_view_protocol 
+select astext(ST_UNION(GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)'))) as result;
 
 # Buffer() tests
 --replace_result 0012045437948276 00120454379482759
@@ -103,25 +96,20 @@ select ST_NUMPOINTS(ST_EXTERIORRING(@buff));
 # cleanup
 DROP TABLE t1;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 #Touches tests
-select st_touches(geomfromtext('point(0 0)'), geomfromtext('point(1 1)'));
-select st_touches(geomfromtext('point(1 1)'), geomfromtext('point(1 1)'));
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 1)'));
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 0)'));
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 2)'));
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1.2, 1 0, 2 0, 1 1.2))'));
-select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1, 1 0, 2 0, 1 1))'));
+select st_touches(geomfromtext('point(0 0)'), geomfromtext('point(1 1)')) as result;
+select st_touches(geomfromtext('point(1 1)'), geomfromtext('point(1 1)')) as result;
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 1)')) as result;
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 0)')) as result;
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('point(1 2)')) as result;
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1.2, 1 0, 2 0, 1 1.2))')) as result;
+select st_touches(geomfromtext('polygon((0 0, 2 2, 0 4, 0 0))'), geomfromtext('polygon((1 1, 1 0, 2 0, 1 1))')) as result;
 
 #Equals test
 SELECT ST_Equals(PolyFromText('POLYGON((67 13, 67 18, 67 18, 59 18, 59 13, 67 13) )'),PolyFromText('POLYGON((67 13, 67 18, 59 19, 59 13, 59 13, 67 13) )')) as result;
 SELECT ST_Equals(PolyFromText('POLYGON((67 13, 67 18, 67 18, 59 18, 59 13, 67 13) )'),PolyFromText('POLYGON((67 13, 67 18, 59 18, 59 13, 59 13, 67 13) )')) as result;
 SELECT ST_Equals(PointFromText('POINT (12 13)'),PointFromText('POINT (12 13)')) as result;
 
---enable_view_protocol 
-
 --echo #
 --echo # BUG#11755628/47429: INTERSECTION FUNCTION CRASHED MYSQLD 
 --echo # BUG#11759650/51979: UNION/INTERSECTION OF POLYGONS CRASHES MYSQL 
@@ -150,30 +138,19 @@ SELECT ASTEXT(TOUCHES(@a, GEOMFROMTEXT('point(0 0)'))) t;
 
 # bug #801243 Assertion `(0)' failed in Gis_geometry_collection::init_from_opresult on ST_UNION
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 SELECT astext(ST_UNION (
         PolyFromText('POLYGON(( 2 2 ,3 2,2 7,2 2),( 0 0,8 2,1 9,0 0))'),
-        ExteriorRing( Envelope( MultiLineStringFromText('MULTILINESTRING((3 4,5 3),(3 0,0 5))')))));
-
---enable_view_protocol
+        ExteriorRing( Envelope( MultiLineStringFromText('MULTILINESTRING((3 4,5 3),(3 0,0 5))'))))) as result;
 
 #bug 801189 ST_BUFFER asserts if radius = 0
 SELECT astext(ST_BUFFER(LineStringFromText('LINESTRING(0 0,1 1)'),0));
 
-#enable after fix MDEV-27871
---disable_view_protocol
 #bug 801199 Infinite recursion in Gcalc_function::count_internal with ST_BUFFER over MULTIPOINT
-SELECT Round(ST_Area(ST_BUFFER(MultipointFromText('MULTIPOINT(7 7,3 7,7 2,7 4 ,7 7)'), 3)), 5);
---enable_view_protocol
+SELECT Round(ST_Area(ST_BUFFER(MultipointFromText('MULTIPOINT(7 7,3 7,7 2,7 4 ,7 7)'), 3)), 5) as result;
 
 #bug 801212 Assertion with ST_INTERSECTION on NULL values
 SELECT ST_INTERSECTION(NULL, NULL);
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 #bug 804305 Crash in wkb_get_double with ST_INTERSECTION
 SELECT ASTEXT(ST_INTERSECTION(
   MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),
@@ -182,14 +159,14 @@ SELECT ASTEXT(ST_INTERSECTION(
   MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 4,2 5,3 5)),
                         ((2 2,9 2,0 2,2 6,2 2)),
                         ((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)),
-                        ((9 9,6 8,7 0,9 9)))')));
+                        ((9 9,6 8,7 0,9 9)))'))) as result;
 
 #bug 804324 Assertion 0 in Gcalc_scan_iterator::pop_suitable_intersection
 
 SELECT ROUND(ST_LENGTH(ST_UNION(
         MULTILINESTRINGFROMTEXT('MULTILINESTRING((6 2,4 0,3 5,3 6,4 3,6 4,3 9,0 7,3 7,8 4,2 9,5 0),
                                                  (8 2,1 3,9 0,4 4))'),
-        MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 5,6 7,9 7,5 2,1 6,3 6))'))), 7);
+        MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 5,6 7,9 7,5 2,1 6,3 6))'))), 7) as result;
 
 SELECT ST_NUMGEOMETRIES((ST_UNION(ST_UNION(
         MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 0,4 2,0 2,1 5,0 3,7 0,8 5,5 8),
@@ -202,13 +179,13 @@ SELECT ST_NUMGEOMETRIES((ST_UNION(ST_UNION(
     MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((7 7,3 7,3 1,7 8,7 7)),
                                        ((3 5,2 4,2 5,3 5)),
                                        ((7 7,8 7,3 7,7 7,7 7)),
-                                       ((0 5,3 5,3 4,1 4,1 3,3 3,3 0,0 0,0 5), (1 1,2 1,2 2,1 2,1 1)))'))));
+                                       ((0 5,3 5,3 4,1 4,1 3,3 3,3 0,0 0,0 5), (1 1,2 1,2 2,1 2,1 1)))')))) as result;
 
 #bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sinco
 
 SELECT Round(ST_AREA(ST_BUFFER( ST_UNION(
          POLYGONFROMTEXT('POLYGON((7 7, 7 7, 7 4, 7 7, 7 7))'),
-         POLYGONFROMTEXT('POLYGON((7 7, 4 7, 2 9, 7 6, 7 7))')), 1)), 6);
+         POLYGONFROMTEXT('POLYGON((7 7, 4 7, 2 9, 7 6, 7 7))')), 1)), 6) as result;
 
 
 #bug #804259 Second assertion in Gis_geometry_collection::init_from_opresult
@@ -220,7 +197,7 @@ SELECT AsText(ST_UNION(MultiPolygonFromText('
 MultiPolygonFromText(' MULTIPOLYGON(((0 0, 1 9, 4 6, 0 0)),
                      ((0 5, 3 5, 3 4, 1 4, 1 3, 3 3, 3 0, 0 0, 0 5), (1 1, 2 1, 2 2, 1 2, 1 1)),
                      ((7 7, 4 7, 6 3, 7 2, 7 7)),
-                     ((0 5, 3 5, 3 4, 1 4, 1 3, 3 3, 3 0, 0 0, 0 5), (1 1, 2 1, 2 2, 1 2, 1 1))) ')));
+                     ((0 5, 3 5, 3 4, 1 4, 1 3, 3 3, 3 0, 0 0, 0 5), (1 1, 2 1, 2 2, 1 2, 1 1))) '))) as result;
 
 
 #bug 801217 Assertion `t1->result_range' in Gcalc_operation_reducer::end_couple
@@ -228,7 +205,7 @@ MultiPolygonFromText(' MULTIPOLYGON(((0 0, 1 9, 4 6, 0 0)),
 SELECT AsText(ST_SYMDIFFERENCE(
         MultiLineStringFromText('MULTILINESTRING((7 7, 1 7, 8 5, 7 8, 7 7),
                                                  (6 3, 3 4, 1 1, 9 9, 9 0, 8 4, 9 9))'),
-        Envelope(GeometryFromText('MULTIPOINT(7 9, 0 0, 3 7, 1 6, 0 0)'))));
+        Envelope(GeometryFromText('MULTIPOINT(7 9, 0 0, 3 7, 1 6, 0 0)')))) as result;
 
 #bug 804266 Memory corruption/valgrind warning/crash in move_hole() with ST_UNION
 
@@ -238,34 +215,34 @@ SELECT AsText(ST_UNION(
                                            ((0 0, 7 5, 9 6, 0 0)),
                                            ((7 7, 5 7, 1 5, 7 1, 7 7)))'),
         MultiPolygonFromText('MULTIPOLYGON(((2 2, 2 2, 1 5, 2 7, 2 2)),
-                                           ((0 5, 3 5, 3 0, 0 0, 0 5), (1 1, 2 1, 2 4, 1 4, 1 1)))')));
+                                           ((0 5, 3 5, 3 0, 0 0, 0 5), (1 1, 2 1, 2 4, 1 4, 1 1)))'))) as result;
 
 #bug 802376 ST_INTERSECTION returns wrong result on two overlapping linestrings in maria-5.3-gis
 
 SELECT AsText( ST_INTERSECTION(
   LinestringFromText('LINESTRING( 3 5, 2 5, 2 4, 3 4, 3 5 ) ') ,
   LinestringFromText('LINESTRING( 3 5, 2 4, 2 5, 3 5 ) ')
-));
+)) as result;
 
 #bug 801560 ST_UNION of adjacent polygons includes extra line in maria-5.3-gis
 
 SELECT AsText( ST_UNION(
  PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 7 5 , 2 0 , 2 2 ) ) ') ,
- PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 3 3 , 2 5 , 2 2 ) ) ') ) );
+ PolygonFromText(' POLYGON( ( 2 2 , 3 2 , 3 3 , 2 5 , 2 2 ) ) ') ) ) as result;
 
 #bug 801466 ST_INTERSECTION() returns invalid value on empty intersection in maria-5.3-gis
 
-SELECT AsText(ST_INTERSECTION(LinestringFromText('LINESTRING(1 1, 2 2)'), GeometryFromText('LINESTRING(3 3, 4 4)')));
+SELECT AsText(ST_INTERSECTION(LinestringFromText('LINESTRING(1 1, 2 2)'), GeometryFromText('LINESTRING(3 3, 4 4)'))) as result;
 
 #bug 839341 100% CPU usage with ST_UNION in maria-5.3-gis
-SELECT AsText(ST_UNION(GEOMETRYFROMTEXT('POINT(8 1)') ,MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 5, 2 5, 2 4, 3 4, 3 5))')));
+SELECT AsText(ST_UNION(GEOMETRYFROMTEXT('POINT(8 1)') ,MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 5, 2 5, 2 4, 3 4, 3 5))'))) as result;
 
 #bug 839318 Crash in Gcalc_scan_iterator::point::get_shape with ST_DISTANCE and MULTILINESTRING in maria-5.3-gis
 SELECT ST_DISTANCE(POINTFROMTEXT('POINT(7 1)'),MULTILINESTRINGFROMTEXT('MULTILINESTRING(
-                (4 7,9 7,6 1,3 4,1 1), (3 5, 2 5, 2 4, 3 4, 3 5))'));
+                (4 7,9 7,6 1,3 4,1 1), (3 5, 2 5, 2 4, 3 4, 3 5))')) as result;
 
 #bug 839327 Crash in Gcalc_operation_reducer::end_couple with ST_UNION and MULTIPOLYGONs in 5.3-gis
-SELECT AsText(ST_UNION(POLYGONFROMTEXT('POLYGON((12 9, 3 6, 3 0, 12 9))'), POLYGONFROMTEXT('POLYGON((2 2, 7 2, 4 2, 2 0, 2 2))')));
+SELECT AsText(ST_UNION(POLYGONFROMTEXT('POLYGON((12 9, 3 6, 3 0, 12 9))'), POLYGONFROMTEXT('POLYGON((2 2, 7 2, 4 2, 2 0, 2 2))'))) as result;
 
 #bug 841622 Assertion `t->rp->type == Gcalc_function::shape_line' failed in Gcalc_operation_reducer::end_line in maria-5.3-gis
 
@@ -273,7 +250,7 @@ SELECT AsText(ST_UNION(POLYGONFROMTEXT('POLYGON((12 9, 3 6, 3 0, 12 9))'), POLYG
 SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER(ST_UNION(
   MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 4, 2 5, 7 6, 1 8),(0 0 ,1 6 ,0 1, 8 9, 2 4, 6 1, 3 5, 4 8), (9 3, 5 4, 1 8, 4 2, 5 8, 3 0))' ) ,
   MULTILINESTRINGFROMTEXT('MULTILINESTRING((3 4, 3 1, 2 7, 4 2, 6 2, 1 5))')
-  ), 16)));
+  ), 16))) as result;
 
 #bug 841625 Assertion `m_poly_borders->next' failed in Gcalc_operation_reducer::count_slice in maria-5.3-gis
 
@@ -288,7 +265,7 @@ SELECT ST_NUMGEOMETRIES(ST_DIFFERENCE (
                 )
         ),
         MULTILINESTRINGFROMTEXT( ' MULTILINESTRING( ( 2 9 , 1 3 , 7 3 , 8 5 ) , ( 5 0 , 8 1 , 2 0 , 7 4 , 1 0 ) , ( 9 2 , 5 2 , 6 5 , 8 8 , 0 2 ) , ( 0 8 , 3 9 , 4 0 , 1 0 ) , ( 0 0 , 7 6 , 8 3 , 0 0 ) ) ' )
-));
+)) as result;
 
 
 #bug 841745 ssertion `!sp0->is_bottom()' failed in Gcalc_scan_iterator::find_intersections in maria-5.3-gis
@@ -304,13 +281,13 @@ SELECT ASTEXT(ST_DIFFERENCE (
                         )
                 )
         )
-));
+)) as result;
 
 #bug 841773 Assertion `t0->rp->type == t1->rp->type' failed in Gcalc_operation_reducer::end_couple in maria-5.3-gis
 SELECT ST_NUMGEOMETRIES(ST_UNION (
         MULTILINESTRINGFROMTEXT( ' MULTILINESTRING( ( 0 8 , 1 9 , 5 7 , 2 8 , 5 8 , 6 7 ) , ( 4 5 , 8 4 , 0 3 , 5 1 ) , ( 6 8 , 2 7 , 1 6 , 9 9 , 7 2 ) , ( 9 5 , 2 8 , 1 2 , 9 6 , 2 0 ) ) ' ) ,
         MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 7 7 , 2 7, 6 8, 7 1 , 7 7 ) ) ) ' )
-));
+)) as result;
 
 #bug 841662 Third assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos 
 SELECT ST_BUFFER (
@@ -322,47 +299,53 @@ SELECT ST_BUFFER (
                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) , ( ( 0 0 , 3 8 , 9 4 , 0 0 ) ) ) ' )
                         )
                 )
- ) ;
-SELECT   ST_DISTANCE (     ST_DIFFERENCE (                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) ' ) ,                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) , ( ( 0 0 , 3 8 , 9 4 , 0 0 ) ) ) ' )                         ),                         MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 4, 2 5, 3 5) ) , ( (3 5, 2 5, 2 4, 3 4, 3 5) ) , ( ( 0 0 , 8 3 , 9 5 , 0 0 ) ) ) ' ) )  ;
+ ) as result;
+SELECT   ST_DISTANCE (
+     ST_DIFFERENCE (
+                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) ' ) ,
+                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) , ( ( 0 0 , 3 8 , 9 4 , 0 0 ) ) ) ' )
+                         ),
+                                 MULTIPOLYGONFROMTEXT( ' MULTIPOLYGON( ( (3 5, 2 4, 2 5, 3 5) ) , ( (3 5, 2 5, 2 4, 3 4, 3 5) ) , ( ( 0 0 , 8 3 , 9 5 , 0 0 ) ) ) ' )
+) as result;
 
 #bug 848939 Wrong result with ST_INTERSECTION between linestrings and a polygon in 5.3-gis
-SELECT ASTEXT(ST_INTERSECTION( GEOMETRYFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(7 7,5.33333333333333 7),LINESTRING(5.33333333333333 7,0 7,5 8,5.33333333333333 7),LINESTRING(5.33333333333333 7,7 2,7 7),POLYGON((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5)))'), geomETRYFROMTEXT(' MULTILINESTRING( ( 5 1 , 3 7 , 6 1 , 7 0 ) , ( 1 6 , 8 5 , 7 5 , 5 6 ) )') ));
+SELECT ASTEXT(ST_INTERSECTION( GEOMETRYFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(7 7,5.33333333333333 7),LINESTRING(5.33333333333333 7,0 7,5 8,5.33333333333333 7),LINESTRING(5.33333333333333 7,7 2,7 7),POLYGON((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5)))'), geomETRYFROMTEXT(' MULTILINESTRING( ( 5 1 , 3 7 , 6 1 , 7 0 ) , ( 1 6 , 8 5 , 7 5 , 5 6 ) )') )) as result;
 
 #bug 855485 ST_CROSSES returns different result than PostGIS for overlapping polygons
 
-SELECT ST_CROSSES( GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 4, 2 5, 3 5) ) ') , POLYGONFROMTEXT(' POLYGON((2 4,3 4,3 5,2 5,2 4)) '));
+SELECT ST_CROSSES( GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 4, 2 5, 3 5) ) ') , POLYGONFROMTEXT(' POLYGON((2 4,3 4,3 5,2 5,2 4)) ')) as result;
 
 #bug 855487 ST_WITHIN returns wrong result for partially overlapping polygons
 
-SELECT ST_WITHIN( POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 2 0 , 1 0, 2 4 , 0 4, 0 5) ) ') , POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 1 4 , 1 3 , 3 3 , 3 0 , 0 0 , 0 5), ( 1 1 , 2 1 , 2 2 , 1 2 , 1 1 ) ) ') );
+SELECT ST_WITHIN( POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 2 0 , 1 0, 2 4 , 0 4, 0 5) ) ') , POLYGONFROMTEXT(' POLYGON( (0 5, 3 5, 3 4, 1 4 , 1 3 , 3 3 , 3 0 , 0 0 , 0 5), ( 1 1 , 2 1 , 2 2 , 1 2 , 1 1 ) ) ') ) as result;
 
 #bug 855492 ST_WITHIN returns TRUE on point on the edge of a polygon
 
-SELECT ST_WITHIN( POINTFROMTEXT(' POINT(1 2 ) ') , MULTIPOLYGONFROMTEXT(' MULTIPOLYGON( ( (0 5, 3 5, 3 0, 0 0, 0 5), ( 1 1 , 2 1 , 2 4, 1 4, 1 1 ) ) ) '));
+SELECT ST_WITHIN( POINTFROMTEXT(' POINT(1 2 ) ') , MULTIPOLYGONFROMTEXT(' MULTIPOLYGON( ( (0 5, 3 5, 3 0, 0 0, 0 5), ( 1 1 , 2 1 , 2 4, 1 4, 1 1 ) ) ) ')) as result;
 
 #bug 855497 ST_ENVELOPE of GEOMETRYCOLLECTION EMPTY returns NULL and not GEOMETRYCOLLECTION EMPTY
 
-select ST_ASTEXT(envelope(ST_GEOMCOLLFROMTEXT('GEOMETRYCOLLECTION EMPTY')));
+select ST_ASTEXT(envelope(ST_GEOMCOLLFROMTEXT('GEOMETRYCOLLECTION EMPTY'))) as result;
 
 #bug 855503 ST_EQUALS reports TRUE between a POLYGON and a MULTILINESTRING
 
-SELECT ST_EQUALS( GEOMETRYFROMTEXT(' MULTILINESTRING( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') , GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') );
+SELECT ST_EQUALS( GEOMETRYFROMTEXT(' MULTILINESTRING( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') , GEOMETRYFROMTEXT(' POLYGON( (3 5, 2 5, 2 4, 3 4, 3 5) ) ') ) as result;
 
 #bug 855505 ST_TOUCHES reports TRUE for intersecting polygon and linestring
 
-SELECT ST_TOUCHES( GEOMETRYFROMTEXT(' LINESTRING( 1 1 , 1 4 , 5 0 , 8 3 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ') );
+SELECT ST_TOUCHES( GEOMETRYFROMTEXT(' LINESTRING( 1 1 , 1 4 , 5 0 , 8 3 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ') ) as result;
 
 #bug 857051 ST_EQUALS returns TRUE on two nonidentical MULTIPOINTs
 
-SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT(' MULTIPOINT( 5 8 , 5 2 , 1 8 , 3 0 , 3 0 , 7 8 ) ') );
-SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') );
+SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT(' MULTIPOINT( 5 8 , 5 2 , 1 8 , 3 0 , 3 0 , 7 8 ) ') ) as result;
+SELECT ST_EQUALS( MULTIPOINTFROMTEXT(' MULTIPOINT( 5 1 , 6 9 , 1 4 , 4 0 ) ') , MULTIPOINTFROMTEXT('MULTIPOINT( 4 0 , 6 9 , 5 1, 1 4 )') ) as result;
 
 #bug 857050 ST_WITHIN returns wrong result with MULTIPOINT and POLYGON 
-SELECT ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) '));
+SELECT ST_WITHIN( MULTIPOINTFROMTEXT(' MULTIPOINT( 2 9 , 2 9 , 4 9 , 9 1 ) ') , POLYGONFROMTEXT(' POLYGON( ( 2 2 , 2 8 , 8 8 , 8 2 , 2 2 ) , ( 4 4 , 4 6 , 6 6 , 6 4 , 4 4 ) ) ')) as result;
 
 #bug 857087 Wrong result with ST_INTERSECTS and LINESTRINGs
 
-SELECT ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29)') );
+SELECT ST_INTERSECTS( GeomFromText('MULTILINESTRING( ( 4030 3045 , 3149 2461 , 3004 3831 , 3775 2976 ) )') , GeomFromText('LINESTRING(3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29,3039.07 3175.05,3039.07 3175.05,3058.41 3187.91,3081.52 3153.19,3042.99 3127.57,3019.89 3162.29)') ) as result;
 
 #bug 977201 ST_BUFFER fails with the negative D. TODO - check the result deeper.
 # select ASTEXT(ST_BUFFER(ST_GEOMCOLLFROMTEXT(' GEOMETRYCOLLECTION(LINESTRING(100 100, 31 10, 77 80), POLYGON((0 0,4 7,1 1,0 0)), POINT(20 20))'), -3));
@@ -374,15 +357,15 @@ SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0
   7.664100588675687 1.503849116986468,
   1.664100588675687 -2.496150883013531,
   0.0 -3.0
-))' ), 3 )));
+))' ), 3 ))) as result;
 
 # MDEV-5615 crash in Gcalc_function::add_operation
-select astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1));
+select astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1)) as result;
 
 # MDEV-7925  Inconsistent behavior of ST_Touches with a POINT as one of arguments
-select ST_Touches(ST_LineFromText('LINESTRING(0 0,5 5)'),ST_PointFromText('POINT(0 0)'));
-select ST_Touches(ST_PolygonFromText('POLYGON((0 0,0 5,5 5,5 0,0 0))'),ST_PointFromText('POINT(0 0)'));
-select ST_Touches(ST_PointFromText('POINT(0 0)'),ST_PointFromText('POINT(0 0)'));
+select ST_Touches(ST_LineFromText('LINESTRING(0 0,5 5)'),ST_PointFromText('POINT(0 0)')) as result;
+select ST_Touches(ST_PolygonFromText('POLYGON((0 0,0 5,5 5,5 0,0 0))'),ST_PointFromText('POINT(0 0)')) as result;
+select ST_Touches(ST_PointFromText('POINT(0 0)'),ST_PointFromText('POINT(0 0)')) as result;
 
 # MDEV-12705 10.1.18-MariaDB-1~jessie - mysqld got signal 11.
 SELECT ST_RELATE(
@@ -403,8 +386,6 @@ SELECT ST_RELATE(
     'F*FFFF**F'
     ) as relate_res;
 
---enable_view_protocol
-
 # MDEV-18920 Prepared statements with st_convexhull hang and eat 100% cpu.
 prepare s from 'do st_convexhull(st_aswkb(multipoint(point(-11702,15179),point(-5031,27960),point(-30557,11158),point(-27804,30314))))';
 execute s;
@@ -442,45 +423,41 @@ SELECT ST_DISTANCE_SPHERE(1, 1, 3);
 SELECT ST_DISTANCE_SPHERE(1, 1, NULL);
 # Wrong geometry
 --error ER_INTERNAL_ERROR
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'));
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)')) as result;
 
-#enable after fix MDEV-27871
---disable_view_protocol
 --echo # Test Points and radius
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)')) as result;
 # make bb x86 happy
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10);
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1);
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1) as result;
 --error ER_INTERNAL_ERROR
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 0);
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 0) as result;
 --error ER_INTERNAL_ERROR
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), -1);
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), -1) as result;
 --echo # Test longitude/lattitude
 # make bb x86 happy
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10);
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)'));
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10) as result;
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10) as result;
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)')) as result;
 --echo # Test Points - Multipoints
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)'));
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'));
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'));
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'));
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1);
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1);
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1);
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1);
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)')) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)')) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)')) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)')) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1) as result;
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1) as result;
 --echo # Test Multipoints - Multipoints
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'));
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')) as result;
 # make bb x86 happy
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10);
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10);
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10) as result;
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10) as result;
 # make bb x86 happy
-SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17);
+SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17) as result;
 --error ER_INTERNAL_ERROR
-SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),0);
-
---enable_view_protocol
+SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),0) as result;
 
 # Longitude out of range [-180,180]
 set @pt1 = ST_GeomFromText('POINT(190 -30)');
diff --git a/mysql-test/main/group_min_max_notembedded.test b/mysql-test/main/group_min_max_notembedded.test
index 930ee8464f8..611cac02460 100644
--- a/mysql-test/main/group_min_max_notembedded.test
+++ b/mysql-test/main/group_min_max_notembedded.test
@@ -23,10 +23,13 @@ SET
 
 SELECT DISTINCT * FROM t1 WHERE a IN (1, 2);
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select 
   CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
        as DOUBLE) < 1.0e100  as ACCESS_METHOD_COST_IS_FINITE
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 set optimizer_use_condition_selectivity = @tmp, optimizer_trace=@tmp2;
 drop table t1;
diff --git a/mysql-test/main/having.test b/mysql-test/main/having.test
index 7b8e72cfe1d..d05b35978af 100644
--- a/mysql-test/main/having.test
+++ b/mysql-test/main/having.test
@@ -258,6 +258,8 @@ where t1.col2 in
 
 # the having column is resolved in the FROM clause of the outer query -
 # works in ANSI
+#Enable after fix MDEV-31937
+--disable_ps2_protocol
 select t1.col1 from t1
 where t1.col2 in 
       (select t2.col2 from t2 
@@ -284,6 +286,7 @@ where t1.col2 in
        group by t2.col1, t2.col2 having col_t1 <= 10)
 group by col_t1
 having col_t1 <= 20;
+--enable_ps2_protocol
 
 #
 # nested HAVING clauses
@@ -412,11 +415,14 @@ INSERT INTO PROJ VALUES  ('P4','SDP','Design',20000,'Deale');
 INSERT INTO PROJ VALUES  ('P5','IRM','Test',10000,'Vienna');
 INSERT INTO PROJ VALUES  ('P6','PAYR','Design',50000,'Deale');
 
+#Enable after fix MDEV-31937
+--disable_ps2_protocol
 SELECT EMPNUM, GRADE*1000
   FROM HU.STAFF WHERE GRADE * 1000 > 
                   ANY (SELECT SUM(BUDGET) FROM HU.PROJ
                          GROUP BY CITY, PTYPE
                            HAVING HU.PROJ.CITY = HU.STAFF.CITY);
+--enable_ps2_protocol
 
 DROP SCHEMA HU;
 USE test;
@@ -956,6 +962,8 @@ DROP TABLE t;
 --echo # MDEV-29731 Crash when HAVING in a correlated subquery references
 --echo #            columns in the outer query
 --echo #
+#Enable after fix MDEV-29731
+--disable_view_protocol
 CREATE TABLE t (a INT, b INT);
 SELECT 1 FROM t
   WHERE b = (SELECT 1 FROM t GROUP BY a HAVING b = a+1);
@@ -998,6 +1006,7 @@ UPDATE t SET a = ''
               WHERE (0, a) IN ((0,-1),(+1,0))
               ORDER BY 1+AVG(a) OVER (ORDER BY a)) ORDER BY a;
 DROP TABLE t;
+--enable_view_protocol
 
 --echo #
 --echo # End of 10.4 tests
diff --git a/mysql-test/main/having_cond_pushdown.result b/mysql-test/main/having_cond_pushdown.result
index e49503a77a1..0123b900a7a 100644
--- a/mysql-test/main/having_cond_pushdown.result
+++ b/mysql-test/main/having_cond_pushdown.result
@@ -6019,4 +6019,155 @@ SELECT a,b FROM t1 GROUP BY a,b HAVING a = (b IS NULL);
 a	b
 0	11
 DROP TABLE t1;
+#
+# MDEV-19520 Extend condition normalization to include 'NOT a'
+# having Item_func_not in item tree breaks assumptions during the
+# optimization phase about transformation possibilities in fix_fields().
+# Remove Item_func_not by extending normalization during parsing.
+#
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (0),(1);
+SELECT a FROM t1 GROUP BY a HAVING NOT a;
+a
+0
+DROP TABLE t1;
 End of 10.4 tests
+#
+# MDEV-29363: Constant subquery causing a crash in pushdown optimization
+#
+CREATE TABLE t1 (a INT, b INT, c INT);
+INSERT INTO t1 VALUES (3, 3, 4), (NULL, NULL, 2);
+EXPLAIN FORMAT=JSON SELECT a,b,c FROM t1 GROUP BY a,b,c
+HAVING a = (SELECT MIN(b) AS min_b FROM t1) and (a = b or a = c);
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": 0.011611947,
+    "filesort": {
+      "sort_key": "t1.b, t1.c",
+      "temporary_table": {
+        "nested_loop": [
+          {
+            "table": {
+              "table_name": "t1",
+              "access_type": "ALL",
+              "loops": 1,
+              "rows": 2,
+              "cost": 0.01034841,
+              "filtered": 100,
+              "attached_condition": "t1.a = (subquery#2) and (t1.b = (subquery#2) or t1.c = (subquery#2))"
+            }
+          }
+        ],
+        "subqueries": [
+          {
+            "query_block": {
+              "select_id": 2,
+              "cost": 0.01034841,
+              "nested_loop": [
+                {
+                  "table": {
+                    "table_name": "t1",
+                    "access_type": "ALL",
+                    "loops": 1,
+                    "rows": 2,
+                    "cost": 0.01034841,
+                    "filtered": 100
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+SELECT a,b,c FROM t1 GROUP BY a,b,c
+HAVING a = (SELECT MIN(b) AS min_b FROM t1) and (a = b or a = c);
+a	b	c
+3	3	4
+EXPLAIN FORMAT=JSON SELECT a FROM t1 GROUP BY a,b
+HAVING a = (SELECT MIN(a) AS min_a FROM t1) AND (a = 3 or a > b);
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": 0.011611947,
+    "filesort": {
+      "sort_key": "t1.b",
+      "temporary_table": {
+        "nested_loop": [
+          {
+            "table": {
+              "table_name": "t1",
+              "access_type": "ALL",
+              "loops": 1,
+              "rows": 2,
+              "cost": 0.01034841,
+              "filtered": 100,
+              "attached_condition": "t1.a = (subquery#2) and (1 or (subquery#2) > t1.b)"
+            }
+          }
+        ],
+        "subqueries": [
+          {
+            "query_block": {
+              "select_id": 2,
+              "cost": 0.01034841,
+              "nested_loop": [
+                {
+                  "table": {
+                    "table_name": "t1",
+                    "access_type": "ALL",
+                    "loops": 1,
+                    "rows": 2,
+                    "cost": 0.01034841,
+                    "filtered": 100
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+SELECT a FROM t1 GROUP BY a,b
+HAVING a = (SELECT MIN(a) AS min_a FROM t1) AND (a = 3 or a > b);
+a
+3
+DROP TABLE t1;
+#
+# MDEV-32424: Pushdown: server crashes at JOIN::save_explain_data()
+# (fixed by the patch for MDEV-29363)
+#
+CREATE TABLE t1 (a INT, b INT, c INT);
+INSERT INTO t1 VALUES (1, 1, 3), (3, 2, 3);
+SELECT a,b,c FROM t1 GROUP BY a,b,c
+HAVING a = (SELECT MIN(b) AS min_b FROM t1) and a IN (b, c);
+a	b	c
+1	1	3
+DROP TABLE t1;
+#
+# MDEV-32293: Pushdown: server crashes at check_simple_equality()
+# (fixed by the patch for MDEV-29363)
+#
+CREATE VIEW v1 AS SELECT 1 AS a;
+SELECT * FROM v1 GROUP BY a HAVING a = 'b' AND a = (a IS NULL);
+a
+Warnings:
+Warning	1292	Truncated incorrect DECIMAL value: 'b'
+DROP VIEW v1;
+#
+# MDEV-32304: Pushdown: server crashes at Item_field::used_tables()
+# (fixed by the patch for MDEV-29363)
+#
+CREATE VIEW v1 AS SELECT 1 AS a;
+SELECT * FROM v1
+GROUP BY a HAVING a = (a IS NULL OR a IS NULL);
+a
+DROP VIEW v1;
+End of 10.5 tests
diff --git a/mysql-test/main/having_cond_pushdown.test b/mysql-test/main/having_cond_pushdown.test
index be18699519e..3171e640a6e 100644
--- a/mysql-test/main/having_cond_pushdown.test
+++ b/mysql-test/main/having_cond_pushdown.test
@@ -1635,4 +1635,77 @@ SELECT a,b FROM t1 GROUP BY a,b HAVING a = (b IS NULL);
 
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-19520 Extend condition normalization to include 'NOT a'
+--echo # having Item_func_not in item tree breaks assumptions during the
+--echo # optimization phase about transformation possibilities in fix_fields().
+--echo # Remove Item_func_not by extending normalization during parsing.
+--echo #
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (0),(1);
+SELECT a FROM t1 GROUP BY a HAVING NOT a;
+DROP TABLE t1;
+
 --echo End of 10.4 tests
+
+--echo #
+--echo # MDEV-29363: Constant subquery causing a crash in pushdown optimization
+--echo #
+
+CREATE TABLE t1 (a INT, b INT, c INT);
+INSERT INTO t1 VALUES (3, 3, 4), (NULL, NULL, 2);
+
+let $q=
+SELECT a,b,c FROM t1 GROUP BY a,b,c
+  HAVING a = (SELECT MIN(b) AS min_b FROM t1) and (a = b or a = c);
+
+eval EXPLAIN FORMAT=JSON $q;
+eval $q;
+
+let $q=
+SELECT a FROM t1 GROUP BY a,b
+  HAVING a = (SELECT MIN(a) AS min_a FROM t1) AND (a = 3 or a > b);
+
+eval EXPLAIN FORMAT=JSON $q;
+eval $q;
+
+DROP TABLE t1;
+
+--echo #
+--echo # MDEV-32424: Pushdown: server crashes at JOIN::save_explain_data()
+--echo # (fixed by the patch for MDEV-29363)
+--echo #
+
+CREATE TABLE t1 (a INT, b INT, c INT);
+INSERT INTO t1 VALUES (1, 1, 3), (3, 2, 3);
+
+SELECT a,b,c FROM t1 GROUP BY a,b,c
+  HAVING a = (SELECT MIN(b) AS min_b FROM t1) and a IN (b, c);
+
+DROP TABLE t1;
+
+--echo #
+--echo # MDEV-32293: Pushdown: server crashes at check_simple_equality()
+--echo # (fixed by the patch for MDEV-29363)
+--echo #
+
+CREATE VIEW v1 AS SELECT 1 AS a;
+
+SELECT * FROM v1 GROUP BY a HAVING a = 'b' AND a = (a IS NULL);
+
+DROP VIEW v1;
+
+--echo #
+--echo # MDEV-32304: Pushdown: server crashes at Item_field::used_tables()
+--echo # (fixed by the patch for MDEV-29363)
+--echo #
+
+CREATE VIEW v1 AS SELECT 1 AS a;
+
+SELECT * FROM v1
+  GROUP BY a HAVING a = (a IS NULL OR a IS NULL);
+
+DROP VIEW v1;
+
+--echo End of 10.5 tests
diff --git a/mysql-test/main/index_merge_myisam.result b/mysql-test/main/index_merge_myisam.result
index 5866612c186..111ed8ef2e8 100644
--- a/mysql-test/main/index_merge_myisam.result
+++ b/mysql-test/main/index_merge_myisam.result
@@ -371,47 +371,47 @@ create table t4 (a int);
 insert into t4 values (1),(4),(3);
 set @save_join_buffer_size=@@join_buffer_size;
 set join_buffer_size= 4096;
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
 where (A.key1 < 500000 or A.key2 < 3)
 and   (B.key1 < 500000 or B.key2 < 3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	1010	Using sort_union(i1,i2); Using where
 1	SIMPLE	B	index_merge	i1,i2	i1,i2	4,4	NULL	1010	Using sort_union(i1,i2); Using where; Using join buffer (flat, BNL join)
-select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
 where (A.key1 < 500000 or A.key2 < 3)
 and   (B.key1 < 500000 or B.key2 < 3);
-max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+exp
 10240
 update t0 set key1=1;
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
 where (A.key1 = 1 or A.key2 = 1)
 and   (B.key1 = 1 or B.key2 = 1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	1021	Using union(i1,i2); Using where
 1	SIMPLE	B	index_merge	i1,i2	i1,i2	4,4	NULL	1021	Using union(i1,i2); Using where; Using join buffer (flat, BNL join)
-select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
 where (A.key1 = 1 or A.key2 = 1)
 and   (B.key1 = 1 or B.key2 = 1);
-max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+exp
 8194
 alter table t0 add filler1 char(200), add filler2 char(200), add filler3 char(200);
 update t0 set key2=1, key3=1, key4=1, key5=1,key6=1,key7=1 where key7 < 500;
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
 from t0 as A straight_join t0 as B
 where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
 and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	A	ALL	i1,i2,i3,i4,i5,i6,i7?,i8	NULL	NULL	NULL	#	Using where
 1	SIMPLE	B	ALL	i1,i2,i3,i4,i5,i6,i7?,i8	NULL	NULL	NULL	#	Using where; Using join buffer (flat, BNL join)
-select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) as exp
 from t0 as A straight_join t0 as B
 where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
 and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
-max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+exp
 8186
 set join_buffer_size= @save_join_buffer_size;
 drop table t0, t1, t2, t3, t4;
diff --git a/mysql-test/main/join_cache.result b/mysql-test/main/join_cache.result
index 0f29c375cce..3761da5d731 100644
--- a/mysql-test/main/join_cache.result
+++ b/mysql-test/main/join_cache.result
@@ -962,7 +962,7 @@ Klaipeda
 Panevezys
 # Part 2, join_cache_level=3, Query 7
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
@@ -971,12 +971,12 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	Country	ALL	NULL	NULL	NULL	NULL	239	Using where
 1	SIMPLE	CountryLanguage	hash_ALL	PRIMARY	#hash#PRIMARY	33	world.Country.Code,const	984	Using where; Using join buffer (flat, BNLH join)
 # Part 2, join_cache_level=3, Query 8
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
 Country.Population > 10000000;
-Name	IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+Name	epx
 Australia	81.2
 United Kingdom	97.3
 Canada	60.4
@@ -1170,7 +1170,7 @@ Klaipeda
 Panevezys
 # Part 2, join_cache_level=4, Query 7
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
@@ -1179,12 +1179,12 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	Country	ALL	NULL	NULL	NULL	NULL	239	Using where
 1	SIMPLE	CountryLanguage	hash_ALL	PRIMARY	#hash#PRIMARY	33	world.Country.Code,const	984	Using where; Using join buffer (flat, BNLH join)
 # Part 2, join_cache_level=4, Query 8
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
 Country.Population > 10000000;
-Name	IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+Name	epx
 Australia	81.2
 United Kingdom	97.3
 Canada	60.4
@@ -1434,7 +1434,7 @@ Klaipeda
 ?iauliai
 Panevezys
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
@@ -1442,12 +1442,12 @@ Country.Population > 10000000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	Country	ALL	NULL	NULL	NULL	NULL	239	Using where
 1	SIMPLE	CountryLanguage	eq_ref	PRIMARY	PRIMARY	33	world.Country.Code,const	1	Using where; Using join buffer (flat, BKA join); Key-ordered Rowid-ordered scan
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
 Country.Population > 10000000;
-Name	IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+Name	epx
 Australia	81.2
 United Kingdom	97.3
 Canada	60.4
@@ -1631,7 +1631,7 @@ Klaipeda
 ?iauliai
 Panevezys
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
@@ -1639,12 +1639,12 @@ Country.Population > 10000000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	Country	ALL	NULL	NULL	NULL	NULL	239	Using where
 1	SIMPLE	CountryLanguage	eq_ref	PRIMARY	PRIMARY	33	world.Country.Code,const	1	Using where; Using join buffer (flat, BKA join); Key-ordered Rowid-ordered scan
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
 Country.Population > 10000000;
-Name	IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+Name	epx
 Australia	81.2
 United Kingdom	97.3
 Canada	60.4
@@ -1828,7 +1828,7 @@ Klaipeda
 ?iauliai
 Panevezys
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
@@ -1836,12 +1836,12 @@ Country.Population > 10000000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	Country	ALL	NULL	NULL	NULL	NULL	239	Using where
 1	SIMPLE	CountryLanguage	eq_ref	PRIMARY	PRIMARY	33	world.Country.Code,const	1	Using where; Using join buffer (flat, BKAH join); Key-ordered Rowid-ordered scan
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
 Country.Population > 10000000;
-Name	IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+Name	epx
 Australia	81.2
 United Kingdom	97.3
 Canada	60.4
@@ -2025,7 +2025,7 @@ Klaipeda
 ?iauliai
 Panevezys
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
@@ -2033,12 +2033,12 @@ Country.Population > 10000000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	Country	ALL	NULL	NULL	NULL	NULL	239	Using where
 1	SIMPLE	CountryLanguage	eq_ref	PRIMARY	PRIMARY	33	world.Country.Code,const	1	Using where; Using join buffer (flat, BKAH join); Key-ordered Rowid-ordered scan
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
 FROM Country LEFT JOIN CountryLanguage ON
 (CountryLanguage.Country=Country.Code AND Language='English')
 WHERE 
 Country.Population > 10000000;
-Name	IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+Name	epx
 Australia	81.2
 United Kingdom	97.3
 Canada	60.4
diff --git a/mysql-test/main/join_cache.test b/mysql-test/main/join_cache.test
index cfbd5e2dc5f..dc6f3dd89a3 100644
--- a/mysql-test/main/join_cache.test
+++ b/mysql-test/main/join_cache.test
@@ -456,25 +456,20 @@ SELECT Name FROM City
         City.Population > 100000;
 
 --echo # Part 2, join_cache_level=3, Query 7
-#enable after fix MDEV-27871
---disable_view_protocol
-
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
 --echo # Part 2, join_cache_level=3, Query 8
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
---enable_view_protocol
-
 show variables like 'join_buffer_size';
 set join_cache_level=4;
 show variables like 'join_cache_level';
@@ -523,24 +518,20 @@ SELECT Name FROM City
         City.Population > 100000;
 
 --echo # Part 2, join_cache_level=4, Query 7
-#enable after fix MDEV-27871
---disable_view_protocol
-
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
 --echo # Part 2, join_cache_level=4, Query 8
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
---enable_view_protocol
 --echo # Part 2, join_cache_level=4, Query 9
 --replace_column 9 #
 EXPLAIN
@@ -615,24 +606,19 @@ SELECT Name FROM City
   WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
         City.Population > 100000;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
---enable_view_protocol
-
 set join_cache_level=6;
 show variables like 'join_cache_level';
 
@@ -673,24 +659,19 @@ SELECT Name FROM City
   WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
         City.Population > 100000;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
---enable_view_protocol
-
 set join_cache_level=7;
 show variables like 'join_cache_level';
 
@@ -731,24 +712,19 @@ SELECT Name FROM City
   WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
         City.Population > 100000;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
---enable_view_protocol
-
 set join_cache_level=8;
 show variables like 'join_cache_level';
 
@@ -789,23 +765,19 @@ SELECT Name FROM City
   WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
         City.Population > 100000;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 EXPLAIN
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
-SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage)
+SELECT Country.Name, IF(ISNULL(CountryLanguage.Country), NULL, CountryLanguage.Percentage) as epx
   FROM Country LEFT JOIN CountryLanguage ON
        (CountryLanguage.Country=Country.Code AND Language='English')
   WHERE 
        Country.Population > 10000000;
 
---enable_view_protocol
 
 set join_buffer_size=256;
 show variables like 'join_buffer_size';
diff --git a/mysql-test/main/json_equals.result b/mysql-test/main/json_equals.result
index 1fa13ec2cf8..a9a828af8cf 100644
--- a/mysql-test/main/json_equals.result
+++ b/mysql-test/main/json_equals.result
@@ -23,14 +23,12 @@ select json_equals('{"a":[1, 2, 3]}', '{"a":[1, 2, 3]}');
 json_equals('{"a":[1, 2, 3]}', '{"a":[1, 2, 3]}')
 1
 select json_equals('{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}',
-'{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}');
-json_equals('{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}',
-'{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}')
+'{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}') as je;
+je
 1
 select json_equals('{"a" : [0.123456789123456789], "b" : [1, 2, 3]}',
-'{"b" : [1, 2, 3], "a" : [0.123456789123456789]}');
-json_equals('{"a" : [0.123456789123456789], "b" : [1, 2, 3]}',
-'{"b" : [1, 2, 3], "a" : [0.123456789123456789]}')
+'{"b" : [1, 2, 3], "a" : [0.123456789123456789]}') as je;
+je
 1
 #
 # Test max json depth for json_equals.
diff --git a/mysql-test/main/json_equals.test b/mysql-test/main/json_equals.test
index 943906e6f01..2ed97e3e625 100644
--- a/mysql-test/main/json_equals.test
+++ b/mysql-test/main/json_equals.test
@@ -15,14 +15,11 @@ select json_equals('{"a":[1, 2, 3]}', '{"a":[1, 2, 3, 4]}');
 
 select json_equals('{"a":[1, 2, 3]}', '{"a":[1, 2, 3]}');
 
-#enable after fix MDEV-27871
---disable_view_protocol
 select json_equals('{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}',
-                   '{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}');
+                   '{"țanțoș":[1, 2, "ț", {"some uâ߀":"uâßr"}]}') as je;
 
 select json_equals('{"a" : [0.123456789123456789], "b" : [1, 2, 3]}',
-                   '{"b" : [1, 2, 3], "a" : [0.123456789123456789]}');
---enable_view_protocol
+                   '{"b" : [1, 2, 3], "a" : [0.123456789123456789]}') as je;
 
 --echo #
 --echo # Test max json depth for json_equals.
diff --git a/mysql-test/main/log_slow_filter.opt b/mysql-test/main/log_slow_filter.opt
new file mode 100644
index 00000000000..3cadc343ed8
--- /dev/null
+++ b/mysql-test/main/log_slow_filter.opt
@@ -0,0 +1,4 @@
+--log-slow-filter= --log_queries_not_using_indexes=0
+
+
+
diff --git a/mysql-test/main/log_slow_filter.result b/mysql-test/main/log_slow_filter.result
new file mode 100644
index 00000000000..0d785ec7e98
--- /dev/null
+++ b/mysql-test/main/log_slow_filter.result
@@ -0,0 +1,8 @@
+call mtr.add_suppression("log_slow_filter=\"\" changed to log_slow_filter=ALL");
+show variables like "log_slow_filter";
+Variable_name	Value
+log_slow_filter	admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+set @@log_slow_filter="all";
+show variables like "log_slow_filter";
+Variable_name	Value
+log_slow_filter	admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,not_using_index,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
diff --git a/mysql-test/main/log_slow_filter.test b/mysql-test/main/log_slow_filter.test
new file mode 100644
index 00000000000..d677e37fece
--- /dev/null
+++ b/mysql-test/main/log_slow_filter.test
@@ -0,0 +1,7 @@
+# Test setting log_slow_filter to empty in config files
+
+call mtr.add_suppression("log_slow_filter=\"\" changed to log_slow_filter=ALL");
+
+show variables like "log_slow_filter";
+set @@log_slow_filter="all";
+show variables like "log_slow_filter";
diff --git a/mysql-test/main/log_slow_innodb.result b/mysql-test/main/log_slow_innodb.result
index cd84aed0830..45c31efcf65 100644
--- a/mysql-test/main/log_slow_innodb.result
+++ b/mysql-test/main/log_slow_innodb.result
@@ -23,6 +23,10 @@ UPDATE t1 set b=b+1 where a=1 or a=999;
 [log_grep.inc] lines:   0
 [log_grep.inc] file: log_slow_innodb-verbosity_1 pattern: ^# Tmp_tables: \d+  Tmp_disk_tables: \d+$
 [log_grep.inc] lines:   0
+[log_grep.inc] file: log_slow_innodb-verbosity_1 pattern: ^# Pages_accessed: \d+  Pages_read: \d+  Pages_prefetched: \d+  Pages_updated: \d+  Old_rows_read: \d+$ expected_matches: 2
+[log_grep.inc] found expected match count: 2
+[log_grep.inc] file: log_slow_innodb-verbosity_1 pattern: ^# Pages_read_time: \d+\.\d+  Engine_time: \d+\.\d+$ expected_matches: 2
+[log_grep.inc] found expected match count: 2
 SET SESSION log_slow_verbosity='innodb,query_plan';
 [slow_log_start.inc] log_slow_innodb-verbosity_2
 SELECT 1;
@@ -43,6 +47,10 @@ SELECT 1;
 [log_grep.inc] lines:   0
 [log_grep.inc] file: log_slow_innodb-verbosity_2 pattern: ^# Tmp_tables: \d+  Tmp_disk_tables: \d+$
 [log_grep.inc] lines:   0
+[log_grep.inc] file: log_slow_innodb-verbosity_2 pattern: ^# Pages_accessed: \d+  Pages_read: \d+  Pages_prefetched: \d+  Pages_updated: \d+  Old_rows_read: \d+$
+[log_grep.inc] lines:   0
+[log_grep.inc] file: log_slow_innodb-verbosity_2 pattern: ^# Pages_read_time: \d+\.\d+  Engine_time: \d+\.\d+$
+[log_grep.inc] lines:   0
 #
 # Test 'query_plan'
 #
@@ -64,6 +72,10 @@ INSERT INTO t1 VALUE(1001,1001);
 [log_grep.inc] lines:   0
 [log_grep.inc] file: log_slow_innodb-verbosity_3 pattern: ^# Tmp_tables: \d+  Tmp_disk_tables: \d+$
 [log_grep.inc] lines:   0
+[log_grep.inc] file: log_slow_innodb-verbosity_3 pattern: ^# Pages_accessed: \d+  Pages_read: \d+  Pages_prefetched: \d+  Pages_updated: \d+  Old_rows_read: \d+$
+[log_grep.inc] lines:   0
+[log_grep.inc] file: log_slow_innodb-verbosity_3 pattern: ^# Pages_read_time: \d+\.\d+  Engine_time: \d+\.\d+$
+[log_grep.inc] lines:   0
 DROP TABLE t1;
 #
 # Test max_tmp_disk_space_used
diff --git a/mysql-test/main/log_slow_innodb.test b/mysql-test/main/log_slow_innodb.test
index 30fc8b941df..ddba0463b63 100644
--- a/mysql-test/main/log_slow_innodb.test
+++ b/mysql-test/main/log_slow_innodb.test
@@ -72,7 +72,7 @@ SET SESSION log_slow_verbosity='query_plan';
 INSERT INTO t1 VALUE(1001,1001);
 --source include/log_slow_stop.inc
 
---let log_slow_verbosity_innodb_expected_matches= 1
+--let log_slow_verbosity_innodb_expected_matches= 0
 --source include/log_slow_grep.inc
 
 DROP TABLE t1;
diff --git a/mysql-test/main/max_password_errors.result b/mysql-test/main/max_password_errors.result
index 020761b4f2e..9ee7d0d448d 100644
--- a/mysql-test/main/max_password_errors.result
+++ b/mysql-test/main/max_password_errors.result
@@ -9,10 +9,10 @@ connect  con1, localhost, u, bad_pass;
 ERROR 28000: Access denied for user 'u'@'localhost' (using password: YES)
 connect(localhost,u,good_pass,test,MASTER_PORT,MASTER_SOCKET);
 connect con1, localhost, u, good_pass;
-ERROR HY000: User is blocked because of too many credential errors; unblock with 'FLUSH PRIVILEGES'
+ERROR HY000: User is blocked because of too many credential errors; unblock with 'ALTER USER / FLUSH PRIVILEGES'
 connect(localhost,u,bad_pass,test,MASTER_PORT,MASTER_SOCKET);
 connect con1, localhost, u, bad_pass;
-ERROR HY000: User is blocked because of too many credential errors; unblock with 'FLUSH PRIVILEGES'
+ERROR HY000: User is blocked because of too many credential errors; unblock with 'ALTER USER / FLUSH PRIVILEGES'
 FLUSH PRIVILEGES;
 connect  con1, localhost, u, good_pass;
 disconnect con1;
@@ -27,7 +27,7 @@ ERROR 28000: Access denied for user 'u'@'localhost' (using password: YES)
 connect  con1, localhost, u, good_pass;
 ERROR 28000: Access denied for user 'u'@'localhost' (using password: YES)
 ERROR 28000: Access denied for user 'u'@'localhost' (using password: YES)
-ERROR HY000: User is blocked because of too many credential errors; unblock with 'FLUSH PRIVILEGES'
+ERROR HY000: User is blocked because of too many credential errors; unblock with 'ALTER USER / FLUSH PRIVILEGES'
 disconnect con1;
 connection default;
 FLUSH PRIVILEGES;
@@ -40,6 +40,21 @@ ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
 connect  con1, localhost, u, good_pass;
 disconnect con1;
 connection default;
+connect(localhost,u,bad_password,test,MASTER_PORT,MASTER_SOCKET);
+connect con1, localhost, u, bad_password;
+ERROR 28000: Access denied for user 'u'@'localhost' (using password: YES)
+connect(localhost,u,bad_password,test,MASTER_PORT,MASTER_SOCKET);
+connect con1, localhost, u, bad_password;
+ERROR 28000: Access denied for user 'u'@'localhost' (using password: YES)
+connect(localhost,u,good_pass,test,MASTER_PORT,MASTER_SOCKET);
+connect con1, localhost, u, good_pass;
+ERROR HY000: User is blocked because of too many credential errors; unblock with 'ALTER USER / FLUSH PRIVILEGES'
+ALTER USER u ACCOUNT UNLOCK;
+connect(localhost,u,bad_password,test,MASTER_PORT,MASTER_SOCKET);
+connect con1, localhost, u, bad_password;
+ERROR 28000: Access denied for user 'u'@'localhost' (using password: YES)
+connect con1, localhost, u, good_pass;
+disconnect con1;
+connection default;
 DROP USER u;
-FLUSH PRIVILEGES;
 set global max_password_errors=@old_max_password_errors;
diff --git a/mysql-test/main/max_password_errors.test b/mysql-test/main/max_password_errors.test
index 1debca0258d..3642746e83f 100644
--- a/mysql-test/main/max_password_errors.test
+++ b/mysql-test/main/max_password_errors.test
@@ -59,6 +59,28 @@ connect (con1, localhost, root, bad_pass);
 connect (con1, localhost, u, good_pass);
 disconnect con1;
 connection default;
+
+# Block u again
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+error ER_ACCESS_DENIED_ERROR;
+connect(con1, localhost, u, bad_password);
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+error ER_ACCESS_DENIED_ERROR;
+connect(con1, localhost, u, bad_password);
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+error ER_USER_IS_BLOCKED;
+connect(con1, localhost, u, good_pass);
+
+# Unblock foo
+ALTER USER u ACCOUNT UNLOCK;
+
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+error ER_ACCESS_DENIED_ERROR;
+connect(con1, localhost, u, bad_password);
+
+connect(con1, localhost, u, good_pass);
+disconnect con1;
+connection default;
+
 DROP USER u;
-FLUSH PRIVILEGES;
-set global max_password_errors=@old_max_password_errors;
\ No newline at end of file
+set global max_password_errors=@old_max_password_errors;
diff --git a/mysql-test/main/mysql_upgrade-34014.opt b/mysql-test/main/mysql_upgrade-34014.opt
new file mode 100644
index 00000000000..48849b3eb21
--- /dev/null
+++ b/mysql-test/main/mysql_upgrade-34014.opt
@@ -0,0 +1,2 @@
+--character-set-server=utf8mb3
+--collation-server=utf8mb3_unicode_ci
diff --git a/mysql-test/main/mysql_upgrade-34014.result b/mysql-test/main/mysql_upgrade-34014.result
new file mode 100644
index 00000000000..6e899ea1a7a
--- /dev/null
+++ b/mysql-test/main/mysql_upgrade-34014.result
@@ -0,0 +1,187 @@
+#
+# Stat of 10.6 tests
+#
+#
+# MDEV-34014 mysql_upgrade failed
+#
+SHOW CREATE DATABASE sys;
+Database	Create Database
+sys	CREATE DATABASE `sys` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */
+# Emulate db.opt file was removed in a mistake
+FLUSH TABLES;
+SHOW CREATE DATABASE sys;
+Database	Create Database
+sys	CREATE DATABASE `sys` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */
+Phase 1/8: Checking and upgrading mysql database
+Processing databases
+mysql
+mysql.column_stats                                 OK
+mysql.columns_priv                                 OK
+mysql.db                                           OK
+mysql.event                                        OK
+mysql.func                                         OK
+mysql.global_priv                                  OK
+mysql.gtid_slave_pos                               OK
+mysql.help_category                                OK
+mysql.help_keyword                                 OK
+mysql.help_relation                                OK
+mysql.help_topic                                   OK
+mysql.index_stats                                  OK
+mysql.innodb_index_stats
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
+mysql.innodb_table_stats
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
+mysql.plugin                                       OK
+mysql.proc                                         OK
+mysql.procs_priv                                   OK
+mysql.proxies_priv                                 OK
+mysql.roles_mapping                                OK
+mysql.servers                                      OK
+mysql.table_stats                                  OK
+mysql.tables_priv                                  OK
+mysql.time_zone                                    OK
+mysql.time_zone_leap_second                        OK
+mysql.time_zone_name                               OK
+mysql.time_zone_transition                         OK
+mysql.time_zone_transition_type                    OK
+mysql.transaction_registry
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
+
+Repairing tables
+mysql.innodb_index_stats
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
+mysql.innodb_table_stats
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
+mysql.transaction_registry
+Error    : Unknown storage engine 'InnoDB'
+error    : Corrupt
+Phase 2/8: Installing used storage engines... Skipped
+Phase 3/8: Running 'mysql_fix_privilege_tables'
+Phase 4/8: Fixing views
+mysql.user                                         OK
+sys.host_summary                                   OK
+sys.host_summary_by_file_io                        OK
+sys.host_summary_by_file_io_type                   OK
+sys.host_summary_by_stages                         OK
+sys.host_summary_by_statement_latency              OK
+sys.host_summary_by_statement_type                 OK
+sys.innodb_buffer_stats_by_schema                  OK
+sys.innodb_buffer_stats_by_table                   OK
+sys.innodb_lock_waits                              OK
+sys.io_by_thread_by_latency                        OK
+sys.io_global_by_file_by_bytes                     OK
+sys.io_global_by_file_by_latency                   OK
+sys.io_global_by_wait_by_bytes                     OK
+sys.io_global_by_wait_by_latency                   OK
+sys.latest_file_io                                 OK
+sys.memory_by_host_by_current_bytes                OK
+sys.memory_by_thread_by_current_bytes              OK
+sys.memory_by_user_by_current_bytes                OK
+sys.memory_global_by_current_bytes                 OK
+sys.memory_global_total                            OK
+sys.metrics                                        OK
+sys.privileges_by_table_by_level                   OK
+sys.processlist                                    OK
+sys.ps_check_lost_instrumentation                  OK
+sys.schema_auto_increment_columns                  OK
+sys.schema_index_statistics                        OK
+sys.schema_object_overview                         OK
+sys.schema_redundant_indexes                       OK
+sys.schema_table_lock_waits                        OK
+sys.schema_table_statistics                        OK
+sys.schema_table_statistics_with_buffer            OK
+sys.schema_tables_with_full_table_scans            OK
+sys.schema_unused_indexes                          OK
+sys.session                                        OK
+sys.session_ssl_status                             OK
+sys.statement_analysis                             OK
+sys.statements_with_errors_or_warnings             OK
+sys.statements_with_full_table_scans               OK
+sys.statements_with_runtimes_in_95th_percentile    OK
+sys.statements_with_sorting                        OK
+sys.statements_with_temp_tables                    OK
+sys.user_summary                                   OK
+sys.user_summary_by_file_io                        OK
+sys.user_summary_by_file_io_type                   OK
+sys.user_summary_by_stages                         OK
+sys.user_summary_by_statement_latency              OK
+sys.user_summary_by_statement_type                 OK
+sys.version                                        OK
+sys.wait_classes_global_by_avg_latency             OK
+sys.wait_classes_global_by_latency                 OK
+sys.waits_by_host_by_latency                       OK
+sys.waits_by_user_by_latency                       OK
+sys.waits_global_by_latency                        OK
+sys.x$host_summary                                 OK
+sys.x$host_summary_by_file_io                      OK
+sys.x$host_summary_by_file_io_type                 OK
+sys.x$host_summary_by_stages                       OK
+sys.x$host_summary_by_statement_latency            OK
+sys.x$host_summary_by_statement_type               OK
+sys.x$innodb_buffer_stats_by_schema                OK
+sys.x$innodb_buffer_stats_by_table                 OK
+sys.x$innodb_lock_waits                            OK
+sys.x$io_by_thread_by_latency                      OK
+sys.x$io_global_by_file_by_bytes                   OK
+sys.x$io_global_by_file_by_latency                 OK
+sys.x$io_global_by_wait_by_bytes                   OK
+sys.x$io_global_by_wait_by_latency                 OK
+sys.x$latest_file_io                               OK
+sys.x$memory_by_host_by_current_bytes              OK
+sys.x$memory_by_thread_by_current_bytes            OK
+sys.x$memory_by_user_by_current_bytes              OK
+sys.x$memory_global_by_current_bytes               OK
+sys.x$memory_global_total                          OK
+sys.x$processlist                                  OK
+sys.x$ps_digest_95th_percentile_by_avg_us          OK
+sys.x$ps_digest_avg_latency_distribution           OK
+sys.x$ps_schema_table_statistics_io                OK
+sys.x$schema_flattened_keys                        OK
+sys.x$schema_index_statistics                      OK
+sys.x$schema_table_lock_waits                      OK
+sys.x$schema_table_statistics                      OK
+sys.x$schema_table_statistics_with_buffer          OK
+sys.x$schema_tables_with_full_table_scans          OK
+sys.x$session                                      OK
+sys.x$statement_analysis                           OK
+sys.x$statements_with_errors_or_warnings           OK
+sys.x$statements_with_full_table_scans             OK
+sys.x$statements_with_runtimes_in_95th_percentile  OK
+sys.x$statements_with_sorting                      OK
+sys.x$statements_with_temp_tables                  OK
+sys.x$user_summary                                 OK
+sys.x$user_summary_by_file_io                      OK
+sys.x$user_summary_by_file_io_type                 OK
+sys.x$user_summary_by_stages                       OK
+sys.x$user_summary_by_statement_latency            OK
+sys.x$user_summary_by_statement_type               OK
+sys.x$wait_classes_global_by_avg_latency           OK
+sys.x$wait_classes_global_by_latency               OK
+sys.x$waits_by_host_by_latency                     OK
+sys.x$waits_by_user_by_latency                     OK
+sys.x$waits_global_by_latency                      OK
+Phase 5/8: Fixing table and database names
+Phase 6/8: Checking and upgrading tables
+Processing databases
+information_schema
+mtr
+mtr.global_suppressions                            OK
+mtr.test_suppressions                              OK
+performance_schema
+sys
+sys.sys_config                                     OK
+test
+Phase 7/8: uninstalling plugins
+Phase 8/8: Running 'FLUSH PRIVILEGES'
+OK
+SHOW CREATE DATABASE sys;
+Database	Create Database
+sys	CREATE DATABASE `sys` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */
+#
+# End of 10.6 tests
+#
diff --git a/mysql-test/main/mysql_upgrade-34014.test b/mysql-test/main/mysql_upgrade-34014.test
new file mode 100644
index 00000000000..e868dc43257
--- /dev/null
+++ b/mysql-test/main/mysql_upgrade-34014.test
@@ -0,0 +1,26 @@
+--source include/mysql_upgrade_preparation.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--echo #
+--echo # Stat of 10.6 tests
+--echo #
+
+--echo #
+--echo # MDEV-34014 mysql_upgrade failed
+--echo #
+
+SHOW CREATE DATABASE sys;
+
+--echo # Emulate db.opt file was removed in a mistake
+--remove_file $MYSQLD_DATADIR/sys/db.opt
+FLUSH TABLES;
+SHOW CREATE DATABASE sys;
+
+--exec $MYSQL_UPGRADE --force 2>&1
+--remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
+SHOW CREATE DATABASE sys;
+
+--echo #
+--echo # End of 10.6 tests
+--echo #
diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test
index ad2307f43c6..05739197331 100644
--- a/mysql-test/main/mysqld--help.test
+++ b/mysql-test/main/mysqld--help.test
@@ -28,7 +28,7 @@ perl;
                large-files-support lower-case-file-system system-time-zone
                collation-server character-set-server log-tc-size table-cache
                table-open-cache table-open-cache-instances max-connections
-               tls-version version.* password-reuse-check
+               server-uid tls-version version.* password-reuse-check
                provider-bzip2 provider-lzma provider-lzo
                password-reuse-check-interval/;
 
diff --git a/mysql-test/main/opt_trace.result b/mysql-test/main/opt_trace.result
index 7d77bb9d601..44d5c2896cd 100644
--- a/mysql-test/main/opt_trace.result
+++ b/mysql-test/main/opt_trace.result
@@ -12442,9 +12442,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	const	PRIMARY	NULL	NULL	NULL	1	Impossible ON condition
 1	SIMPLE	t2	const	PRIMARY	NULL	NULL	NULL	0	Impossible ON condition
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	10	
-select JSON_DETAILED(JSON_EXTRACT(trace, '$**.mark_join_nest_as_const'))
+select JSON_DETAILED(JSON_EXTRACT(trace, '$**.mark_join_nest_as_const')) as jd
 from information_schema.optimizer_trace;
-JSON_DETAILED(JSON_EXTRACT(trace, '$**.mark_join_nest_as_const'))
+jd
 [
     {
         "members": 
@@ -12467,9 +12467,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t0	ALL	NULL	NULL	NULL	NULL	10	Using where
 1	PRIMARY	<derived3>	eq_ref	distinct_key	distinct_key	4	test.t0.a	1	
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+jd
 [
     {
         "item": "t0.a in (1,2,3,4,5,6)",
@@ -12510,9 +12510,9 @@ json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
 explain select * from t0 where a in (1,2,3,4,5,a+1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	10	Using where
-select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+jd
 [
     {
         "item": "t0.a in (1,2,3,4,5,t0.a + 1)",
@@ -12523,9 +12523,9 @@ json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
 explain select * from t0 where a in ('1','2','3','4','5','6');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	10	Using where
-select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion')) as jd
 from information_schema.optimizer_trace;
-json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+jd
 [
     {
         "item": "t0.a in ('1','2','3','4','5','6')",
@@ -12548,6 +12548,34 @@ QUERY	LENGTH(trace)>1
 insert into t2 select * from t1 where a<= b and a>4	1
 drop table t1, t2;
 #
+# MDEV-34305 Redundant truncation errors/warnings with optimizer_trace enabled
+#
+SET @@optimizer_trace='enabled=on';
+CREATE TABLE t1 (
+a CHAR(2) NOT NULL PRIMARY KEY,
+b VARCHAR(20) NOT NULL,
+KEY (b)
+) CHARSET=utf8mb4;
+CREATE TABLE t2 (
+a CHAR(2) NOT NULL PRIMARY KEY,
+b VARCHAR(20) NOT NULL,
+KEY (b)
+) CHARSET=utf8mb4;
+INSERT INTO t1 VALUES
+('AB','MySQLAB'),
+('JA','Sun Microsystems'),
+('MS','Microsoft'),
+('IB','IBM- Inc.'),
+('GO','Google Inc.');
+INSERT IGNORE INTO t2 VALUES
+('AB','Sweden'),
+('JA','USA'),
+('MS','United States'),
+('IB','North America'),
+('GO','South America');
+UPDATE t1,t2 SET t1.b=UPPER(t1.b) WHERE t1.b LIKE 'Unknown%';
+DROP TABLE t1, t2;
+#
 # End of 10.5 tests
 #
 #
diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test
index b3a9c211ead..61da3c958c8 100644
--- a/mysql-test/main/opt_trace.test
+++ b/mysql-test/main/opt_trace.test
@@ -1,7 +1,5 @@
 --source include/not_embedded.inc
 --source include/have_sequence.inc
-# View protocol changes some plans
---source include/no_view_protocol.inc
 
 SELECT table_name, column_name FROM information_schema.columns where table_name="OPTIMIZER_TRACE";
 set optimizer_trace="enabled=on";
@@ -83,7 +81,9 @@ analyze table t1;
 analyze table t2;
 
 explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b;
+--disable_view_protocol
 select * from information_schema.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1,t2,t0;
 
 --echo #
@@ -94,7 +94,9 @@ insert into t1 select seq, mod(seq,4)+1 from seq_1_to_65536;
 
 analyze table t1;
 EXPLAIN SELECT DISTINCT a FROM t1;
+--disable_view_protocol
 select * from information_schema.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 
 --echo # 
@@ -104,8 +106,10 @@ CREATE TABLE t1 (a INT, b INT, c int, d int,  KEY(a,b,c,d));
 INSERT INTO t1 VALUES (1,1,1,1), (2,2,2,2), (3,3,3,3), (4,4,4,4), (1,0,1,1), (3,2,3,3), (4,5,4,4);
 ANALYZE TABLE t1;
 EXPLAIN SELECT MIN(d) FROM t1 where b=2 and c=3  group by a;
+--disable_view_protocol
 set statement optimizer_scan_setup_cost=0 for EXPLAIN SELECT MIN(d) FROM t1 where b=2 and c=3  group by a;
 select * from information_schema.OPTIMIZER_TRACE;
+--enable_view_protocol
 DROP TABLE t1;
 
 CREATE TABLE t1 (id INT NOT NULL, a DATE, KEY(id,a));
@@ -119,9 +123,13 @@ INSERT INTO t1 values (1,'2001-01-01'),(1,'2001-01-02'),
  (4,'2001-01-03'),(4,'2001-01-04');
 set optimizer_trace='enabled=on';
 EXPLAIN SELECT id,MIN(a),MAX(a) FROM t1 WHERE a>=20010104e0 GROUP BY id;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 EXPLAIN SELECT * FROM t1 WHERE a = 20010104e0 GROUP BY id;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 
 --echo #
@@ -147,7 +155,9 @@ explain  select * from t1 where a=1 and b=2 order by c limit 1;
 update t1 set b=2 where pk between 20 and 40;
 set optimizer_trace='enabled=on';
 explain  select * from t1 where a=1 and b=2 order by c limit 1;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 
 --echo #
@@ -173,15 +183,21 @@ analyze table t3;
 --echo # table t2 should be eliminated
 explain
 select t1.a from t1 left join t2 on t1.a=t2.a;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 
 --echo # no tables should be eliminated
 explain select * from t1 left join t2 on t2.a=t1.a;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 
 --echo # multiple tables are eliminated
 explain select t1.a from t1 left join (t2 join t3 on t2.b=t3.b) on t2.a=t1.a and t3.a=t1.a;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t0, t1, t2, t3;
 
 --echo #
@@ -195,10 +211,12 @@ create table t2 (p int, a int);
 insert into t2 select seq,seq from seq_1_to_10;
 
 set optimizer_trace='enabled=on';
+--disable_view_protocol
 explain extended select * from t1 where a in (select p from t2);
 insert into t2 select seq,seq from seq_10_to_100;
 explain extended select * from t1 where a in (select p from t2);
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1,t2;
 
 --echo #
@@ -221,7 +239,9 @@ set @@optimizer_use_condition_selectivity=4;
 set @@use_stat_tables= PREFERABLY;
 set optimizer_trace='enabled=on';
 explain select * from t1 where pk = 2 and a=5 and b=1;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 set @@optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
 set @@use_stat_tables= @save_use_stat_tables;
 drop table t1;
@@ -300,7 +320,9 @@ alter table t0 add key(a);
 
 set optimizer_trace=1;
 explain delete from t0 where t0.a<3;
+--disable_view_protocol
 select * from information_schema.optimizer_trace;
+--enable_view_protocol
 drop table ten,t0;
 set optimizer_trace='enabled=off';
 
@@ -317,7 +339,9 @@ alter table t0 add key(a);
 create table t1 like t0;
 insert into t1 select * from t0;
 explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3;
+--disable_view_protocol
 select * from information_schema.optimizer_trace;
+--enable_view_protocol
 drop table ten,t0,t1;
 set optimizer_trace='enabled=off';
 
@@ -329,7 +353,9 @@ set optimizer_trace=1;
 create table t1 (a int);
 insert into t1 values (1),(2),(3);
 explain select * from (select rand() from t1)q;
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 set optimizer_trace='enabled=off';
 
@@ -344,6 +370,7 @@ create table t2(a int);
 insert into t2 values (1),(2),(3),(1),(2),(3),(1),(2),(3);
 set @save_optimizer_switch= @@optimizer_switch;
 explain select * from t1 where a in (select t_inner_1.a from t1 t_inner_1, t1 t_inner_2);
+--disable_view_protocol
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 
 --echo # with Firstmatch, mostly for tracing fix_semijoin_strategies_for_picked_join_order
@@ -356,6 +383,7 @@ set optimizer_switch='materialization=on';
 explain select * from t1 t_outer_1,t2 t_outer_2  where t_outer_1.a in (select t_inner_1.a from t2 t_inner_2, t1 t_inner_1) and
                                                  t_outer_2.a in (select t_inner_3.a from t2 t_inner_3, t1 t_inner_4);
 select * from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 set @@optimizer_switch= @save_optimizer_switch;
 drop table t1,t2;
 
@@ -384,11 +412,14 @@ create table t1 ( a int, b int, key a_b(a,b));
 insert into t1 select a,a from one_k;
 set optimizer_trace='enabled=on';
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 explain select * from t1 force index (a_b) where a=2 and b=4;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 
 explain select * from t1 where a >= 900 and b between 10 and 20;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 
 drop table t0,t1;
 
@@ -397,7 +428,10 @@ create table t1 (start_date date, end_date date, filler char(100), key(start_dat
 insert into t1 select date_add(now(), interval a day), date_add(now(), interval (a+7) day), 'data' from one_k;
 --enable_warnings
 explain select * from t1 force index(start_date) where start_date >= '2019-02-10' and end_date <'2019-04-01';
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1,one_k;
 
 create table ten(a int);
@@ -412,7 +446,10 @@ create table t1 (
 
 insert into t1 select a,a, a,a from ten;
 explain select * from t1 force index(a_b_c) where a between 1 and 4 and b < 50;
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table ten,t1;
 
 --echo # Ported test from MYSQL for ranges involving Binary column
@@ -421,11 +458,14 @@ CREATE TABLE t1(i INT PRIMARY KEY, b BINARY(16), INDEX i_b(b));
 INSERT INTO t1 VALUES (1, x'D95B94336A9946A39CF5B58CFE772D8C');
 INSERT INTO t1 VALUES (2, NULL);
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 EXPLAIN SELECT * FROM t1 WHERE b IN (0xD95B94336A9946A39CF5B58CFE772D8C);
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 
 EXPLAIN SELECT * FROM t1 WHERE b IS NULL;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 
 drop table t1;
 
@@ -438,6 +478,8 @@ INSERT INTO t1 VALUES (1, 'ab\n');
 INSERT INTO t1 VALUES (2, NULL);
 set optimizer_trace=1;
 EXPLAIN SELECT * FROM t1 WHERE b='ab\n';
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 
 ALTER TABLE t1 modify column b BINARY(10) AFTER i;
@@ -481,6 +523,7 @@ insert into t1 select date_add(now(), interval a day), date_add(now(), interval
 --enable_warnings
 explain format=json select * from t1 force index(start_date) where start_date >= '2019-02-10' and end_date <'2019-04-01';
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1, t0, one_k;
 
 --echo #
@@ -512,13 +555,19 @@ set optimizer_trace=1;
 --echo #   but for joins using condition selectivity it is not as trivial. So,
 --echo #   now we are printing it)
 explain select * from t0 A, one_k B where A.a<5 and B.a<800;
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 
 set join_cache_level=@tmp_jcl;
 
 --echo # This shows post-join selectivity
 explain select * from t0 A, one_k B where A.a=B.b and B.a<800;
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t0, one_k;
 
 --echo #
@@ -530,7 +579,10 @@ insert into t1 values ('foo'), ('bar');
 
 EXPLAIN SELECT * FROM t1 WHERE a= REPEAT('a', 0);
 SELECT * FROM t1 WHERE a= REPEAT('a', 0);
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 DROP TABLE t1;
 
 --echo #
@@ -548,7 +600,10 @@ insert into t3 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 explain 
 select * from t3 where (a,a) in (select t1.a, t2.a from t1, t2 where t1.b=t2.b);
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.semijoin_table_pullout')) from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 
 drop table t1,t2,t3;
 
@@ -560,7 +615,10 @@ create table t1 (kp1 int, kp2 int, key(kp1, kp2));
 insert into t1 values (1,1),(1,5),(5,1),(5,5);
 set optimizer_trace=1;
 select * from t1 force index(kp1) where (kp1=2 and kp2 >=4);
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.range_scan_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 
 --echo #
@@ -574,7 +632,10 @@ INSERT INTO t2 SELECT seq, seq from seq_1_to_100;
 
 SET OPTIMIZER_TRACE=1;
 EXPLAIN SELECT * FROM t1, t2 WHERE t1.a=t2.a ORDER BY t2.b;
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.considered_execution_plans')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 DROP TABLE t1,t2;
 
 --echo #
@@ -586,12 +647,15 @@ CREATE TABLE t1(a INT, b INT);
 INSERT INTO t1 SELECT seq, seq from seq_1_to_100;
 SET optimizer_trace=1;
 ANALYZE TABLE t1 PERSISTENT FOR ALL;
+#Enable after fix MDEV-32034
+--disable_view_protocol
 EXPLAIN EXTENDED SELECT * from t1 WHERE a between 1 and 5 and b <= 5;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 EXPLAIN EXTENDED SELECT * from t1 WHERE a != 5;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
 EXPLAIN EXTENDED SELECT * from t1 WHERE b >= 10 and b < 25;
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.selectivity_for_columns')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 
 --echo #
@@ -603,7 +667,10 @@ CREATE TABLE t1( a INT, b INT, PRIMARY KEY( a ) );
 insert t1 values (2,3);
 SELECT sum(b), row_number() OVER (order by b) FROM t1 WHERE a = 101;
 UPDATE t1 SET b=10 WHERE a=1;
+#Enable after fix MDEV-32034
+--disable_view_protocol
 SELECT JSON_DETAILED(JSON_EXTRACT(trace, '$**.range_scan_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 DROP TABLE t1;
 
 set optimizer_trace='enabled=off';
@@ -664,10 +731,13 @@ where
   c5 in (1,2,3,4,5,6,7,8,9,10) and
   c6 in (1,2,3,4);
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select
   json_detailed(json_extract(trace, '$**.setup_range_conditions'))
 from
   information_schema.optimizer_trace;
+--enable_view_protocol
 
 drop table t1;
 
@@ -681,7 +751,9 @@ CREATE TABLE t (a int, b int);
 CREATE VIEW v AS SELECT 1 AS c UNION SELECT 2 AS c;
 INSERT INTO t VALUES (0,4),(5,6);
 UPDATE t, v SET t.b = t.a, t.a = v.c WHERE v.c < t.a;
+--disable_view_protocol
 SELECT * FROM information_schema.optimizer_trace;
+--enable_view_protocol
 
 SELECT * FROM t;
 
@@ -745,11 +817,6 @@ select * from
                from t10 left join t11 on t11.col1=t10.col1
                group by grp_id) T on T.grp_id=t1.b;
 
-# Not sure how MDEV-27871 is related but this test uses this reason
-# all over the place:
-#enable after fix MDEV-27871
---disable_view_protocol
-
 # Enable after fix MDEV-31408
 # On the first creation of the view from information_schema.optimizer_trace
 # everything is fine, but on the second creation of the view is
@@ -779,11 +846,14 @@ set optimizer_trace=DEFAULT;
 --echo # MDEV-29179 Condition pushdown from HAVING into WHERE is not shown in optimizer trace
 --echo #
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 CREATE TABLE t1 (a INT, b VARCHAR(1), KEY (a), KEY(b,a)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES (4,'n'),(1,'h'),(NULL,'w');
 SET optimizer_trace= 'enabled=on';
 SELECT b, a FROM t1 WHERE b <> 'p' OR a = 4 GROUP BY b, a HAVING a <= 7; SELECT json_detailed(json_extract(trace, '$**.steps[*].join_optimization.steps[*].condition_pushdown_from_having') ) exp1, JSON_VALID(trace) exp2 FROM information_schema.optimizer_trace;
 DROP TABLE t1;
+--enable_view_protocol
 
 --echo #
 --echo # End of 10.4 tests
@@ -818,11 +888,11 @@ insert into t3 select a,a from t0;
 explain
 select * from t1 left join (t2 join t3 on t3.pk=1000) on t2.a=t1.a and t2.pk is null;
 
-#enable after fix MDEV-27871
+#Enable after fix MDEV-32034
 --disable_view_protocol
-select JSON_DETAILED(JSON_EXTRACT(trace, '$**.mark_join_nest_as_const'))
+select JSON_DETAILED(JSON_EXTRACT(trace, '$**.mark_join_nest_as_const')) as jd
 from information_schema.optimizer_trace;
---enable_view_protocol
+--disable_view_protocol
 
 drop table t0, t1, t2, t3;
 
@@ -830,8 +900,6 @@ drop table t0, t1, t2, t3;
 --echo # MDEV-23767: IN-to-subquery conversion is not visible in optimizer trace
 --echo #
 
-#enable after fix MDEV-27871
---disable_view_protocol
 create table t0 (a int);
 INSERT INTO t0 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
@@ -840,21 +908,30 @@ set in_predicate_conversion_threshold=3;
 
 explain select * from t0 where a in (1,2,3,4,5,6);
 
-select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion')) as jd
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 explain select * from t0 where a in (1,2,3,4,5,a+1);
 
-select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion')) as jd
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 explain select * from t0 where a in ('1','2','3','4','5','6');
-select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion'))
+
+#Enable after fix MDEV-32034
+--disable_view_protocol
+select json_detailed(json_extract(trace, '$**.in_to_subquery_conversion')) as jd
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 set in_predicate_conversion_threshold=@tmp;
 drop table t0;
---enable_view_protocol
 
 --echo #
 --echo # MDEV-29298: INSERT ... SELECT Does not produce an optimizer trace
@@ -866,10 +943,47 @@ set optimizer_trace=1;
 
 insert into t2 select * from t1 where a<= b and a>4;
 
+--disable_view_protocol
 select QUERY, LENGTH(trace)>1 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 drop table t1, t2;
 
+--echo #
+--echo # MDEV-34305 Redundant truncation errors/warnings with optimizer_trace enabled
+--echo #
+
+SET @@optimizer_trace='enabled=on';
+
+CREATE TABLE t1 (
+  a CHAR(2) NOT NULL PRIMARY KEY,
+  b VARCHAR(20) NOT NULL,
+  KEY (b)
+) CHARSET=utf8mb4;
+
+CREATE TABLE t2 (
+  a CHAR(2) NOT NULL PRIMARY KEY,
+  b VARCHAR(20) NOT NULL,
+  KEY (b)
+) CHARSET=utf8mb4;
+
+INSERT INTO t1 VALUES
+('AB','MySQLAB'),
+('JA','Sun Microsystems'),
+('MS','Microsoft'),
+('IB','IBM- Inc.'),
+('GO','Google Inc.');
+
+INSERT IGNORE INTO t2 VALUES
+('AB','Sweden'),
+('JA','USA'),
+('MS','United States'),
+('IB','North America'),
+('GO','South America');
+
+UPDATE t1,t2 SET t1.b=UPPER(t1.b) WHERE t1.b LIKE 'Unknown%';
+DROP TABLE t1, t2;
+
 --echo #
 --echo # End of 10.5 tests
 --echo #
@@ -922,10 +1036,13 @@ where a=3
 group by b,b
 having a+b < 10;
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select
   json_detailed(json_extract(trace, '$**.substitute_best_equal'))
 from
   information_schema.optimizer_trace;
+--enable_view_protocol
 
 --echo # Check ON expression
 explain 
@@ -935,10 +1052,13 @@ from t1 left join t2 on t2.a=t1.a and t2.a<3
 where 
   t1.b > 5555;
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select
   json_detailed(json_extract(trace, '$**.substitute_best_equal'))
 from
   information_schema.optimizer_trace;
+--enable_view_protocol
 
 --echo # Check nested ON expression
 explain 
@@ -948,6 +1068,7 @@ from t1 left join (t2,t3) on t2.a=t1.a and t3.a=t2.a and t3.a + t2.a <1000
 where 
   t1.b > 5555;
 
+#Check after fix MDEV-32034
 --disable_view_protocol
 select
   json_detailed(json_extract(trace, '$**.substitute_best_equal'))
@@ -957,10 +1078,13 @@ from
 
 --echo # The next query is test for:
 --echo # MDEV-23646: Optimizer trace: optimize_cond() should show ON expression processing
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select
   json_detailed(json_extract(trace, '$**.condition_processing'))
 from
   information_schema.optimizer_trace;
+--enable_view_protocol
 
 drop table t1,t2,t3;
 
@@ -1000,6 +1124,7 @@ where t1.b < 3;
 # Just show that choose_best_splitting function has coverage in the 
 # optimizer trace and re-optmization of child select inside it is distinct 
 # from the rest of join optimization.
+#Check after fix MDEV-32034
 --disable_view_protocol
 select
   json_detailed(json_extract(trace, '$**.choose_best_splitting')) 
@@ -1023,8 +1148,12 @@ SELECT * FROM t1 WHERE id IN
          JSON_TABLE(f1, "$" COLUMNS (jf FOR ORDINALITY)) AS tbl);
 --enable_view_protocol
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select json_detailed(json_extract(trace, '$**.best_join_order'))
     from information_schema.OPTIMIZER_TRACE;
+--enable_view_protocol
+
 DROP TABLE t1;
 
 --echo #
diff --git a/mysql-test/main/opt_trace_index_merge.test b/mysql-test/main/opt_trace_index_merge.test
index 1181aaa3db1..3652e2cfc12 100644
--- a/mysql-test/main/opt_trace_index_merge.test
+++ b/mysql-test/main/opt_trace_index_merge.test
@@ -15,7 +15,9 @@ from t0 A, t0 B, t0 C;
 
 --echo This should use union:
 explain select * from t1 where a=1 or b=1;
+--disable_view_protocol
 select * from information_schema.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t0,t1;
 set optimizer_trace="enabled=off";
 set @@optimizer_switch= @tmp_opt_switch;
diff --git a/mysql-test/main/opt_trace_index_merge_innodb.test b/mysql-test/main/opt_trace_index_merge_innodb.test
index 42d8c57144c..3b8e60f687e 100644
--- a/mysql-test/main/opt_trace_index_merge_innodb.test
+++ b/mysql-test/main/opt_trace_index_merge_innodb.test
@@ -33,7 +33,9 @@ set optimizer_trace="enabled=on";
 set @tmp_index_merge_ror_cpk=@@optimizer_switch;
 set optimizer_switch='extended_keys=off';
 explain select * from t1 where pk1 != 0  and key1 = 1;
+--disable_view_protocol
 select * from information_schema.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
 set @@optimizer_switch= @tmp_index_merge_ror_cpk;
 
diff --git a/mysql-test/main/opt_trace_ucs2.test b/mysql-test/main/opt_trace_ucs2.test
index f636215bd0a..7a26eefc4d6 100644
--- a/mysql-test/main/opt_trace_ucs2.test
+++ b/mysql-test/main/opt_trace_ucs2.test
@@ -7,5 +7,8 @@ insert into t1 values ('a', 'a');
 set optimizer_trace=1;
 --source include/explain-no-costs.inc
 explain format=json select * from t1 force index(col1) where col1 >='a';
+# Enable after fix MDEV-31408
+--disable_view_protocol
 select JSON_DETAILED(JSON_EXTRACT(trace, '$**.analyzing_range_alternatives')) AS JS from INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+--enable_view_protocol
 drop table t1;
diff --git a/mysql-test/main/order_by.result b/mysql-test/main/order_by.result
index 8554718deee..5927ff25d16 100644
--- a/mysql-test/main/order_by.result
+++ b/mysql-test/main/order_by.result
@@ -1538,9 +1538,9 @@ INSERT INTO t1 (a) VALUES (1), (2);
 INSERT INTO t2 (a,b) VALUES (1,2), (2,3);
 INSERT INTO t3 (c) VALUES (1), (2);
 SELECT
-(SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a)
+(SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a) as exp
 FROM t3;
-(SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a)
+exp
 2
 NULL
 DROP TABLE t1, t2, t3;
diff --git a/mysql-test/main/order_by.test b/mysql-test/main/order_by.test
index 605d701b5de..6a499c421a5 100644
--- a/mysql-test/main/order_by.test
+++ b/mysql-test/main/order_by.test
@@ -3,11 +3,6 @@
 # Testing ORDER BY
 #
 
-# Tests will be skipped for the view protocol because the view protocol creates 
-# an additional util connection and other statistics data
-# Check after fix MDEV-27871, possible this include can be removed
---source include/no_view_protocol.inc
-
 call mtr.add_suppression("Sort aborted.*");
 --source include/have_sequence.inc
 call mtr.add_suppression("Out of sort memory; increase server sort buffer size");
@@ -829,6 +824,7 @@ INSERT INTO t1 SELECT a +64, b +64 FROM t1;
 
 EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (a, ab) GROUP BY a;
 
+--disable_view_protocol
 --disable_query_log
 --let $q = `show status like 'Created_tmp_tables';`
 eval set @tmp_tables_before = 
@@ -847,6 +843,7 @@ eval set @tmp_tables_after =
 --enable_query_log
 
 SELECT @tmp_tables_after = @tmp_tables_before ;
+--enable_view_protocol
 
 EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (a, ab) ORDER BY a;
 
@@ -893,7 +890,7 @@ INSERT INTO t2 (a,b) VALUES (1,2), (2,3);
 INSERT INTO t3 (c) VALUES (1), (2);
 
 SELECT
-  (SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a)
+  (SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a) as exp
   FROM t3;
 
 DROP TABLE t1, t2, t3;
@@ -1467,6 +1464,7 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2, f0 LIMIT 0;
 SELECT * FROM t1 WHERE f1>10 ORDER BY f2, f0 LIMIT 10 OFFSET 10;
 SELECT * FROM t1 WHERE f1>10 ORDER BY f2, f0 LIMIT 0 OFFSET 10;
 
+--disable_view_protocol
 --disable_ps2_protocol
 ################
 ## Test with SQL_CALC_FOUND_ROWS
@@ -1515,6 +1513,7 @@ WHERE t1.f2>20
 ORDER BY tmp.f1, f0 LIMIT 30 OFFSET 30;
 SELECT FOUND_ROWS();
 --enable_ps2_protocol
+--enable_view_protocol
 
 ################
 ## Test views
@@ -1888,6 +1887,7 @@ insert into t1
 analyze table t1;
 --enable_result_log
 
+--disable_view_protocol
 --disable_ps2_protocol
 explain
 select b, count(*) num_cnt from t1
@@ -1909,6 +1909,7 @@ select b, count(*) num_cnt from t1
 --enable_result_log
 show status like '%Handler_read%';
 --enable_ps2_protocol
+--enable_view_protocol
 
 drop table t0, t1;
 
@@ -2007,9 +2008,11 @@ WHERE f1 = ANY ( SELECT f1
                  WHERE t3a.f3 < f1 OR t3b.f3 != f1 )
 ORDER BY field;
 
+--disable_view_protocol
 eval $q1;
 eval $q2;
 eval EXPLAIN EXTENDED $q2;
+--enable_view_protocol
 
 DROP TABLE t1,t2,t3;
 
diff --git a/mysql-test/main/order_by_pack_big.result b/mysql-test/main/order_by_pack_big.result
index 58b3e789025..8e320998a82 100644
--- a/mysql-test/main/order_by_pack_big.result
+++ b/mysql-test/main/order_by_pack_big.result
@@ -84,7 +84,7 @@ select id, generate_random_string(a), generate_random_string(b) from t2;
 set sort_buffer_size=262144*10;
 analyze format=json select id DIV 100 as x,
 MD5(group_concat(substring(names,1,3), substring(address,1,3)
-order by id))
+order by id)) as md5
 FROM t3
 GROUP BY x;
 ANALYZE
@@ -133,11 +133,10 @@ ANALYZE
 flush status;
 select id DIV 100 as x,
 MD5(group_concat(substring(names,1,3), substring(address,1,3)
-order by id))
+order by id)) as md5
 FROM t3
 GROUP BY x;
-x	MD5(group_concat(substring(names,1,3), substring(address,1,3)
-order by id))
+x	md5
 0	3d24cb0237caf81aa74a2dddf367ac23
 1	618f9b8b6cefaa268dcb5477eece5e90
 2	fbfe93cc7713f852852f66e578d999aa
@@ -253,7 +252,7 @@ set sort_buffer_size=default;
 set sort_buffer_size=32768;
 analyze format=json select id DIV 100 as x,
 MD5(group_concat(substring(names,1,3), substring(address,1,3)
-order by id))
+order by id)) as md5
 FROM t3
 GROUP BY x;
 ANALYZE
@@ -303,11 +302,10 @@ ANALYZE
 flush status;
 select id DIV 100 as x,
 MD5(group_concat(substring(names,1,3), substring(address,1,3)
-order by id))
+order by id)) as md5
 FROM t3
 GROUP BY x;
-x	MD5(group_concat(substring(names,1,3), substring(address,1,3)
-order by id))
+x	md5
 0	3d24cb0237caf81aa74a2dddf367ac23
 1	618f9b8b6cefaa268dcb5477eece5e90
 2	fbfe93cc7713f852852f66e578d999aa
diff --git a/mysql-test/main/order_by_pack_big.test b/mysql-test/main/order_by_pack_big.test
index ec8e0c12c54..b83a5416e91 100644
--- a/mysql-test/main/order_by_pack_big.test
+++ b/mysql-test/main/order_by_pack_big.test
@@ -100,7 +100,7 @@ select id, generate_random_string(a), generate_random_string(b) from t2;
 
 let $query= select id DIV 100 as x,
             MD5(group_concat(substring(names,1,3), substring(address,1,3)
-                order by id))
+                order by id)) as md5
             FROM t3
             GROUP BY x;
 
@@ -112,12 +112,9 @@ set sort_buffer_size=262144*10;
 --source include/analyze-format.inc
 eval analyze format=json $query;
 flush status;
-# Enable view-protocol after fix MDEV-27871
---disable_view_protocol
 --disable_ps2_protocol
 eval $query;
 --enable_ps2_protocol
---enable_view_protocol
 show status like '%sort%';
 set sort_buffer_size=default;
 
@@ -129,12 +126,9 @@ set sort_buffer_size=32768;
 --source include/analyze-format.inc
 eval analyze format=json $query;
 flush status;
-# Enable view-protocol after fix MDEV-27871
---disable_view_protocol
 --disable_ps2_protocol
 eval $query;
 --enable_ps2_protocol
---enable_view_protocol
 show status like '%sort%';
 set sort_buffer_size=default;
 
diff --git a/mysql-test/main/parser.result b/mysql-test/main/parser.result
index b10af81a42f..e09947af118 100644
--- a/mysql-test/main/parser.result
+++ b/mysql-test/main/parser.result
@@ -556,8 +556,8 @@ DROP TABLE IF EXISTS t1;
 SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE;
 STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE
 22:10:00
-SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE;
-STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE
+SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE as time;
+time
 22:01:00
 SELECT "1997-12-31 23:59:59" + INTERVAL 1 SECOND;
 "1997-12-31 23:59:59" + INTERVAL 1 SECOND
@@ -1082,35 +1082,35 @@ DROP TABLE t1;
 # Subquery, one row, ROLLUP
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (10);
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL);
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL) as exp;
+exp
 NULL
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL);
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL) as exp;
+exp
 10
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+exp
 10
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-(SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+exp
 10
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-(SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+exp
 10
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL) FROM t1;
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL) as exp FROM t1;
+exp
 NULL
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL) FROM t1;
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL) as exp FROM t1;
+exp
 10
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+exp
 10
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-(SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+exp
 10
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-(SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+exp
 10
 SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP);
 ERROR 21000: Subquery returns more than 1 row
@@ -1140,27 +1140,27 @@ DROP TABLE t1;
 # Subquery, multiple rows, ROLLUP
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (10),(20),(30);
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+exp
 10
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-(SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+exp
 10
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-(SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+exp
 10
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-(SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+exp
 10
 10
 10
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-(SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+exp
 10
 10
 10
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-(SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1)
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+exp
 10
 10
 10
@@ -1814,12 +1814,8 @@ SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
 (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
 (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
 1
-)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
-(SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
-(SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
-(SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
-(SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
-(SELECT
+))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) as exp;
+exp
 1
 #
 # MDEV-17693 Shift/reduce conflicts for NAMES,ROLE,PASSWORD in the option_value_no_option_type grammar
diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test
index dcad30b36b8..09ca6e292a1 100644
--- a/mysql-test/main/parser.test
+++ b/mysql-test/main/parser.test
@@ -694,10 +694,7 @@ DROP TABLE IF EXISTS t1;
 
 SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE;
 
-#enable view protocol after fix MDEV-27871 
---disable_view_protocol
-SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE;
---enable_view_protocol
+SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE as time;
 
 SELECT "1997-12-31 23:59:59" + INTERVAL 1 SECOND;
 SELECT 1 + INTERVAL(1,0,1,2) + 1;
@@ -1191,22 +1188,16 @@ DROP TABLE t1;
 
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (10);
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL);
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL);
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-#enable view protocol after fix MDEV-27871 
---disable_view_protocol
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
---enable_view_protocol
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL) FROM t1;
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL) FROM t1;
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-#enable view protocol after fix MDEV-27871 
---disable_view_protocol
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
---enable_view_protocol
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL) as exp;
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL) as exp;
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NULL) as exp FROM t1;
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP HAVING a IS NOT NULL) as exp FROM t1;
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
 
 --error ER_SUBQUERY_NO_1_ROW
 SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP);
@@ -1240,18 +1231,12 @@ DROP TABLE t1;
 
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (10),(20),(30);
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
-#enable view protocol after fix MDEV-27871 
---disable_view_protocol
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1);
---enable_view_protocol
-SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
-#enable view protocol after fix MDEV-27871 
---disable_view_protocol
-SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) FROM t1;
---enable_view_protocol
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp;
+SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+SELECT (SELECT GROUP_CONCAT(a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
+SELECT (SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1) as exp FROM t1;
 
 --error ER_SUBQUERY_NO_1_ROW
 SELECT (SELECT * FROM t1 GROUP BY a WITH ROLLUP);
@@ -1573,8 +1558,6 @@ DROP PROCEDURE p1;
 --echo # MDEV-16697: Fix difference between 32bit/windows and 64bit
 --echo # systems in allowed select nest level
 --echo #
-#enable view protocol after fix MDEV-27871 
---disable_view_protocol
  SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
 (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
 (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
@@ -1584,8 +1567,7 @@ DROP PROCEDURE p1;
 (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
 (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT (SELECT
 1
-)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))));
---enable_view_protocol
+))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) as exp;
 
 --echo #
 --echo # MDEV-17693 Shift/reduce conflicts for NAMES,ROLE,PASSWORD in the option_value_no_option_type grammar
diff --git a/mysql-test/main/perror-win.result b/mysql-test/main/perror-win.result
index a0ea54f9187..696dd47b72d 100644
--- a/mysql-test/main/perror-win.result
+++ b/mysql-test/main/perror-win.result
@@ -3,5 +3,6 @@ Win32 error code 150: System trace information was not specified in your CONFIG.
 OS error code  23:  Too many open files in system
 Win32 error code 23: Data error (cyclic redundancy check).
 MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192T' for key %d
+Learn more: https://mariadb.com/kb/en/e1062/
 Win32 error code 1062: The service has not been started.
 Illegal error code: 30000
diff --git a/mysql-test/main/perror.result b/mysql-test/main/perror.result
index b95b8b8dd99..a6293bda6d8 100644
--- a/mysql-test/main/perror.result
+++ b/mysql-test/main/perror.result
@@ -1,6 +1,10 @@
 Illegal error code: 10000
 MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192T' for key %d
+Learn more: https://mariadb.com/kb/en/e1062/
 MariaDB error code 1408 (ER_STARTUP): %s: ready for connections.
 Version: '%s'  socket: '%s'  port: %d  %s
+Learn more: https://mariadb.com/kb/en/e1408/
 MariaDB error code 1459 (ER_TABLE_NEEDS_UPGRADE): Upgrade required. Please do "REPAIR %s %`s" or dump/reload to fix it!
+Learn more: https://mariadb.com/kb/en/e1459/
 MariaDB error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %u)
+Learn more: https://mariadb.com/kb/en/e1461/
diff --git a/mysql-test/main/ps_mem_leaks.result b/mysql-test/main/ps_mem_leaks.result
index e647c89b740..ebbccb71c6b 100644
--- a/mysql-test/main/ps_mem_leaks.result
+++ b/mysql-test/main/ps_mem_leaks.result
@@ -118,3 +118,33 @@ a
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 # End of 10.6 tests
+#
+# MDEV-34447: Memory leakage is detected on running the test main.ps against the server 11.1
+#
+CREATE TABLE t1 (id INT, value INT);
+CREATE TABLE t2 (id INT);
+PREPARE stmt FROM 'UPDATE t1 SET value = (SELECT 1 FROM t2 WHERE id = t1.id)';
+EXECUTE stmt;
+INSERT INTO t1 VALUES (1,10),(2,10),(3,10);
+INSERT INTO t2 VALUES (1),(2);
+EXECUTE stmt;
+SELECT * FROM t1;
+id	value
+1	1
+2	1
+3	NULL
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1, t2;
+# Memory leak also could take place on running the DELETE statement
+# with the LIMIT clause. Check it.
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 (c1) VALUES (1), (2), (3);
+CREATE PROCEDURE p1(p1 INT)
+DELETE FROM t1 LIMIT p1;
+CALL p1(0);
+CALL p1(1);
+CALL p1(2);
+# Clean up
+DROP TABLE t1;
+DROP PROCEDURE p1;
+# End of 10.11 tests
diff --git a/mysql-test/main/ps_mem_leaks.test b/mysql-test/main/ps_mem_leaks.test
index 16a46596c94..75381e13116 100644
--- a/mysql-test/main/ps_mem_leaks.test
+++ b/mysql-test/main/ps_mem_leaks.test
@@ -134,3 +134,36 @@ DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 
 --echo # End of 10.6 tests
+
+--echo #
+--echo # MDEV-34447: Memory leakage is detected on running the test main.ps against the server 11.1
+--echo #
+CREATE TABLE t1 (id INT, value INT);
+CREATE TABLE t2 (id INT);
+
+PREPARE stmt FROM 'UPDATE t1 SET value = (SELECT 1 FROM t2 WHERE id = t1.id)';
+EXECUTE stmt;
+INSERT INTO t1 VALUES (1,10),(2,10),(3,10);
+INSERT INTO t2 VALUES (1),(2);
+EXECUTE stmt;
+SELECT * FROM t1;
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1, t2;
+
+--echo # Memory leak also could take place on running the DELETE statement
+--echo # with the LIMIT clause. Check it.
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 (c1) VALUES (1), (2), (3);
+
+CREATE PROCEDURE p1(p1 INT)
+  DELETE FROM t1 LIMIT p1;
+
+CALL p1(0);
+CALL p1(1);
+CALL p1(2);
+
+--echo # Clean up
+DROP TABLE t1;
+DROP PROCEDURE p1;
+
+--echo # End of 10.11 tests
diff --git a/mysql-test/main/ps_missed_cmds_bin_prot.test b/mysql-test/main/ps_missed_cmds_bin_prot.test
index 954ffb1bd55..4e109c6d775 100644
--- a/mysql-test/main/ps_missed_cmds_bin_prot.test
+++ b/mysql-test/main/ps_missed_cmds_bin_prot.test
@@ -49,7 +49,9 @@ CREATE DATABASE mdev_16708_db;
 USE mdev_16708_db;
 
 --echo # Check that the current database has been changed
+--disable_service_connection
 SELECT DATABASE();
+--enable_service_connection
 
 --echo # Clean up
 USE test;
@@ -84,6 +86,7 @@ DROP TABLE t1;
 --echo # Set up environmentr for the test case
 CREATE TABLE t1 (a INT);
 
+--disable_view_protocol
 BEGIN;
 
 INSERT INTO t1 VALUES (1);
@@ -101,6 +104,7 @@ ROLLBACK TO SAVEPOINT s1;
 SELECT * FROM t1;
 
 RELEASE SAVEPOINT s1;
+--enable_view_protocol
 
 --echo # Clean up
 DROP TABLE t1;
diff --git a/mysql-test/main/range.result b/mysql-test/main/range.result
index e14b78baf32..492c0eeaee8 100644
--- a/mysql-test/main/range.result
+++ b/mysql-test/main/range.result
@@ -1639,13 +1639,13 @@ NULL
 Warnings:
 Warning	1411	Incorrect datetime value: '2007-20-00' for function str_to_date
 Warning	1411	Incorrect datetime value: '2007-20-00' for function str_to_date
-SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
-str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20'
+SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20' as exp;
+exp
 1
 Warnings:
 Warning	1292	Truncated incorrect datetime value: ''
-SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
-str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND ''
+SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '' as exp;
+exp
 NULL
 Warnings:
 Warning	1411	Incorrect datetime value: '2007-20-00' for function str_to_date
diff --git a/mysql-test/main/range.test b/mysql-test/main/range.test
index 28ee8e5cbeb..c5873937c2f 100644
--- a/mysql-test/main/range.test
+++ b/mysql-test/main/range.test
@@ -1272,11 +1272,8 @@ SELECT str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND
        str_to_date('2007-20-00', '%Y-%m-%d') <= '';
 --enable_view_protocol
 
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
-SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
---enable_view_protocol
+SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20' as exp;
+SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '' as exp;
 
 SELECT str_to_date('', '%Y-%m-%d');
 
diff --git a/mysql-test/main/range_mrr_icp.result b/mysql-test/main/range_mrr_icp.result
index a8d547f101d..f17294aea83 100644
--- a/mysql-test/main/range_mrr_icp.result
+++ b/mysql-test/main/range_mrr_icp.result
@@ -1642,13 +1642,13 @@ NULL
 Warnings:
 Warning	1411	Incorrect datetime value: '2007-20-00' for function str_to_date
 Warning	1411	Incorrect datetime value: '2007-20-00' for function str_to_date
-SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
-str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20'
+SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20' as exp;
+exp
 1
 Warnings:
 Warning	1292	Truncated incorrect datetime value: ''
-SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
-str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND ''
+SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '' as exp;
+exp
 NULL
 Warnings:
 Warning	1411	Incorrect datetime value: '2007-20-00' for function str_to_date
diff --git a/mysql-test/main/range_notembedded.test b/mysql-test/main/range_notembedded.test
index 5778cdbd82c..cd19bb98248 100644
--- a/mysql-test/main/range_notembedded.test
+++ b/mysql-test/main/range_notembedded.test
@@ -26,8 +26,11 @@ explain select * from t2 where key1 in (1,2,3) and pk not in (1,2,3);
 
 --echo # This should show only ranges in form "(1) <= (key1) <= (1)"
 --echo #  ranges over "pk" should not be constructed.
+# Enable after fix MDEV-31408
+--disable_view_protocol
 select json_detailed(JSON_EXTRACT(trace, '$**.ranges'))
 from information_schema.optimizer_trace;
+--enable_view_protocol
 set optimizer_trace=@tmp_21958;
 
 drop table t2;
diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result
index 3f4dbd1a257..c5f3bffbe61 100644
--- a/mysql-test/main/rowid_filter_innodb.result
+++ b/mysql-test/main/rowid_filter_innodb.result
@@ -3719,5 +3719,82 @@ count(*)
 SET optimizer_switch=@save_optimizer_switch;
 DROP TABLE t0, t1;
 # End of 10.4 tests
+#
+# MDEV-33875: ORDER BY DESC causes ROWID Filter slowdown
+#
+create table t1  (
+pk int primary key auto_increment,
+a int,
+b int,
+f1 varchar(200),
+f2 varchar(200),
+f3 varchar(200),
+f4 varchar(200),
+f5 varchar(200),
+key(a, pk),
+key(b)
+) engine=innodb;
+insert into t1 (a,b,f1, f2, f3, f4) select
+seq, seq,
+repeat('1-', 100),
+repeat('2-', 100),
+repeat('3-', 100),
+repeat('4-', 100)
+from
+seq_1_to_5000;
+insert into t1 (a,b,f1, f2, f3, f4)select
+30100, 30100,
+'abcd','abcd','abcd','abcd'
+from
+seq_1_to_250;
+insert into t1 (a,b,f1) values ( 110, 100, 12345);
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+# The following must NOT use Rowid Filter:
+analyze format=json select * from t1
+where
+a =30100 and b in (30100,30101,30102)
+order by
+pk desc;
+ANALYZE
+{
+  "query_optimization": {
+    "r_total_time_ms": "REPLACED"
+  },
+  "query_block": {
+    "select_id": 1,
+    "cost": "REPLACED",
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "t1",
+          "access_type": "ref",
+          "possible_keys": ["a", "b"],
+          "key": "a",
+          "key_length": "5",
+          "used_key_parts": ["a"],
+          "ref": ["const"],
+          "loops": 1,
+          "r_loops": 1,
+          "rows": 250,
+          "r_rows": 250,
+          "cost": "REPLACED",
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "r_engine_stats": REPLACED,
+          "filtered": 4.799086094,
+          "r_total_filtered": 100,
+          "attached_condition": "t1.a <=> 30100 and t1.b in (30100,30101,30102)",
+          "r_filtered": 100
+        }
+      }
+    ]
+  }
+}
+drop table t1;
 # End of 10.6 tests
 set global innodb_stats_persistent= @stats.save;
diff --git a/mysql-test/main/rowid_filter_innodb.test b/mysql-test/main/rowid_filter_innodb.test
index d5de649f566..8fea721d2d0 100644
--- a/mysql-test/main/rowid_filter_innodb.test
+++ b/mysql-test/main/rowid_filter_innodb.test
@@ -773,7 +773,49 @@ DROP TABLE t0, t1;
 
 --echo # End of 10.4 tests
 
+--echo #
+--echo # MDEV-33875: ORDER BY DESC causes ROWID Filter slowdown
+--echo #
+create table t1  (
+  pk int primary key auto_increment,
+  a int,
+  b int,
+  f1 varchar(200),
+  f2 varchar(200),
+  f3 varchar(200),
+  f4 varchar(200),
+  f5 varchar(200),
+  key(a, pk),
+  key(b)
+) engine=innodb;
+
+insert into t1 (a,b,f1, f2, f3, f4) select
+  seq, seq,
+  repeat('1-', 100),
+  repeat('2-', 100),
+  repeat('3-', 100),
+  repeat('4-', 100)
+from
+  seq_1_to_5000;
+
+insert into t1 (a,b,f1, f2, f3, f4)select
+  30100, 30100,
+  'abcd','abcd','abcd','abcd'
+from
+  seq_1_to_250;
+insert into t1 (a,b,f1) values ( 110, 100, 12345);
+analyze table t1;
+
+--echo # The following must NOT use Rowid Filter:
+--source include/analyze-format.inc
+analyze format=json select * from t1
+where
+  a =30100 and b in (30100,30101,30102)
+order by
+  pk desc;
+
+drop table t1;
+
 --echo # End of 10.6 tests
 
 set global innodb_stats_persistent= @stats.save;
-
diff --git a/mysql-test/main/rowid_filter_innodb_debug.result b/mysql-test/main/rowid_filter_innodb_debug.result
index 7e5446c9025..760198a3e83 100644
--- a/mysql-test/main/rowid_filter_innodb_debug.result
+++ b/mysql-test/main/rowid_filter_innodb_debug.result
@@ -41,5 +41,23 @@ connection default;
 disconnect con1;
 ERROR 70100: Query execution was interrupted
 set debug_sync='RESET';
+#
+# MDEV-30651: SIGSEGV in st_join_table::save_explain_data and
+#             Assertion `sel->quick' failed in make_range_rowid_filters
+#
+# Reusing table t2 and t3 from previous test
+set debug_sync='in_forced_range_optimize SIGNAL ready1 WAIT_FOR go1';
+explain
+select straight_join * from t2, t3
+where
+t3.key1=t2.a and t3.key2 between 2 and 10;
+connect  con1, localhost, root,,;
+set debug_sync='now WAIT_FOR ready1';
+kill query $target_id;
+set debug_sync='now SIGNAL go1';
+connection default;
+disconnect con1;
+ERROR 70100: Query execution was interrupted
+set debug_sync='RESET';
 drop table t2,t3;
 set default_storage_engine=default;
diff --git a/mysql-test/main/rowid_filter_myisam.result b/mysql-test/main/rowid_filter_myisam.result
index c79aa635314..0f2ab3edcad 100644
--- a/mysql-test/main/rowid_filter_myisam.result
+++ b/mysql-test/main/rowid_filter_myisam.result
@@ -74,21 +74,24 @@ DROP TABLE t1;
 CREATE TABLE t1 (pk int) engine=myisam ;
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (
-pk int auto_increment PRIMARY KEY,
-i1 int, i2 int, c2 varchar(1),
-KEY (i1), KEY (i2)
+pk int PRIMARY KEY,
+i1 int, i2 int,
+c2 varchar(100),
+KEY (i1),
+KEY (i2)
 ) engine=myisam;
-INSERT INTO t2 VALUES
-(1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'),
-(6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'),
-(11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u');
+insert into t2
+select
+seq, floor(seq/100), floor(seq/100), 'abcd'
+from
+seq_1_to_10000;
 SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3);
 pk
 EXPLAIN EXTENDED
 SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible HAVING
-2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+2	SUBQUERY	t2	index_subquery	i1,i2	i2	5	const	10	0.92	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`pk` AS `pk` from `test`.`t1` having 0
 DROP TABLE t1,t2;
diff --git a/mysql-test/main/rowid_filter_myisam.test b/mysql-test/main/rowid_filter_myisam.test
index 064c8964274..f196bf9d048 100644
--- a/mysql-test/main/rowid_filter_myisam.test
+++ b/mysql-test/main/rowid_filter_myisam.test
@@ -1684,15 +1684,19 @@ CREATE TABLE t1 (pk int) engine=myisam ;
 INSERT INTO t1 VALUES (1),(2);
 
 CREATE TABLE t2 (
-  pk int auto_increment PRIMARY KEY,
-  i1 int, i2 int, c2 varchar(1),
-  KEY (i1), KEY (i2)
+  pk int PRIMARY KEY,
+  i1 int, i2 int,
+  c2 varchar(100),
+  KEY (i1),
+  KEY (i2)
+
 ) engine=myisam;
 
-INSERT INTO t2 VALUES
-  (1,8,6,'t'),(2,5,7,'i'),(3,4,4,'h'),(4,207,38,'d'),(5,183,206,'b'),
-  (6,7,null,'o'),(7,1,2,'j'),(8,17,36,'s'),(9,4,5,'q'),(10,0,6,'l'),
-  (11,1,9,'j'),(12,5,6,'y'),(13,null,0,'i'),(14,7,7,'x'),(15,5,2,'u');
+insert into t2
+select
+  seq, floor(seq/100), floor(seq/100), 'abcd'
+from
+  seq_1_to_10000;
 
 SELECT * FROM t1 HAVING (7, 9) IN (SELECT t2.i1, t2.i2 FROM t2 WHERE t2.i1 = 3);
 EXPLAIN EXTENDED
diff --git a/mysql-test/main/rowid_filter_myisam_debug.result b/mysql-test/main/rowid_filter_myisam_debug.result
index 263a8e9970d..9ce6af9de6c 100644
--- a/mysql-test/main/rowid_filter_myisam_debug.result
+++ b/mysql-test/main/rowid_filter_myisam_debug.result
@@ -40,4 +40,22 @@ connection default;
 disconnect con1;
 ERROR 70100: Query execution was interrupted
 set debug_sync='RESET';
+#
+# MDEV-30651: SIGSEGV in st_join_table::save_explain_data and
+#             Assertion `sel->quick' failed in make_range_rowid_filters
+#
+# Reusing table t2 and t3 from previous test
+set debug_sync='in_forced_range_optimize SIGNAL ready1 WAIT_FOR go1';
+explain
+select straight_join * from t2, t3
+where
+t3.key1=t2.a and t3.key2 between 2 and 10;
+connect  con1, localhost, root,,;
+set debug_sync='now WAIT_FOR ready1';
+kill query $target_id;
+set debug_sync='now SIGNAL go1';
+connection default;
+disconnect con1;
+ERROR 70100: Query execution was interrupted
+set debug_sync='RESET';
 drop table t2,t3;
diff --git a/mysql-test/main/selectivity_notembedded.test b/mysql-test/main/selectivity_notembedded.test
index 30e0b7f0d2f..323e4ca6bd6 100644
--- a/mysql-test/main/selectivity_notembedded.test
+++ b/mysql-test/main/selectivity_notembedded.test
@@ -98,9 +98,12 @@ set @tmp=@@optimizer_trace;
 set optimizer_trace=1;
 explain select * from t10  where a in (91303);
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 --echo # Must have selectivity_from_histogram <= 1.0:
 select json_detailed(json_extract(trace, '$**.selectivity_for_columns')) as sel
 from information_schema.optimizer_trace;
+--enable_view_protocol
 
 set optimizer_trace=@tmp;
 drop table t0,t1,t10;
@@ -169,17 +172,23 @@ while ($i < $N_CONDS) {
 #echo $query_tbl;
 evalp $query_tbl;
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select 
   json_detailed(json_extract(trace,'$**.selectivity_for_columns[0]')) as JS
 from 
  information_schema.optimizer_trace;
 
+--enable_view_protocol
+
 evalp $query_tbl;
+#Enable after fix MDEV-32034
+--disable_view_protocol
 eval select
   json_detailed(json_extract(trace,'\$**.selectivity_for_columns[$N_LAST_COND]')) as JS
 from 
  information_schema.optimizer_trace;
-
+--enable_view_protocol
 
 --echo # 
 --echo # Check if not being able to infer anything for the first MAX_KEY
@@ -200,10 +209,13 @@ let $query_tbl= $query_tbl) and col$N_LAST_COND>1;
 #echo $query_tbl;
 evalp $query_tbl;
 
+#Enable after fix MDEV-32034
+--disable_view_protocol
 select 
   json_detailed(json_extract(trace,'$**.selectivity_for_columns')) as JS
 from 
  information_schema.optimizer_trace;
+--enable_view_protocol
 
 set optimizer_trace=@trace_tmp;
 drop table t1;
diff --git a/mysql-test/main/subselect.test b/mysql-test/main/subselect.test
index 8ab3a3671b2..2bdbb4b334a 100644
--- a/mysql-test/main/subselect.test
+++ b/mysql-test/main/subselect.test
@@ -343,7 +343,10 @@ CREATE TABLE `t1` (
 SELECT (SELECT numeropost FROM t1 HAVING numreponse=a),numreponse FROM (SELECT * FROM t1) as a;
 -- error ER_BAD_FIELD_ERROR
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a;
+#Enable after fix MDEV-31937
+--disable_ps2_protocol
 SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a;
+--enable_ps2_protocol
 INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
 -- error ER_SUBQUERY_NO_1_ROW
 EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1');
@@ -3016,10 +3019,13 @@ SELECT a, AVG(b),
   (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b)) AS test
   FROM t1 WHERE t1.d=0 GROUP BY a;
 
+# Enable after fix MDEV-32038
+--disable_ps2_protocol
 SELECT tt.a,
  (SELECT (SELECT c FROM t1 as t WHERE t1.a=t.a AND t.d=MAX(t1.b + tt.a)
   LIMIT 1) FROM t1 WHERE t1.a=tt.a GROUP BY a LIMIT 1) as test
   FROM t1 as tt;
+--enable_ps2_protocol
 
 SELECT tt.a,
  (SELECT (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.d=MAX(t1.b + tt.a)
diff --git a/mysql-test/main/subselect_innodb.result b/mysql-test/main/subselect_innodb.result
index 94f6223157b..82967bf2aab 100644
--- a/mysql-test/main/subselect_innodb.result
+++ b/mysql-test/main/subselect_innodb.result
@@ -23,8 +23,8 @@ CREATE INDEX CMFLDRPARNT_IDX ON t1 (PARENTID);
 INSERT INTO t1 VALUES("0c9aab05b15048c59bc35c8461507deb", "System", "System", "2003-06-05 16:30:00", "The system content repository folder.", "3", "2003-06-05 16:30:00", "System", "0", NULL, "9c9aab05b15048c59bc35c8461507deb", "1");
 INSERT INTO t1 VALUES("2f6161e879db43c1a5b82c21ddc49089", "Default", "System", "2003-06-09 10:52:02", "The default content repository folder.", "3", "2003-06-05 16:30:00", "System", "0", NULL, "03eea05112b845949f3fd03278b5fe43", "1");
 INSERT INTO t1 VALUES("c373e9f5ad0791724315444553544200", "AddDocumentTest", "admin", "2003-06-09 10:51:25", "Movie Reviews", "0", "2003-06-09 10:51:25", "admin", "0", "2f6161e879db43c1a5b82c21ddc49089", "03eea05112b845949f3fd03278b5fe43", NULL);
-SELECT 'c373e9f5ad0791a0dab5444553544200' IN(SELECT t1.FOLDERID FROM t1 WHERE t1.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t1.FOLDERNAME = 'Level1');
-'c373e9f5ad0791a0dab5444553544200' IN(SELECT t1.FOLDERID FROM t1 WHERE t1.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t1.FOLDERNAME = 'Level1')
+SELECT 'c373e9f5ad0791a0dab5444553544200' IN(SELECT t1.FOLDERID FROM t1 WHERE t1.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t1.FOLDERNAME = 'Level1') as exp;
+exp
 0
 drop table t1;
 create table t1 (a int) engine=innodb;
@@ -60,8 +60,8 @@ FOREIGN KEY (yod_id) REFERENCES t3(yod_id)
 INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t3 VALUES (1,1),(2,2),(3,3);
 INSERT INTO t2 VALUES (1,1),(2,2),(3,3);
-SELECT distinct p1.processor_id, (SELECT y.yod_id FROM t1 p2, t2 y WHERE p2.processor_id = p1.processor_id and p2.processor_id = y.processor_id) FROM t1 p1;
-processor_id	(SELECT y.yod_id FROM t1 p2, t2 y WHERE p2.processor_id = p1.processor_id and p2.processor_id = y.processor_id)
+SELECT distinct p1.processor_id, (SELECT y.yod_id FROM t1 p2, t2 y WHERE p2.processor_id = p1.processor_id and p2.processor_id = y.processor_id) as result FROM t1 p1;
+processor_id	result
 1	1
 2	2
 3	3
@@ -201,15 +201,9 @@ WHERE rs.t1_id=
 (SELECT lt.t1_id
 FROM t1 lt
 WHERE lt.t3_id=a.t3_id)
-ORDER BY b DESC LIMIT 1)
+ORDER BY b DESC LIMIT 1) as exp
 from t3 AS a;
-(SELECT rs.t2_id
-FROM t2 rs
-WHERE rs.t1_id=
-(SELECT lt.t1_id
-FROM t1 lt
-WHERE lt.t3_id=a.t3_id)
-ORDER BY b DESC LIMIT 1)
+exp
 NULL
 DROP PROCEDURE IF EXISTS p1;
 create procedure p1()
@@ -664,15 +658,8 @@ WHERE
 a IS NOT NULL
 GROUP BY
 (SELECT NULL from dual WHERE a = 1)
-);
-1 IN (
-SELECT NULL
-FROM t1
-WHERE
-a IS NOT NULL
-GROUP BY
-(SELECT NULL from dual WHERE a = 1)
-)
+) as exp;
+exp
 0
 drop table t1;
 # Testcase from MDEV-26164
@@ -692,8 +679,8 @@ CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (3),(4);
-SELECT 1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1)));
-1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1)))
+SELECT 1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1))) as exp;
+exp
 1
 drop table t1,t2;
 #
diff --git a/mysql-test/main/subselect_innodb.test b/mysql-test/main/subselect_innodb.test
index 840e0adf723..3620aa57357 100644
--- a/mysql-test/main/subselect_innodb.test
+++ b/mysql-test/main/subselect_innodb.test
@@ -34,10 +34,7 @@ CREATE INDEX CMFLDRPARNT_IDX ON t1 (PARENTID);
 INSERT INTO t1 VALUES("0c9aab05b15048c59bc35c8461507deb", "System", "System", "2003-06-05 16:30:00", "The system content repository folder.", "3", "2003-06-05 16:30:00", "System", "0", NULL, "9c9aab05b15048c59bc35c8461507deb", "1");
 INSERT INTO t1 VALUES("2f6161e879db43c1a5b82c21ddc49089", "Default", "System", "2003-06-09 10:52:02", "The default content repository folder.", "3", "2003-06-05 16:30:00", "System", "0", NULL, "03eea05112b845949f3fd03278b5fe43", "1");
 INSERT INTO t1 VALUES("c373e9f5ad0791724315444553544200", "AddDocumentTest", "admin", "2003-06-09 10:51:25", "Movie Reviews", "0", "2003-06-09 10:51:25", "admin", "0", "2f6161e879db43c1a5b82c21ddc49089", "03eea05112b845949f3fd03278b5fe43", NULL);
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT 'c373e9f5ad0791a0dab5444553544200' IN(SELECT t1.FOLDERID FROM t1 WHERE t1.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t1.FOLDERNAME = 'Level1');
---enable_view_protocol
+SELECT 'c373e9f5ad0791a0dab5444553544200' IN(SELECT t1.FOLDERID FROM t1 WHERE t1.PARENTID='2f6161e879db43c1a5b82c21ddc49089' AND t1.FOLDERNAME = 'Level1') as exp;
 drop table t1;
 
 #
@@ -74,10 +71,7 @@ CREATE TABLE t2 (
 INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t3 VALUES (1,1),(2,2),(3,3);
 INSERT INTO t2 VALUES (1,1),(2,2),(3,3);
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT distinct p1.processor_id, (SELECT y.yod_id FROM t1 p2, t2 y WHERE p2.processor_id = p1.processor_id and p2.processor_id = y.processor_id) FROM t1 p1;
---enable_view_protocol
+SELECT distinct p1.processor_id, (SELECT y.yod_id FROM t1 p2, t2 y WHERE p2.processor_id = p1.processor_id and p2.processor_id = y.processor_id) as result FROM t1 p1;
 drop table t2,t1,t3;
 
 #
@@ -215,8 +209,6 @@ CREATE TABLE `t3` (
   `t3_id` int NOT NULL
 );
 INSERT INTO `t3` VALUES (3);
-#enable after fix MDEV-27871
---disable_view_protocol
 select
   (SELECT rs.t2_id
    FROM t2 rs
@@ -224,9 +216,8 @@ select
      (SELECT lt.t1_id
       FROM t1 lt
       WHERE lt.t3_id=a.t3_id)
-   ORDER BY b DESC LIMIT 1)
+   ORDER BY b DESC LIMIT 1) as exp
 from t3 AS a;
---enable_view_protocol
 # repeat above query in SP
 --disable_warnings
 DROP PROCEDURE IF EXISTS p1;
@@ -655,8 +646,6 @@ set character_set_connection=@save_character_set_connection;
 --echo # MDEV-26047: MariaDB server crash at Item_subselect::init_expr_cache_tracker
 --echo #
 CREATE TABLE t1 (a int) engine=innodb;
-#enable abter fix MDEV-27871
---disable_view_protocol
 SELECT 1 IN (
   SELECT NULL
   FROM t1
@@ -664,8 +653,7 @@ SELECT 1 IN (
     a IS NOT NULL
   GROUP BY
     (SELECT NULL from dual WHERE a = 1)
-);
---enable_view_protocol
+) as exp;
 drop table t1;
 
 --echo # Testcase from MDEV-26164
@@ -687,10 +675,7 @@ CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (3),(4);
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT 1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1)));
---enable_view_protocol
+SELECT 1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1))) as exp;
 drop table t1,t2;
 
 --echo #
diff --git a/mysql-test/main/subselect_mat.result b/mysql-test/main/subselect_mat.result
index 949e002b01d..973ea1c4cde 100644
--- a/mysql-test/main/subselect_mat.result
+++ b/mysql-test/main/subselect_mat.result
@@ -2948,16 +2948,15 @@ INSERT INTO t2 VALUES (1000,6,2);
 set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,in_to_exists=off';
 EXPLAIN
 SELECT (f1, f2, f3) NOT IN
-(SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3)
+(SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3) as exp
 FROM t2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	system	NULL	NULL	NULL	NULL	1	
 2	MATERIALIZED	t1	ALL	NULL	NULL	NULL	NULL	2	Using filesort
 SELECT (f1, f2, f3) NOT IN
-(SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3)
+(SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3) as exp
 FROM t2;
-(f1, f2, f3) NOT IN
-(SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3)
+exp
 1
 drop table t1, t2;
 #
diff --git a/mysql-test/main/subselect_mat.test b/mysql-test/main/subselect_mat.test
index 58548d18caa..7528e930a59 100644
--- a/mysql-test/main/subselect_mat.test
+++ b/mysql-test/main/subselect_mat.test
@@ -193,19 +193,15 @@ INSERT INTO t2 VALUES (1000,6,2);
 
 set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,in_to_exists=off';
 
-#enable after fix MDEV-27871
---disable_view_protocol
 EXPLAIN
 SELECT (f1, f2, f3) NOT IN
-       (SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3)
+       (SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3) as exp
 FROM t2;
 
 SELECT (f1, f2, f3) NOT IN
-       (SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3)
+       (SELECT COUNT(DISTINCT f2), f1, f3 FROM t1 GROUP BY f1, f3) as exp
 FROM t2;
 
---enable_view_protocol
-
 drop table t1, t2;
 
 --echo #
diff --git a/mysql-test/main/temp_table_symlink.test b/mysql-test/main/temp_table_symlink.test
index ea5f1dfa4de..a0be38d9073 100644
--- a/mysql-test/main/temp_table_symlink.test
+++ b/mysql-test/main/temp_table_symlink.test
@@ -23,8 +23,10 @@ error 1,1030;
 create temporary table t2 (a int);
 error 1,1030;
 create temporary table t3 (a int) engine=Aria;
+--disable_view_protocol
 error 1,1030;
 select * from information_schema.columns where table_schema='test';
+--enable_view_protocol
 
 flush tables;
 select * from d1;
diff --git a/mysql-test/main/timezone2.result b/mysql-test/main/timezone2.result
index 795b83b5c1f..369147b41c6 100644
--- a/mysql-test/main/timezone2.result
+++ b/mysql-test/main/timezone2.result
@@ -2,18 +2,18 @@ drop table if exists t1, t2;
 drop function if exists f1;
 create table t1 (ts timestamp);
 set time_zone='+00:00';
-select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
-unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp())
+select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp()) as exp;
+exp
 0
 insert into t1 (ts) values ('2003-03-30 02:30:00');
 set time_zone='+10:30';
-select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
-unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp())
+select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp()) as exp;
+exp
 -37800
 insert into t1 (ts) values ('2003-03-30 02:30:00');
 set time_zone='-10:00';
-select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
-unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp())
+select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp()) as exp;
+exp
 36000
 insert into t1 (ts) values ('2003-03-30 02:30:00');
 select * from t1;
@@ -227,20 +227,20 @@ tz	convert_tz('2003-12-31 00:00:00',tz,'UTC')	convert_tz('2003-12-31 00:00:00','
 MET	2003-12-30 23:00:00	2003-12-31 01:00:00
 UTC	2003-12-31 00:00:00	2003-12-31 00:00:00
 drop table t1;
-select convert_tz('2003-12-31 04:00:00', NULL, 'UTC');
-convert_tz('2003-12-31 04:00:00', NULL, 'UTC')
+select convert_tz('2003-12-31 04:00:00', NULL, 'UTC') as exp;
+exp
 NULL
-select convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC');
-convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC')
+select convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC') as exp;
+exp
 NULL
-select convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone');
-convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone')
+select convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone') as exp;
+exp
 NULL
-select convert_tz('2003-12-31 04:00:00', 'MET', NULL);
-convert_tz('2003-12-31 04:00:00', 'MET', NULL)
+select convert_tz('2003-12-31 04:00:00', 'MET', NULL) as exp;
+exp
 NULL
-select convert_tz( NULL, 'MET', 'UTC');
-convert_tz( NULL, 'MET', 'UTC')
+select convert_tz( NULL, 'MET', 'UTC') as exp;
+exp
 NULL
 create table t1 (ts timestamp);
 set timestamp=1000000000;
@@ -314,8 +314,8 @@ SET timestamp=DEFAULT;
 #
 # MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ
 #
-SELECT CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' );
-CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' )
+SELECT CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' ) as exp;
+exp
 NULL
 #
 # End of 5.3 tests
diff --git a/mysql-test/main/timezone2.test b/mysql-test/main/timezone2.test
index 5a110e7c225..290129ac3ac 100644
--- a/mysql-test/main/timezone2.test
+++ b/mysql-test/main/timezone2.test
@@ -12,26 +12,21 @@ drop function if exists f1;
 #
 create table t1 (ts timestamp);
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 set time_zone='+00:00';
-select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
+select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp()) as exp;
 insert into t1 (ts) values ('2003-03-30 02:30:00');
 
 set time_zone='+10:30';
-select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
+select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp()) as exp;
 insert into t1 (ts) values ('2003-03-30 02:30:00');
 
 set time_zone='-10:00';
-select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
+select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp()) as exp;
 insert into t1 (ts) values ('2003-03-30 02:30:00');
 
 # Here we will get different results
 select * from t1;
 
---enable_view_protocol
-
 drop table t1;
 
 
@@ -190,17 +185,12 @@ insert into t1 (tz) values ('MET'), ('UTC');
 select tz, convert_tz('2003-12-31 00:00:00',tz,'UTC'), convert_tz('2003-12-31 00:00:00','UTC',tz) from t1 order by tz;
 drop table t1;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 # Parameters to CONVERT_TZ() what should give NULL
-select convert_tz('2003-12-31 04:00:00', NULL, 'UTC');
-select convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC');
-select convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone');
-select convert_tz('2003-12-31 04:00:00', 'MET', NULL);
-select convert_tz( NULL, 'MET', 'UTC');
-
---enable_view_protocol
+select convert_tz('2003-12-31 04:00:00', NULL, 'UTC') as exp;
+select convert_tz('2003-12-31 04:00:00', 'SomeNotExistingTimeZone', 'UTC') as exp;
+select convert_tz('2003-12-31 04:00:00', 'MET', 'SomeNotExistingTimeZone') as exp;
+select convert_tz('2003-12-31 04:00:00', 'MET', NULL) as exp;
+select convert_tz( NULL, 'MET', 'UTC') as exp;
 
 #
 # Test for bug #4508 "CONVERT_TZ() function with new time zone as param
@@ -313,12 +303,7 @@ SET timestamp=DEFAULT;
 --echo # MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ
 --echo #
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
-SELECT CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' ); 
-
---enable_view_protocol
+SELECT CONVERT_TZ('2001-10-08 00:00:00', MAKE_SET(0,'+01:00'), '+00:00' ) as exp;
 
 --echo #
 --echo # End of 5.3 tests
diff --git a/mysql-test/main/type_datetime.result b/mysql-test/main/type_datetime.result
index 282ff60f655..a41d121ad76 100644
--- a/mysql-test/main/type_datetime.result
+++ b/mysql-test/main/type_datetime.result
@@ -184,17 +184,17 @@ a
 2006-06-06 15:55:55
 DROP PREPARE s;
 DROP TABLE t1;
-SELECT CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6));
-CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6))
+SELECT CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6)) as exp;
+exp
 20060810.000000
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6));
-CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6))
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6)) as exp;
+exp
 20060810101112.000000
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6));
-CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6))
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6)) as exp;
+exp
 20060810101112.000014
-SELECT CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6));
-CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6))
+SELECT CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6)) as exp;
+exp
 101112.098700
 set @org_mode=@@sql_mode;
 create table t1 (da date default '1962-03-03 23:33:34', dt datetime default '1962-03-03');
@@ -351,26 +351,26 @@ select f1 from t1 where ('1',f1) in (('1','01-01-01'),('1','2001-1-1 0:0:0'),('1
 f1
 2001-01-01
 drop table t1,t2,t3;
-select least(cast('01-01-01' as date), '01-01-02');
-least(cast('01-01-01' as date), '01-01-02')
+select least(cast('01-01-01' as date), '01-01-02') as exp;
+exp
 2001-01-01
-select greatest(cast('01-01-01' as date), '01-01-02');
-greatest(cast('01-01-01' as date), '01-01-02')
+select greatest(cast('01-01-01' as date), '01-01-02') as exp;
+exp
 2001-01-02
-select least(cast('01-01-01' as date), '01-01-02') + 0;
-least(cast('01-01-01' as date), '01-01-02') + 0
+select least(cast('01-01-01' as date), '01-01-02') + 0 as exp;
+exp
 20010101
-select greatest(cast('01-01-01' as date), '01-01-02') + 0;
-greatest(cast('01-01-01' as date), '01-01-02') + 0
+select greatest(cast('01-01-01' as date), '01-01-02') + 0 as exp;
+exp
 20010102
-select least(cast('01-01-01' as datetime), '01-01-02') + 0;
-least(cast('01-01-01' as datetime), '01-01-02') + 0
+select least(cast('01-01-01' as datetime), '01-01-02') + 0 as exp;
+exp
 20010101000000
-select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed);
-cast(least(cast('01-01-01' as datetime), '01-01-02') as signed)
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed) as exp;
+exp
 20010101000000
-select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(16,2));
-cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(16,2))
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(16,2)) as exp;
+exp
 20010101000000.00
 DROP PROCEDURE IF EXISTS test27759 ;
 CREATE PROCEDURE test27759()
@@ -627,21 +627,21 @@ ERROR 42000: Invalid default value for 'da'
 create table t1 (t time default '916:00:00 a');
 ERROR 42000: Invalid default value for 't'
 set @@sql_mode= @org_mode;
-SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
-CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7))
+SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7)) as exp;
+exp
 20060810101112.0123450
 Warnings:
 Note	1292	Truncated incorrect datetime value: '2006-08-10 10:11:12.0123450'
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
-CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7))
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7)) as exp;
+exp
 20060810101112.0123450
 Warnings:
 Note	1292	Truncated incorrect datetime value: '00000002006-000008-0000010 000010:0000011:00000012.0123450'
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7));
-CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7))
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7)) as exp;
+exp
 20060810101112.0123450
-SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7));
-CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7))
+SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7)) as exp;
+exp
 20080729104251.1234560
 Warnings:
 Note	1292	Truncated incorrect datetime value: '2008-07-29T10:42:51.1234567'
@@ -685,8 +685,8 @@ drop table t1,t2;
 #
 # MDEV-4634 Crash in CONVERT_TZ
 #
-SELECT CONVERT_TZ(GREATEST(TIMESTAMP('2021-00-00'),TIMESTAMP('2022-00-00')),'+00:00','+7:5');
-CONVERT_TZ(GREATEST(TIMESTAMP('2021-00-00'),TIMESTAMP('2022-00-00')),'+00:00','+7:5')
+SELECT CONVERT_TZ(GREATEST(TIMESTAMP('2021-00-00'),TIMESTAMP('2022-00-00')),'+00:00','+7:5') as exp;
+exp
 NULL
 Warnings:
 Warning	1292	Incorrect datetime value: '2022-00-00 00:00:00'
@@ -953,8 +953,8 @@ CAST(CAST('00:00:00.000001' AS TIME(6)) AS DATETIME(6))
 SELECT CAST(CAST(TIMESTAMP'0000-00-00 10:20:30' AS TIME) AS DATETIME);
 CAST(CAST(TIMESTAMP'0000-00-00 10:20:30' AS TIME) AS DATETIME)
 0000-00-00 10:20:30
-SELECT CAST(CAST(TIMESTAMP'0000-00-00 00:00:00.000001' AS TIME(6)) AS DATETIME(6));
-CAST(CAST(TIMESTAMP'0000-00-00 00:00:00.000001' AS TIME(6)) AS DATETIME(6))
+SELECT CAST(CAST(TIMESTAMP'0000-00-00 00:00:00.000001' AS TIME(6)) AS DATETIME(6)) as exp;
+exp
 0000-00-00 00:00:00.000001
 SET old_mode=DEFAULT;
 SET sql_mode=DEFAULT;
diff --git a/mysql-test/main/type_datetime.test b/mysql-test/main/type_datetime.test
index 3c46d10718f..c1d45870221 100644
--- a/mysql-test/main/type_datetime.test
+++ b/mysql-test/main/type_datetime.test
@@ -138,13 +138,10 @@ DROP TABLE t1;
 #
 # Bug 19491 (CAST DATE AS DECIMAL returns incorrect result
 #
-SELECT CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6));
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6));
-SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6));
-SELECT CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6));
---disable_view_protocol
+SELECT CAST(CAST('2006-08-10' AS DATE) AS DECIMAL(20,6)) as exp;
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) AS DECIMAL(20,6)) as exp;
+SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME(6)) + INTERVAL 14 MICROSECOND AS DECIMAL(20,6)) as exp;
+SELECT CAST(CAST('10:11:12.098700' AS TIME(6)) AS DECIMAL(20,6)) as exp;
 
 #
 # Test of storing datetime into date fields
@@ -246,16 +243,13 @@ drop table t1,t2,t3;
 #
 # Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
 #
-select least(cast('01-01-01' as date), '01-01-02');
-select greatest(cast('01-01-01' as date), '01-01-02');
-select least(cast('01-01-01' as date), '01-01-02') + 0;
-select greatest(cast('01-01-01' as date), '01-01-02') + 0;
-select least(cast('01-01-01' as datetime), '01-01-02') + 0;
-select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed);
-#enable after fix MDEV-27871
---disable_view_protocol
-select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(16,2));
---enable_view_protocol
+select least(cast('01-01-01' as date), '01-01-02') as exp;
+select greatest(cast('01-01-01' as date), '01-01-02') as exp;
+select least(cast('01-01-01' as date), '01-01-02') + 0 as exp;
+select greatest(cast('01-01-01' as date), '01-01-02') + 0 as exp;
+select least(cast('01-01-01' as datetime), '01-01-02') + 0 as exp;
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as signed) as exp;
+select cast(least(cast('01-01-01' as datetime), '01-01-02') as decimal(16,2)) as exp;
 --disable_warnings
 DROP PROCEDURE IF EXISTS test27759 ;
 --enable_warnings
@@ -447,27 +441,23 @@ create table t1 (da date default '1962-03-32 23:33:34', dt datetime default '196
 create table t1 (t time default '916:00:00 a');
 set @@sql_mode= @org_mode;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 #
 # Bug #42146 - DATETIME fractional seconds parse error
 #
 # show we trucate microseconds from the right -- special case: leftmost is 0
-SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
+SELECT CAST(CAST('2006-08-10 10:11:12.0123450' AS DATETIME(6)) AS DECIMAL(30,7)) as exp;
 
 # show that we ignore leading zeroes for all other fields
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7));
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.0123450' AS DATETIME(6)) AS DECIMAL(30,7)) as exp;
 # once more with feeling (but no warnings)
-SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7));
+SELECT CAST(CAST('00000002006-000008-0000010 000010:0000011:00000012.012345'  AS DATETIME(6)) AS DECIMAL(30,7)) as exp;
 
 
 #
 # Bug #38435 - LONG Microseconds cause MySQL to fail a CAST to DATETIME or DATE
 #
 # show we truncate microseconds from the right
-SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7));
---enable_view_protocol
+SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime(6)) AS DECIMAL(30,7)) as exp;
 
 --echo # 
 --echo # Bug#59173: Failure to handle DATE(TIME) values where Year, Month or
@@ -510,10 +500,7 @@ drop table t1,t2;
 --echo #
 --echo # MDEV-4634 Crash in CONVERT_TZ
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT CONVERT_TZ(GREATEST(TIMESTAMP('2021-00-00'),TIMESTAMP('2022-00-00')),'+00:00','+7:5');
---enable_view_protocol
+SELECT CONVERT_TZ(GREATEST(TIMESTAMP('2021-00-00'),TIMESTAMP('2022-00-00')),'+00:00','+7:5') as exp;
 
 --echo #
 --echo # MDEV-5041 Inserting a TIME with hour>24 into a DATETIME column produces a wrong value
@@ -674,10 +661,7 @@ SELECT CAST(TIME'00:00:00.000001' AS DATETIME(6));
 SELECT CAST(CAST('10:20:30' AS TIME) AS DATETIME);
 SELECT CAST(CAST('00:00:00.000001' AS TIME(6)) AS DATETIME(6));
 SELECT CAST(CAST(TIMESTAMP'0000-00-00 10:20:30' AS TIME) AS DATETIME);
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT CAST(CAST(TIMESTAMP'0000-00-00 00:00:00.000001' AS TIME(6)) AS DATETIME(6));
---enable_view_protocol
+SELECT CAST(CAST(TIMESTAMP'0000-00-00 00:00:00.000001' AS TIME(6)) AS DATETIME(6)) as exp;
 SET old_mode=DEFAULT;
 SET sql_mode=DEFAULT;
 
diff --git a/mysql-test/main/type_float.result b/mysql-test/main/type_float.result
index 877cdec864e..05171375ee6 100644
--- a/mysql-test/main/type_float.result
+++ b/mysql-test/main/type_float.result
@@ -1211,6 +1211,85 @@ DROP VIEW v1;
 # End of 10.4 tests
 #
 #
+# Start of 10.5 tests
+#
+#
+# MDEV-20548 Unexpected error on CREATE..SELECT HEX(num)
+#
+SET sql_mode=STRICT_ALL_TABLES;
+CREATE TABLE t1 AS SELECT HEX(-2e0) AS h;
+SELECT * FROM t1;
+h
+FFFFFFFFFFFFFFFE
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(-1e0) AS h;
+SELECT * FROM t1;
+h
+FFFFFFFFFFFFFFFF
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(1e0) AS h;
+SELECT * FROM t1;
+h
+1
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(2e0) AS h;
+SELECT * FROM t1;
+h
+2
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 (a FLOAT);
+INSERT INTO t1 VALUES (-1e38),(-255),(-2),(-1),(+1),(+2),(255),(1e38);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2 ORDER BY a;
+a	h
+-1e38	FFFFFFFFFFFFFFFF
+-255	FFFFFFFFFFFFFF01
+-2	FFFFFFFFFFFFFFFE
+-1	FFFFFFFFFFFFFFFF
+1	1
+2	2
+255	FF
+1e38	FFFFFFFFFFFFFFFF
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	float	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+CREATE TABLE t1 (a DOUBLE);
+INSERT INTO t1 VALUES (-1e308),(-255),(-2),(-1),(+1),(+2),(255),(1e308);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2 ORDER BY a;
+a	h
+-1e308	FFFFFFFFFFFFFFFF
+-255	FFFFFFFFFFFFFF01
+-2	FFFFFFFFFFFFFFFE
+-1	FFFFFFFFFFFFFFFF
+1	1
+2	2
+255	FF
+1e308	FFFFFFFFFFFFFFFF
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	double	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+SET sql_mode=DEFAULT;
+#
+# End of 10.5 tests
+#
+#
 # MDEV-32203 Raise notes when an index cannot be used on data type mismatch
 #
 SET note_verbosity=unusable_keys;
diff --git a/mysql-test/main/type_float.test b/mysql-test/main/type_float.test
index c90d8b8aa79..5fc20fb1557 100644
--- a/mysql-test/main/type_float.test
+++ b/mysql-test/main/type_float.test
@@ -746,6 +746,58 @@ DROP VIEW v1;
 --echo # End of 10.4 tests
 --echo #
 
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-20548 Unexpected error on CREATE..SELECT HEX(num)
+--echo #
+
+SET sql_mode=STRICT_ALL_TABLES;
+
+CREATE TABLE t1 AS SELECT HEX(-2e0) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(-1e0) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(1e0) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(2e0) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+
+CREATE TABLE t1 (a FLOAT);
+INSERT INTO t1 VALUES (-1e38),(-255),(-2),(-1),(+1),(+2),(255),(1e38);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2 ORDER BY a;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (a DOUBLE);
+INSERT INTO t1 VALUES (-1e308),(-255),(-2),(-1),(+1),(+2),(255),(1e308);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2 ORDER BY a;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+SET sql_mode=DEFAULT;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
+
 --echo #
 --echo # MDEV-32203 Raise notes when an index cannot be used on data type mismatch
 --echo #
diff --git a/mysql-test/main/type_int.result b/mysql-test/main/type_int.result
index 9a54c9a5287..efa855da42e 100644
--- a/mysql-test/main/type_int.result
+++ b/mysql-test/main/type_int.result
@@ -1686,6 +1686,167 @@ c0
 127
 drop table t1;
 #
+# MDEV-20548 Unexpected error on CREATE..SELECT HEX(num)
+#
+SET sql_mode=STRICT_ALL_TABLES;
+CREATE TABLE t1 AS SELECT HEX(-2) AS h;
+SELECT * FROM t1;
+h
+FFFFFFFFFFFFFFFE
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(-1) AS h;
+SELECT * FROM t1;
+h
+FFFFFFFFFFFFFFFF
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(1) AS h;
+SELECT * FROM t1;
+h
+1
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(2) AS h;
+SELECT * FROM t1;
+h
+2
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 (a TINYINT);
+INSERT INTO t1 VALUES (-0x80),(-2),(-1),(1),(2),(0x7f);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+a	h
+-128	FFFFFFFFFFFFFF80
+-2	FFFFFFFFFFFFFFFE
+-1	FFFFFFFFFFFFFFFF
+1	1
+2	2
+127	7F
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	tinyint(4)	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+CREATE TABLE t1 (a SMALLINT);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+a	h
+-32768	FFFFFFFFFFFF8000
+-128	FFFFFFFFFFFFFF80
+-2	FFFFFFFFFFFFFFFE
+-1	FFFFFFFFFFFFFFFF
+1	1
+2	2
+127	7F
+32767	7FFF
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	smallint(6)	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+CREATE TABLE t1 (a MEDIUMINT);
+INSERT INTO t1 VALUES (-0x800000);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+INSERT INTO t1 VALUES (0x7fffff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+a	h
+-8388608	FFFFFFFFFF800000
+-32768	FFFFFFFFFFFF8000
+-128	FFFFFFFFFFFFFF80
+-2	FFFFFFFFFFFFFFFE
+-1	FFFFFFFFFFFFFFFF
+1	1
+2	2
+127	7F
+32767	7FFF
+8388607	7FFFFF
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	mediumint(9)	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (-0x80000000);
+INSERT INTO t1 VALUES (-0x800000);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+INSERT INTO t1 VALUES (0x7fffff);
+INSERT INTO t1 VALUES (0x7fffffff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+a	h
+-2147483648	FFFFFFFF80000000
+-8388608	FFFFFFFFFF800000
+-32768	FFFFFFFFFFFF8000
+-128	FFFFFFFFFFFFFF80
+-2	FFFFFFFFFFFFFFFE
+-1	FFFFFFFFFFFFFFFF
+1	1
+2	2
+127	7F
+32767	7FFF
+8388607	7FFFFF
+2147483647	7FFFFFFF
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	int(11)	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+CREATE TABLE t1 (a BIGINT);
+INSERT INTO t1 VALUES (-0x8000000000000000);
+INSERT INTO t1 VALUES (-0x80000000000000);
+INSERT INTO t1 VALUES (-0x800000000000);
+INSERT INTO t1 VALUES (-0x8000000000);
+INSERT INTO t1 VALUES (-0x80000000);
+INSERT INTO t1 VALUES (-0x800000);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+INSERT INTO t1 VALUES (0x7fffff);
+INSERT INTO t1 VALUES (0x7fffffff);
+INSERT INTO t1 VALUES (0x7fffffffff);
+INSERT INTO t1 VALUES (0x7fffffffffff);
+INSERT INTO t1 VALUES (0x7fffffffffffff);
+INSERT INTO t1 VALUES (0x7fffffffffffffff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+a	h
+-9223372036854775808	8000000000000000
+-36028797018963968	FF80000000000000
+-140737488355328	FFFF800000000000
+-549755813888	FFFFFF8000000000
+-2147483648	FFFFFFFF80000000
+-8388608	FFFFFFFFFF800000
+-32768	FFFFFFFFFFFF8000
+-128	FFFFFFFFFFFFFF80
+-2	FFFFFFFFFFFFFFFE
+-1	FFFFFFFFFFFFFFFF
+1	1
+2	2
+127	7F
+32767	7FFF
+8388607	7FFFFF
+2147483647	7FFFFFFF
+549755813887	7FFFFFFFFF
+140737488355327	7FFFFFFFFFFF
+36028797018963967	7FFFFFFFFFFFFF
+9223372036854775807	7FFFFFFFFFFFFFFF
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	bigint(20)	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+SET sql_mode=DEFAULT;
+#
 # End of 10.5 tests
 #
 #
diff --git a/mysql-test/main/type_int.test b/mysql-test/main/type_int.test
index c47ab501116..f15f8688907 100644
--- a/mysql-test/main/type_int.test
+++ b/mysql-test/main/type_int.test
@@ -564,6 +564,88 @@ insert into t1 values (-128);
 select * from t1 where 18446744073700599371 > c0;
 drop table t1;
 
+--echo #
+--echo # MDEV-20548 Unexpected error on CREATE..SELECT HEX(num)
+--echo #
+
+SET sql_mode=STRICT_ALL_TABLES;
+
+CREATE TABLE t1 AS SELECT HEX(-2) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(-1) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(1) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(2) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a TINYINT);
+INSERT INTO t1 VALUES (-0x80),(-2),(-1),(1),(2),(0x7f);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (a SMALLINT);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (a MEDIUMINT);
+INSERT INTO t1 VALUES (-0x800000);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+INSERT INTO t1 VALUES (0x7fffff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (-0x80000000);
+INSERT INTO t1 VALUES (-0x800000);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+INSERT INTO t1 VALUES (0x7fffff);
+INSERT INTO t1 VALUES (0x7fffffff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+CREATE TABLE t1 (a BIGINT);
+INSERT INTO t1 VALUES (-0x8000000000000000);
+INSERT INTO t1 VALUES (-0x80000000000000);
+INSERT INTO t1 VALUES (-0x800000000000);
+INSERT INTO t1 VALUES (-0x8000000000);
+INSERT INTO t1 VALUES (-0x80000000);
+INSERT INTO t1 VALUES (-0x800000);
+INSERT INTO t1 VALUES (-0x8000),(-0x80),(-2),(-1),(1),(2),(0x7f),(0x7fff);
+INSERT INTO t1 VALUES (0x7fffff);
+INSERT INTO t1 VALUES (0x7fffffff);
+INSERT INTO t1 VALUES (0x7fffffffff);
+INSERT INTO t1 VALUES (0x7fffffffffff);
+INSERT INTO t1 VALUES (0x7fffffffffffff);
+INSERT INTO t1 VALUES (0x7fffffffffffffff);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+SET sql_mode=DEFAULT;
+
+
 --echo #
 --echo # End of 10.5 tests
 --echo #
diff --git a/mysql-test/main/type_newdecimal.result b/mysql-test/main/type_newdecimal.result
index f63aafefb7c..bb06c4a8424 100644
--- a/mysql-test/main/type_newdecimal.result
+++ b/mysql-test/main/type_newdecimal.result
@@ -912,8 +912,8 @@ select * from t1;
 col1
 -9223372036854775808
 drop table t1;
-select cast('1.00000001335143196001808973960578441619873046875E-10' as decimal(30,15));
-cast('1.00000001335143196001808973960578441619873046875E-10' as decimal(30,15))
+select cast('1.00000001335143196001808973960578441619873046875E-10' as decimal(30,15)) as exp;
+exp
 0.000000000100000
 select ln(14000) c1, convert(ln(14000),decimal(5,3)) c2, cast(ln(14000) as decimal(5,3)) c3;
 c1	c2	c3
@@ -1527,9 +1527,8 @@ f1
 99999999999999999999999999999.999999999999999999999999999999999999
 DROP TABLE t1;
 select (1.20396873 * 0.89550000 * 0.68000000 * 1.08721696 * 0.99500000 *
-1.01500000 * 1.01500000 * 0.99500000);
-(1.20396873 * 0.89550000 * 0.68000000 * 1.08721696 * 0.99500000 *
-1.01500000 * 1.01500000 * 0.99500000)
+1.01500000 * 1.01500000 * 0.99500000) as exp;
+exp
 0.81298807395367312459230693948000000000
 create table t1 as select 5.05 / 0.014;
 Warnings:
@@ -2464,8 +2463,8 @@ drop table t1;
 # decimal_bin_size And Assertion `scale >= 0 && precision > 0 && scale <= precision'
 # failed in decimal_bin_size_inline/decimal_bin_size.
 #
-SELECT AVG(DISTINCT 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001);
-AVG(DISTINCT 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+SELECT AVG(DISTINCT 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001) as exp;
+exp
 0.00000000000000000000000000000000000000
 CREATE TABLE t1 AS SELECT NULL AS v1;
 SELECT 1 FROM t1 GROUP BY v1 ORDER BY AVG ( from_unixtime ( '' ) ) ;
@@ -2807,6 +2806,80 @@ DROP TABLE t2,t1;
 # End of 10.4 tests
 #
 #
+# Start of 10.5 tests
+#
+#
+# MDEV-20548 Unexpected error on CREATE..SELECT HEX(num)
+#
+SET sql_mode=STRICT_ALL_TABLES;
+CREATE TABLE t1 AS SELECT HEX(-2) AS h;
+SELECT * FROM t1;
+h
+FFFFFFFFFFFFFFFE
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(-1) AS h;
+SELECT * FROM t1;
+h
+FFFFFFFFFFFFFFFF
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(+1) AS h;
+SELECT * FROM t1;
+h
+1
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 AS SELECT HEX(+2) AS h;
+SELECT * FROM t1;
+h
+2
+SHOW COLUMNS IN t1;
+Field	Type	Null	Key	Default	Extra
+h	varchar(16)	YES		NULL	
+DROP TABLE t1;
+CREATE TABLE t1 (a DECIMAL(41,1));
+INSERT INTO t1 VALUES (-1000000000000000000000000000000000000000);
+INSERT INTO t1 VALUES (-0x8000000000);
+INSERT INTO t1 VALUES (-0x80000000),(-0x800000),(-0x8000),(-0x80),(-2),(-1);
+INSERT INTO t1 VALUES (1),(2),(128),(0x7fff),(0x7fffff),(0x7fffffff);
+INSERT INTO t1 VALUES (+0x7fffffffff);
+INSERT INTO t1 VALUES (+1000000000000000000000000000000000000000);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2 ORDER BY a;
+a	h
+-1000000000000000000000000000000000000000.0	FFFFFFFFFFFFFFFF
+-549755813888.0	FFFFFF8000000000
+-2147483648.0	FFFFFFFF80000000
+-8388608.0	FFFFFFFFFF800000
+-32768.0	FFFFFFFFFFFF8000
+-128.0	FFFFFFFFFFFFFF80
+-2.0	FFFFFFFFFFFFFFFE
+-1.0	FFFFFFFFFFFFFFFF
+1.0	1
+2.0	2
+128.0	80
+32767.0	7FFF
+8388607.0	7FFFFF
+2147483647.0	7FFFFFFF
+549755813887.0	7FFFFFFFFF
+1000000000000000000000000000000000000000.0	FFFFFFFFFFFFFFFF
+SHOW COLUMNS IN t2;
+Field	Type	Null	Key	Default	Extra
+a	decimal(41,1)	YES		NULL	
+h	varchar(16)	YES		NULL	
+DROP TABLE t1, t2;
+SET sql_mode=DEFAULT;
+#
+# End of 10.5 tests
+#
+#
 # MDEV-32203 Raise notes when an index cannot be used on data type mismatch
 #
 SET note_verbosity=unusable_keys;
diff --git a/mysql-test/main/type_newdecimal.test b/mysql-test/main/type_newdecimal.test
index af82b7d601c..af9da5395c0 100644
--- a/mysql-test/main/type_newdecimal.test
+++ b/mysql-test/main/type_newdecimal.test
@@ -952,10 +952,7 @@ drop table t1;
 #
 # Bug #10891 (converting to decimal crashes server)
 #
-#enable after fix MDEV-27871
---disable_view_protocol
-select cast('1.00000001335143196001808973960578441619873046875E-10' as decimal(30,15));
---enable_view_protocol
+select cast('1.00000001335143196001808973960578441619873046875E-10' as decimal(30,15)) as exp;
 
 #
 # Bug #11708 (conversion to decimal fails in decimal part)
@@ -1245,15 +1242,11 @@ DROP TABLE t1;
 #
 # Bug #36270: incorrect calculation result - works in 4.1 but not in 5.0 or 5.1
 #
-#enable after fix MDEV-27871
---disable_view_protocol
 
 # show that if we need to truncate the scale of an operand, we pick the
 # right one (that is, we discard the least significant decimal places)
 select (1.20396873 * 0.89550000 * 0.68000000 * 1.08721696 * 0.99500000 *
-        1.01500000 * 1.01500000 * 0.99500000);
-
---enable_view_protocol
+        1.01500000 * 1.01500000 * 0.99500000) as exp;
 
 #
 # Bug #31616 div_precision_increment description looks wrong 
@@ -1926,10 +1919,8 @@ drop table t1;
 --echo # decimal_bin_size And Assertion `scale >= 0 && precision > 0 && scale <= precision'
 --echo # failed in decimal_bin_size_inline/decimal_bin_size.
 --echo #
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT AVG(DISTINCT 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001);
---enable_view_protocol
+SELECT AVG(DISTINCT 0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001) as exp;
+
 CREATE TABLE t1 AS SELECT NULL AS v1;
 SELECT 1 FROM t1 GROUP BY v1 ORDER BY AVG ( from_unixtime ( '' ) ) ;
 DROP TABLE t1;
@@ -2012,6 +2003,54 @@ DROP TABLE t2,t1;
 --echo # End of 10.4 tests
 --echo #
 
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-20548 Unexpected error on CREATE..SELECT HEX(num)
+--echo #
+
+SET sql_mode=STRICT_ALL_TABLES;
+
+CREATE TABLE t1 AS SELECT HEX(-2) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(-1) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(+1) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 AS SELECT HEX(+2) AS h;
+SELECT * FROM t1;
+SHOW COLUMNS IN t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a DECIMAL(41,1));
+INSERT INTO t1 VALUES (-1000000000000000000000000000000000000000);
+INSERT INTO t1 VALUES (-0x8000000000);
+INSERT INTO t1 VALUES (-0x80000000),(-0x800000),(-0x8000),(-0x80),(-2),(-1);
+INSERT INTO t1 VALUES (1),(2),(128),(0x7fff),(0x7fffff),(0x7fffffff);
+INSERT INTO t1 VALUES (+0x7fffffffff);
+INSERT INTO t1 VALUES (+1000000000000000000000000000000000000000);
+CREATE TABLE t2 AS SELECT a, HEX(a) AS h FROM t1;
+SELECT * FROM t2 ORDER BY a;
+SHOW COLUMNS IN t2;
+DROP TABLE t1, t2;
+
+SET sql_mode=DEFAULT;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
+
 --echo #
 --echo # MDEV-32203 Raise notes when an index cannot be used on data type mismatch
 --echo #
diff --git a/mysql-test/main/win.result b/mysql-test/main/win.result
index fec47959a1e..66b878901e5 100644
--- a/mysql-test/main/win.result
+++ b/mysql-test/main/win.result
@@ -1099,11 +1099,9 @@ select
 a,
 count(col1) over (order by a
 range between 0.1 preceding
-and 0.1 following)
+and 0.1 following) as count
 from t1;
-a	count(col1) over (order by a
-range between 0.1 preceding
-and 0.1 following)
+a	count
 0.450	3
 0.500	3
 0.550	3
@@ -1249,33 +1247,33 @@ insert into t1 values (1,1,'foo');
 insert into t1 values (2,2,'bar');
 select
 count(*) over (order by a,b
-range between unbounded preceding and current row)
+range between unbounded preceding and current row) as count
 from t1;
 ERROR HY000: RANGE-type frame requires ORDER BY clause with single sort key
 select
 count(*) over (order by c
-range between unbounded preceding and current row)
+range between unbounded preceding and current row) as count
 from t1;
 ERROR HY000: Numeric datatype is required for RANGE-type frame
 select
 count(*) over (order by a
-range between 'abcd' preceding and current row)
+range between 'abcd' preceding and current row) as count
 from t1;
 ERROR HY000: Numeric datatype is required for RANGE-type frame
 select
 count(*) over (order by a
-range between current row and 'foo' following)
+range between current row and 'foo' following) as count
 from t1;
 ERROR HY000: Numeric datatype is required for RANGE-type frame
 # Try range frame with invalid bounds
 select
 count(*) over (order by a
-rows between 0.5 preceding and current row)
+rows between 0.5 preceding and current row) as count
 from t1;
 ERROR HY000: Integer is required for ROWS-type frame
 select
 count(*) over (order by a
-rows between current row and 3.14 following)
+rows between current row and 3.14 following) as count
 from t1;
 ERROR HY000: Integer is required for ROWS-type frame
 #
@@ -1284,29 +1282,27 @@ ERROR HY000: Integer is required for ROWS-type frame
 select
 count(*) over (order by a
 rows between 1 preceding and 1 following
-exclude current row)
+exclude current row) as count
 from t1;
 ERROR HY000: Frame exclusion is not supported yet
 select
 count(*) over (order by a
 range between 1 preceding and 1 following
-exclude ties)
+exclude ties) as count
 from t1;
 ERROR HY000: Frame exclusion is not supported yet
 select
 count(*) over (order by a
 range between 1 preceding and 1 following
-exclude group)
+exclude group) as count
 from t1;
 ERROR HY000: Frame exclusion is not supported yet
 select
 count(*) over (order by a
 rows between 1 preceding and 1 following
-exclude no others)
+exclude no others) as count
 from t1;
-count(*) over (order by a
-rows between 1 preceding and 1 following
-exclude no others)
+count
 2
 2
 drop table t1;
@@ -1638,10 +1634,10 @@ insert into t1 values
 #  Check using counters
 flush status;
 select
-rank() over (partition by c order by a),
-rank() over (partition by c order by b)
+rank() over (partition by c order by a) as rank_a,
+rank() over (partition by c order by b) as rank_b
 from t1;
-rank() over (partition by c order by a)	rank() over (partition by c order by b)
+rank_a	rank_b
 1	3
 2	2
 3	1
@@ -1654,10 +1650,10 @@ Sort_rows	6
 Sort_scan	2
 flush status;
 select
-rank() over (partition by c order by a),
-rank() over (partition by c order by a)
+rank() over (partition by c order by a) as rank_a,
+rank() over (partition by c order by a) as rank_b
 from t1;
-rank() over (partition by c order by a)	rank() over (partition by c order by a)
+rank_a	rank_b
 1	1
 2	2
 3	3
@@ -1670,8 +1666,8 @@ Sort_rows	3
 Sort_scan	1
 explain format=json
 select
-rank() over (partition by c order by a),
-rank() over (partition by c order by a)
+rank() over (partition by c order by a) as rank_a,
+rank() over (partition by c order by a) as rank_b
 from t1;
 EXPLAIN
 {
@@ -1740,8 +1736,8 @@ EXPLAIN
 }
 explain format=json
 select
-rank() over (partition by c order by a),
-count(*) over (partition by c)
+rank() over (partition by c order by a) as rank_a,
+count(*) over (partition by c) as count_c
 from t1;
 EXPLAIN
 {
@@ -1775,8 +1771,8 @@ EXPLAIN
 }
 explain format=json
 select
-count(*) over (partition by c),
-rank() over (partition by c order by a)
+count(*) over (partition by c) as count_c,
+rank() over (partition by c order by a) as rank_a
 from t1;
 EXPLAIN
 {
@@ -1923,18 +1919,18 @@ insert into t1 values (1, 3, 4);
 insert into t1 values (1, 4, 8);
 select
 pk, a,
-sum(a) over (order by pk rows between 0 preceding and current row)
+sum(a) over (order by pk rows between 0 preceding and current row) as sum
 from t1;
-pk	a	sum(a) over (order by pk rows between 0 preceding and current row)
+pk	a	sum
 1	1	1
 2	2	2
 3	4	4
 4	8	8
 select
 pk, a,
-sum(a) over (order by pk rows between 1 preceding and 0 preceding)
+sum(a) over (order by pk rows between 1 preceding and 0 preceding) as sum
 from t1;
-pk	a	sum(a) over (order by pk rows between 1 preceding and 0 preceding)
+pk	a	sum
 1	1	1
 2	2	3
 3	4	6
@@ -1945,9 +1941,9 @@ insert into t1 values (200, 3, 4);
 insert into t1 values (200, 4, 8);
 select
 part_id, pk, a,
-sum(a) over (partition by part_id order by pk rows between 0 preceding and current row)
+sum(a) over (partition by part_id order by pk rows between 0 preceding and current row) as sum
 from t1;
-part_id	pk	a	sum(a) over (partition by part_id order by pk rows between 0 preceding and current row)
+part_id	pk	a	sum
 1	1	1	1
 1	2	2	2
 1	3	4	4
@@ -1958,9 +1954,9 @@ part_id	pk	a	sum(a) over (partition by part_id order by pk rows between 0 preced
 200	4	8	8
 select
 part_id, pk, a,
-sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding)
+sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding) as sum
 from t1;
-part_id	pk	a	sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding)
+part_id	pk	a	sum
 1	1	1	1
 1	2	2	3
 1	3	4	6
@@ -1985,8 +1981,8 @@ insert into t1 values
 (2000, 3),
 (2000, 3),
 (2000, 3);
-select          rank() over (partition by part_id order by a) from t1;
-rank() over (partition by part_id order by a)
+select          rank() over (partition by part_id order by a) as rank from t1;
+rank
 1
 2
 2
@@ -1996,14 +1992,14 @@ rank() over (partition by part_id order by a)
 3
 3
 3
-select distinct rank() over (partition by part_id order by a) from t1;
-rank() over (partition by part_id order by a)
+select distinct rank() over (partition by part_id order by a) as rank from t1;
+rank
 1
 2
 4
 3
 explain format=json
-select distinct rank() over (partition by part_id order by a) from t1;
+select distinct rank() over (partition by part_id order by a) as rank from t1;
 EXPLAIN
 {
   "query_block": {
@@ -2092,11 +2088,8 @@ INSERT INTO `orders` VALUES (59940,238);
 SELECT o_custkey, avg(o_custkey) OVER (PARTITION BY abs(o_custkey)
 ORDER BY o_custkey
 RANGE BETWEEN 15 FOLLOWING
-AND 15 FOLLOWING) from orders;
-o_custkey	avg(o_custkey) OVER (PARTITION BY abs(o_custkey)
-ORDER BY o_custkey
-RANGE BETWEEN 15 FOLLOWING
-AND 15 FOLLOWING)
+AND 15 FOLLOWING) as avg from orders;
+o_custkey	avg
 238	NULL
 242	NULL
 DROP table orders;
@@ -2326,15 +2319,15 @@ a
 NULL
 NULL
 NULL
-SELECT ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0) from t;
-ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0)
+SELECT ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0)  as result from t;
+result
 0.00000000000000
 0.00000000000000
 0.00000000000000
 SELECT sum(t.a) over (partition by t.b order by a),
-sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0))
+sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0)) as sum
 from t;
-sum(t.a) over (partition by t.b order by a)	sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0))
+sum(t.a) over (partition by t.b order by a)	sum
 0.0000000000	0
 1.0000000000	1
 3.0000000000	1.7320508075688772
@@ -2509,9 +2502,9 @@ INSERT INTO t1 VALUES
 (1,1000), (2,1100), (3,1800), (4,1500), (5,1700), (6,1200),
 (7,2000), (8,2100), (9,1600);
 SELECT id, sum(a) OVER (PARTITION BY id 
-ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as sum
 FROM t1;
-id	sum(a) OVER (PARTITION BY id 
+id	sum
 1	1000
 2	1100
 3	1800
@@ -2521,10 +2514,9 @@ id	sum(a) OVER (PARTITION BY id
 7	2000
 8	2100
 9	1600
-ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
-SELECT id, sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+SELECT id, sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as sum
 FROM t1;
-id	sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+id	sum
 1	14000
 2	13000
 3	5900
@@ -3259,8 +3251,8 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (c CHAR(8)) ENGINE=MyISAM;
 INSERT IGNORE INTO t1 VALUES ('foo');
-SELECT ('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1);
-('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1)
+SELECT ('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1) as result;
+result
 0
 DROP TABLE t1;
 #
@@ -3293,8 +3285,8 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (dt DATETIME);
 INSERT INTO t1 VALUES ('2017-05-17');
-SELECT MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) FROM t1;
-MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING)
+SELECT MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) as result FROM t1;
+result
 NULL
 DROP TABLE t1;
 #
diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test
index 6ec89fc168c..6168b5736f1 100644
--- a/mysql-test/main/win.test
+++ b/mysql-test/main/win.test
@@ -2,9 +2,6 @@
 #  Window Functions Tests
 #
 --source include/no_valgrind_without_big.inc
-#remove this include after fix MDEV-27871, MDEV-27938
---source include/no_view_protocol.inc
-
 --source include/have_sequence.inc
 
 --disable_warnings
@@ -694,7 +691,7 @@ select
   a,
   count(col1) over (order by a
                     range between 0.1 preceding
-                                  and 0.1 following)
+                                  and 0.1 following) as count
 from t1;
 
 drop table t1;
@@ -787,38 +784,38 @@ insert into t1 values (2,2,'bar');
 --error ER_RANGE_FRAME_NEEDS_SIMPLE_ORDERBY
 select
   count(*) over (order by a,b
-                 range between unbounded preceding and current row)
+                 range between unbounded preceding and current row) as count
 from t1;
 
 --error ER_WRONG_TYPE_FOR_RANGE_FRAME
 select
   count(*) over (order by c
-                 range between unbounded preceding and current row)
+                 range between unbounded preceding and current row) as count
 from t1;
 
 --error ER_WRONG_TYPE_FOR_RANGE_FRAME
 select
   count(*) over (order by a
-                 range between 'abcd' preceding and current row)
+                 range between 'abcd' preceding and current row) as count
 from t1;
 
 --error ER_WRONG_TYPE_FOR_RANGE_FRAME
 select
   count(*) over (order by a
-                 range between current row and 'foo' following)
+                 range between current row and 'foo' following) as count
 from t1;
 
 --echo # Try range frame with invalid bounds
 --error ER_WRONG_TYPE_FOR_ROWS_FRAME
 select
   count(*) over (order by a
-                 rows between 0.5 preceding and current row)
+                 rows between 0.5 preceding and current row) as count
 from t1;
 
 --error ER_WRONG_TYPE_FOR_ROWS_FRAME
 select
   count(*) over (order by a
-                 rows between current row and 3.14 following)
+                 rows between current row and 3.14 following) as count
 from t1;
 
 --echo #
@@ -829,28 +826,28 @@ from t1;
 select
   count(*) over (order by a
                  rows between 1 preceding and 1 following
-                 exclude current row)
+                 exclude current row) as count
 from t1;
 
 --error ER_FRAME_EXCLUSION_NOT_SUPPORTED
 select
   count(*) over (order by a
                  range between 1 preceding and 1 following
-                 exclude ties)
+                 exclude ties) as count
 from t1;
 
 --error ER_FRAME_EXCLUSION_NOT_SUPPORTED
 select
   count(*) over (order by a
                  range between 1 preceding and 1 following
-                 exclude group)
+                 exclude group) as count
 from t1;
 
 # EXCLUDE NO OTHERS means 'don't exclude anything'
 select
   count(*) over (order by a
                  rows between 1 preceding and 1 following
-                 exclude no others)
+                 exclude no others) as count
 from t1;
 
 drop table t1;
@@ -1031,16 +1028,16 @@ insert into t1 values
 flush status;
 --sorted_result
 select
-  rank() over (partition by c order by a),
-  rank() over (partition by c order by b)
+  rank() over (partition by c order by a) as rank_a,
+  rank() over (partition by c order by b) as rank_b
 from t1;
 show status like '%sort%';
 
 flush status;
 --sorted_result
 select
-  rank() over (partition by c order by a),
-  rank() over (partition by c order by a)
+  rank() over (partition by c order by a) as rank_a,
+  rank() over (partition by c order by a) as rank_b
 from t1;
 show status like '%sort%';
 
@@ -1048,8 +1045,8 @@ show status like '%sort%';
 --source include/explain-no-costs.inc
 explain format=json
 select
-  rank() over (partition by c order by a),
-  rank() over (partition by c order by a)
+  rank() over (partition by c order by a) as rank_a,
+  rank() over (partition by c order by a) as rank_b
 from t1;
 
 --source include/explain-no-costs.inc
@@ -1062,15 +1059,15 @@ from t1;
 --source include/explain-no-costs.inc
 explain format=json
 select
-  rank() over (partition by c order by a),
-  count(*) over (partition by c)
+  rank() over (partition by c order by a) as rank_a,
+  count(*) over (partition by c) as count_c
 from t1;
 
 --source include/explain-no-costs.inc
 explain format=json
 select
-  count(*) over (partition by c),
-  rank() over (partition by c order by a)
+  count(*) over (partition by c) as count_c,
+  rank() over (partition by c order by a) as rank_a
 from t1;
 
 drop table t1;
@@ -1146,12 +1143,12 @@ insert into t1 values (1, 4, 8);
 
 select
   pk, a,
-  sum(a) over (order by pk rows between 0 preceding and current row)
+  sum(a) over (order by pk rows between 0 preceding and current row) as sum
 from t1;
 
 select
   pk, a,
-  sum(a) over (order by pk rows between 1 preceding and 0 preceding)
+  sum(a) over (order by pk rows between 1 preceding and 0 preceding) as sum
 from t1;
 
 insert into t1 values (200, 1, 1);
@@ -1160,12 +1157,12 @@ insert into t1 values (200, 3, 4);
 insert into t1 values (200, 4, 8);
 select
   part_id, pk, a,
-  sum(a) over (partition by part_id order by pk rows between 0 preceding and current row)
+  sum(a) over (partition by part_id order by pk rows between 0 preceding and current row) as sum
 from t1;
 
 select
   part_id, pk, a,
-  sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding)
+  sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding) as sum
 from t1;
 
 drop table t1;
@@ -1186,11 +1183,11 @@ insert into t1 values
 (2000, 3),
 (2000, 3);
 
-select          rank() over (partition by part_id order by a) from t1;
-select distinct rank() over (partition by part_id order by a) from t1;
+select          rank() over (partition by part_id order by a) as rank from t1;
+select distinct rank() over (partition by part_id order by a) as rank from t1;
 --source include/explain-no-costs.inc
 explain format=json
-select distinct rank() over (partition by part_id order by a) from t1;
+select distinct rank() over (partition by part_id order by a) as rank from t1;
 
 drop table t1;
 
@@ -1247,7 +1244,7 @@ INSERT INTO `orders` VALUES (59940,238);
 SELECT o_custkey, avg(o_custkey) OVER (PARTITION BY abs(o_custkey)
                                        ORDER BY o_custkey
                                        RANGE BETWEEN 15 FOLLOWING
-                                                 AND 15 FOLLOWING) from orders;
+                                                 AND 15 FOLLOWING) as avg from orders;
 DROP table orders;
 
 --echo #
@@ -1386,9 +1383,9 @@ insert into t(a,b) values(1,1);
 insert into t(a,b) values(2,1);
 insert into t(a,b) values(0,1);
 SELECT (CASE WHEN sum(t.a) over (partition by t.b)=0 THEN null ELSE null END) AS a FROM t;
-SELECT ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0) from t;
+SELECT ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0)  as result from t;
 SELECT sum(t.a) over (partition by t.b order by a),
-       sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0))
+       sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0)) as sum
 from t;
 drop table t;
 
@@ -1472,11 +1469,11 @@ INSERT INTO t1 VALUES
 
 --sorted_result
 SELECT id, sum(a) OVER (PARTITION BY id 
-                       ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+                       ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as sum
 FROM t1;
 
 --sorted_result
-SELECT id, sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+SELECT id, sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as sum
 FROM t1;
 
 DROP TABLE t1;
@@ -1625,9 +1622,11 @@ select b, max(i+20) over (partition by b) as f
   from (select i+10 as i, b from t1) as tt
 order by i;
 
+--disable_view_protocol
 select max(i), max(i), sum(i), count(i)
   from t1 as tt
 group by b;
+--enable_view_protocol
 
 select max(i), min(sum(i)) over (partition by count(i)) f
   from t1 as tt
@@ -1641,9 +1640,11 @@ select max(i+10), min(sum(i)+10) over (partition by count(i)) f
   from t1 as tt
 group by b;
 
+--disable_view_protocol
 select max(i), max(i), sum(i), count(i)
   from (select i+10 as i, b from t1) as tt
 group by b;
+--enable_view_protocol
 
 select max(i), min(sum(i)) over (partition by count(i)) f
   from (select i+10 as i, b from t1) as tt
@@ -1958,7 +1959,7 @@ DROP TABLE t1;
 --echo #
 CREATE TABLE t1 (c CHAR(8)) ENGINE=MyISAM;
 INSERT IGNORE INTO t1 VALUES ('foo');
-SELECT ('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1);
+SELECT ('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1) as result;
 DROP TABLE t1;
 
 --echo #
@@ -1989,7 +1990,7 @@ DROP TABLE t1;
 
 CREATE TABLE t1 (dt DATETIME);
 INSERT INTO t1 VALUES ('2017-05-17');
-SELECT MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) FROM t1;
+SELECT MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) as result FROM t1;
 DROP TABLE t1;
 
 --echo #
@@ -2779,6 +2780,8 @@ FROM t1
 GROUP BY nullif(id, 15532);
 drop table t1;
 
+#Dublicate warnings
+--disable_view_protocol
 CREATE TABLE t1 ( a char(25), b text);
 INSERT INTO t1 VALUES ('foo','bar');
 
@@ -2790,6 +2793,7 @@ GROUP BY
   LEFT((SYSDATE()), 'foo')
 WITH ROLLUP;
 drop table t1;
+--enable_view_protocol
 
 --echo #
 --echo #
@@ -2993,7 +2997,9 @@ CREATE FUNCTION f() RETURNS INT READS SQL DATA BEGIN
 END//
 DELIMITER ;//
 
+--disable_view_protocol
 SELECT f(),f();
+--enable_view_protocol
 
 EXECUTE IMMEDIATE "SELECT LEAD(c1) OVER (ORDER BY c1) FROM t NATURAL JOIN t AS a;";
 EXECUTE IMMEDIATE "SELECT SUM(c1) OVER (ORDER BY c1) FROM t NATURAL JOIN t AS a;";
diff --git a/mysql-test/main/win_avg.result b/mysql-test/main/win_avg.result
index 7e539d933d8..aa6dda24bd8 100644
--- a/mysql-test/main/win_avg.result
+++ b/mysql-test/main/win_avg.result
@@ -32,9 +32,9 @@ insert into t1 values
 (125 , 6, 1, NULL),
 (126 , 6, 1, NULL),
 (127 , 6, 1, NULL);
-select pk, a, b, avg(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, b, avg(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as avg
 from t1;
-pk	a	b	avg(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+pk	a	b	avg
 101	0	10	10.0000
 102	0	10	10.0000
 103	1	10	10.0000
@@ -62,9 +62,9 @@ pk	a	b	avg(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FO
 125	6	1	1.0000
 126	6	1	1.0000
 127	6	1	1.0000
-select pk, a, c, avg(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, c, avg(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as avg
 from t1;
-pk	a	c	avg(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+pk	a	c	avg
 101	0	1.1	1.6
 102	0	2.1	1.6
 103	1	3.1	3.5999999999999996
diff --git a/mysql-test/main/win_avg.test b/mysql-test/main/win_avg.test
index 86edcce5679..36e03e083b3 100644
--- a/mysql-test/main/win_avg.test
+++ b/mysql-test/main/win_avg.test
@@ -35,14 +35,11 @@ insert into t1 values
 (126 , 6, 1, NULL),
 (127 , 6, 1, NULL);
 
-#enable after fix MDEV-27871
---disable_view_protocol
 --sorted_result
-select pk, a, b, avg(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, b, avg(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as avg
 from t1;
 
 --sorted_result
-select pk, a, c, avg(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, c, avg(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as avg
 from t1;
---enable_view_protocol
 drop table t1;
diff --git a/mysql-test/main/win_big.result b/mysql-test/main/win_big.result
index c8b27b9a1aa..a4b83b07f0a 100644
--- a/mysql-test/main/win_big.result
+++ b/mysql-test/main/win_big.result
@@ -19,10 +19,10 @@ sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
 t10;
 select variable_name,
-case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
-variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+variable_name	result
 SORT_MERGE_PASSES	NO PASSES
 set sort_buffer_size=1024;
 flush status;
@@ -32,10 +32,10 @@ sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
 t10;
 select variable_name,
-case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
-variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+variable_name	result
 SORT_MERGE_PASSES	WITH PASSES
 include/diff_tables.inc [t21, t22]
 drop table t21, t22;
@@ -51,10 +51,10 @@ sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
 t10;
 select variable_name,
-case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
-variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+variable_name	result
 SORT_MERGE_PASSES	NO PASSES
 set sort_buffer_size=1024;
 flush status;
@@ -66,10 +66,10 @@ sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
 t10;
 select variable_name,
-case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
-variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+variable_name	result
 SORT_MERGE_PASSES	WITH PASSES
 include/diff_tables.inc [t21, t22]
 drop table t21, t22;
@@ -85,10 +85,10 @@ sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_
 from
 t10;
 select variable_name,
-case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
-variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+variable_name	result
 SORT_MERGE_PASSES	NO PASSES
 set sort_buffer_size=1024;
 flush status;
@@ -99,10 +99,10 @@ sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_
 from
 t10;
 select variable_name,
-case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
-variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+variable_name	result
 SORT_MERGE_PASSES	WITH PASSES
 include/diff_tables.inc [t21, t22]
 drop table t21, t22;
diff --git a/mysql-test/main/win_big.test b/mysql-test/main/win_big.test
index e53eaa70291..9d37b689f4d 100644
--- a/mysql-test/main/win_big.test
+++ b/mysql-test/main/win_big.test
@@ -28,13 +28,10 @@ select
   sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
   t10;
-#enable after fix MDEV-27871
---disable_view_protocol
 select variable_name,
-       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
---enable_view_protocol
 
 set sort_buffer_size=1024;
 flush status;
@@ -43,13 +40,10 @@ select
   sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
   t10;
-#enable after fix MDEV-27871
---disable_view_protocol
 select variable_name,
-       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
---enable_view_protocol
 
 let $diff_tables= t21, t22;
 source include/diff_tables.inc;
@@ -66,13 +60,10 @@ select
   sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
   t10;
-#enable after fix MDEV-27871
---disable_view_protocol
 select variable_name,
-       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
---enable_view_protocol
 
 set sort_buffer_size=1024;
 flush status;
@@ -83,13 +74,10 @@ select
   sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
   t10;
-#enable after fix MDEV-27871
---disable_view_protocol
 select variable_name,
-       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
---enable_view_protocol
 
 let $diff_tables= t21, t22;
 source include/diff_tables.inc;
@@ -106,13 +94,10 @@ select
   sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_B1
 from
   t10;
-#enable after fix MDEV-27871
---disable_view_protocol
 select variable_name,
-       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
---enable_view_protocol
 
 set sort_buffer_size=1024;
 flush status;
@@ -122,13 +107,10 @@ select
   sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_B1
 from
   t10;
-#enable after fix MDEV-27871
---disable_view_protocol
 select variable_name,
-       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end as result
 from information_schema.session_status
 where variable_name like 'Sort_merge_passes';
---enable_view_protocol
 
 let $diff_tables= t21, t22;
 source include/diff_tables.inc;
diff --git a/mysql-test/main/win_nth_value.result b/mysql-test/main/win_nth_value.result
index abda1a2377f..ca58ad5daac 100644
--- a/mysql-test/main/win_nth_value.result
+++ b/mysql-test/main/win_nth_value.result
@@ -75,9 +75,9 @@ pk	a	nth_value(pk, pk) over (partition by a order by pk)	nth_value(pk, a + 1) ov
 11	2	NULL	9
 select pk,
 a,
-nth_value(pk, 1) over (partition by a order by pk ROWS between 1 preceding and 1 following)
+nth_value(pk, 1) over (partition by a order by pk ROWS between 1 preceding and 1 following) as nth
 from t1;
-pk	a	nth_value(pk, 1) over (partition by a order by pk ROWS between 1 preceding and 1 following)
+pk	a	nth
 1	0	1
 2	0	1
 3	0	2
@@ -91,21 +91,21 @@ pk	a	nth_value(pk, 1) over (partition by a order by pk ROWS between 1 preceding
 11	2	10
 select pk,
 a,
-nth_value(a, 1) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 2) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 3) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 4) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 5) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 6) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 7) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 8) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 9) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 10) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 11) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-nth_value(a, 12) over (order by a RANGE BETWEEN 1 preceding and 1 following)
+nth_value(a, 1) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth1,
+nth_value(a, 2) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth2,
+nth_value(a, 3) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth3,
+nth_value(a, 4) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth4,
+nth_value(a, 5) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth5,
+nth_value(a, 6) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth6,
+nth_value(a, 7) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth7,
+nth_value(a, 8) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth8,
+nth_value(a, 9) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth9,
+nth_value(a, 10) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth10,
+nth_value(a, 11) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth11,
+nth_value(a, 12) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth12
 from t1
 order by pk asc;
-pk	a	nth_value(a, 1) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 2) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 3) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 4) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 5) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 6) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 7) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 8) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 9) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 10) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 11) over (order by a RANGE BETWEEN 1 preceding and 1 following)	nth_value(a, 12) over (order by a RANGE BETWEEN 1 preceding and 1 following)
+pk	a	nth1	nth2	nth3	nth4	nth5	nth6	nth7	nth8	nth9	nth10	nth11	nth12
 1	0	0	0	0	1	1	1	NULL	NULL	NULL	NULL	NULL	NULL
 2	0	0	0	0	1	1	1	NULL	NULL	NULL	NULL	NULL	NULL
 3	0	0	0	0	1	1	1	NULL	NULL	NULL	NULL	NULL	NULL
diff --git a/mysql-test/main/win_nth_value.test b/mysql-test/main/win_nth_value.test
index 2d47677f65c..afee755680b 100644
--- a/mysql-test/main/win_nth_value.test
+++ b/mysql-test/main/win_nth_value.test
@@ -42,32 +42,26 @@ select pk,
 from t1
 order by pk asc;
 
-#enable after fix MDEV-27871
---disable_view_protocol
 select pk,
        a,
-       nth_value(pk, 1) over (partition by a order by pk ROWS between 1 preceding and 1 following)
+       nth_value(pk, 1) over (partition by a order by pk ROWS between 1 preceding and 1 following) as nth
 from t1;
---enable_view_protocol
 
-#enable after fix MDEV-28535
---disable_view_protocol
 select pk,
        a,
-       nth_value(a, 1) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 2) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 3) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 4) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 5) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 6) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 7) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 8) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 9) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 10) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 11) over (order by a RANGE BETWEEN 1 preceding and 1 following),
-       nth_value(a, 12) over (order by a RANGE BETWEEN 1 preceding and 1 following)
+       nth_value(a, 1) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth1,
+       nth_value(a, 2) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth2,
+       nth_value(a, 3) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth3,
+       nth_value(a, 4) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth4,
+       nth_value(a, 5) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth5,
+       nth_value(a, 6) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth6,
+       nth_value(a, 7) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth7,
+       nth_value(a, 8) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth8,
+       nth_value(a, 9) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth9,
+       nth_value(a, 10) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth10,
+       nth_value(a, 11) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth11,
+       nth_value(a, 12) over (order by a RANGE BETWEEN 1 preceding and 1 following) as nth12
 from t1
 order by pk asc;
---enable_view_protocol
 
 drop table t1;
diff --git a/mysql-test/main/win_ntile.result b/mysql-test/main/win_ntile.result
index 4d02a230e13..e0e651c5ec2 100644
--- a/mysql-test/main/win_ntile.result
+++ b/mysql-test/main/win_ntile.result
@@ -396,9 +396,9 @@ select t1.a from t1 where pk = 13;
 a
 1
 select pk, a, b,
-ntile((select a from t1 where pk=13)) over (partition by b order by pk)
+ntile((select a from t1 where pk=13)) over (partition by b order by pk) as ntile
 from t1;
-pk	a	b	ntile((select a from t1 where pk=13)) over (partition by b order by pk)
+pk	a	b	ntile
 11	0	10	1
 12	0	10	1
 13	1	10	1
@@ -411,7 +411,7 @@ pk	a	b	ntile((select a from t1 where pk=13)) over (partition by b order by pk)
 20	4	20	1
 explain
 select pk, a, b,
-ntile((select a from t1 where pk=13)) over (partition by b order by pk)
+ntile((select a from t1 where pk=13)) over (partition by b order by pk) as ntile
 from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	10	Using temporary
diff --git a/mysql-test/main/win_ntile.test b/mysql-test/main/win_ntile.test
index c508b1627ad..7866f9586a1 100644
--- a/mysql-test/main/win_ntile.test
+++ b/mysql-test/main/win_ntile.test
@@ -152,17 +152,14 @@ select pk, a, b,
 from t1;
 
 select t1.a from t1 where pk = 13;
-#enable after fix MDEV-27871
---disable_view_protocol
 select pk, a, b,
-    ntile((select a from t1 where pk=13)) over (partition by b order by pk)
+    ntile((select a from t1 where pk=13)) over (partition by b order by pk) as ntile
 from t1;
 
 explain
 select pk, a, b,
-    ntile((select a from t1 where pk=13)) over (partition by b order by pk)
+    ntile((select a from t1 where pk=13)) over (partition by b order by pk) as ntile
 from t1;
---enable_view_protocol
 
 select a from t1;
 --error ER_SUBQUERY_NO_1_ROW
diff --git a/mysql-test/main/win_percentile.result b/mysql-test/main/win_percentile.result
index 65788c21e78..e2eea784d81 100644
--- a/mysql-test/main/win_percentile.result
+++ b/mysql-test/main/win_percentile.result
@@ -96,10 +96,10 @@ Kaolin
 Tata
 Tatiana
 #disallowed fields in order by
-select score,  percentile_cont(0.5)  within group(order by name) over (partition by score) from t1;
+select score,  percentile_cont(0.5)  within group(order by name) over (partition by score) as result from t1;
 ERROR HY000: Numeric datatype is required for percentile_cont function
-select score,  percentile_disc(0.5)  within group(order by name) over (partition by score) from t1;
-score	percentile_disc(0.5)  within group(order by name) over (partition by score)
+select score,  percentile_disc(0.5)  within group(order by name) over (partition by score) as result from t1;
+score	result
 3.0000	Chun
 3.0000	Chun
 4.0000	Tata
diff --git a/mysql-test/main/win_percentile.test b/mysql-test/main/win_percentile.test
index 9626caffc54..fb93be11ab6 100644
--- a/mysql-test/main/win_percentile.test
+++ b/mysql-test/main/win_percentile.test
@@ -62,12 +62,9 @@ select name from t1 a where (select  percentile_disc(0.5) within group (order by
 
 --echo #disallowed fields in order by
 --error ER_WRONG_TYPE_FOR_PERCENTILE_FUNC
-select score,  percentile_cont(0.5)  within group(order by name) over (partition by score) from t1;
+select score,  percentile_cont(0.5)  within group(order by name) over (partition by score) as result from t1;
 
-#enable after fix MDEV-27871
---disable_view_protocol
-select score,  percentile_disc(0.5)  within group(order by name) over (partition by score) from t1;
---enable_view_protocol
+select score,  percentile_disc(0.5)  within group(order by name) over (partition by score) as result from t1;
 
 --echo #parameter value should be in the range of [0,1]
 --error ER_ARGUMENT_OUT_OF_RANGE
diff --git a/mysql-test/main/win_sum.result b/mysql-test/main/win_sum.result
index 71d87bd6eca..a17c17845af 100644
--- a/mysql-test/main/win_sum.result
+++ b/mysql-test/main/win_sum.result
@@ -32,9 +32,9 @@ insert into t1 values
 (125 , 6, 1, NULL),
 (126 , 6, 1, NULL),
 (127 , 6, 1, NULL);
-select pk, a, b, sum(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, b, sum(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as sum
 from t1;
-pk	a	b	sum(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+pk	a	b	sum
 101	0	10	20
 102	0	10	20
 103	1	10	20
@@ -62,9 +62,9 @@ pk	a	b	sum(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FO
 125	6	1	3
 126	6	1	3
 127	6	1	2
-select pk, a, c, sum(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, c, sum(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as sum
 from t1;
-pk	a	c	sum(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+pk	a	c	sum
 101	0	1.1	3.2
 102	0	2.1	3.2
 103	1	3.1	7.199999999999999
diff --git a/mysql-test/main/win_sum.test b/mysql-test/main/win_sum.test
index d76ec4d6d24..9800174f54c 100644
--- a/mysql-test/main/win_sum.test
+++ b/mysql-test/main/win_sum.test
@@ -35,17 +35,13 @@ insert into t1 values
 (126 , 6, 1, NULL),
 (127 , 6, 1, NULL);
 
-#enable after fix MDEV-27871
---disable_view_protocol
-
 --sorted_result
-select pk, a, b, sum(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, b, sum(b) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as sum
 from t1;
 
 --sorted_result
-select pk, a, c, sum(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+select pk, a, c, sum(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) as sum
 from t1;
---enable_view_protocol
 
 drop table t1;
 
diff --git a/mysql-test/main/xml.result b/mysql-test/main/xml.result
index d0acb0debf3..d0b1d1782a1 100644
--- a/mysql-test/main/xml.result
+++ b/mysql-test/main/xml.result
@@ -410,17 +410,17 @@ b1 b2
 select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[2<=position()]');
 extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[2<=position()]')
 b2 b3
-select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[position()=3 or position()=2]');
-extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[position()=3 or position()=2]')
+select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[position()=3 or position()=2]') as xml;
+xml
 b2 b3
-SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=0]');
-extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=0]')
+SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=0]') as xml;
+xml
 a2
-SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=1]');
-extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=1]')
+SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=1]') as xml;
+xml
 a1
-select extractValue('<a>a1<b ba="1" ba="2">b1</b><b>b2</b>4</a>','/a/b[sum(@ba)=3]');
-extractValue('<a>a1<b ba="1" ba="2">b1</b><b>b2</b>4</a>','/a/b[sum(@ba)=3]')
+select extractValue('<a>a1<b ba="1" ba="2">b1</b><b>b2</b>4</a>','/a/b[sum(@ba)=3]') as xml;
+xml
 b1
 select extractValue('<a><b>b1</b><b>b2</b></a>','/a/b[1]');
 extractValue('<a><b>b1</b><b>b2</b></a>','/a/b[1]')
@@ -506,14 +506,14 @@ select extractValue(@xml,'/a/@b[contains(.,"1")][contains(.,"2")][2]');
 extractValue(@xml,'/a/@b[contains(.,"1")][contains(.,"2")][2]')
 b21
 SET @xml='<a>a1<b>b1<c>c1</c>b2</b>a2</a>';
-select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','+++++++++');
-UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','+++++++++')
+select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','+++++++++') as xml;
+xml
 <a>a1<b>b1+++++++++b2</b>a2</a>
-select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1>+++++++++</c1>');
-UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1>+++++++++</c1>')
+select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1>+++++++++</c1>') as xml;
+xml
 <a>a1<b>b1<c1>+++++++++</c1>b2</b>a2</a>
-select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1/>');
-UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1/>')
+select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1/>') as xml;
+xml
 <a>a1<b>b1<c1/>b2</b>a2</a>
 SET @xml='<a><b>bb</b></a>';
 select UpdateXML(@xml, '/a/b', '<b>ccc</b>');
@@ -586,59 +586,59 @@ B C
 select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*');
 extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*')
 A
-select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*');
-extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*')
+select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*') as xml;
+xml
 A B C
 select extractvalue('<A_B>A</A_B>','/A_B');
 extractvalue('<A_B>A</A_B>','/A_B')
 A
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[position()]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[position()]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[position()]') as xml;
+xml
 B1 B2
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=last()]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=last()]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=last()]') as xml;
+xml
 B1 B2
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()]') as xml;
+xml
 B2
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()-1]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()-1]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()-1]') as xml;
+xml
 B1
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=1]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=1]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=1]') as xml;
+xml
 
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=2]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=2]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=2]') as xml;
+xml
 B1 B2
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=position()]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=position()]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=position()]') as xml;
+xml
 B2
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)]') as xml;
+xml
 B2
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)-1]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)-1]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)-1]') as xml;
+xml
 B1
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=1]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=1]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=1]') as xml;
+xml
 
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=2]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=2]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=2]') as xml;
+xml
 B1 B2
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=position()]');
-extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=position()]')
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=position()]') as xml;
+xml
 B2
-select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]');
-extractvalue('<a>Jack</a>','/a[contains(../a,"J")]')
+select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]') as xml;
+xml
 Jack
-select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]');
-extractvalue('<a>Jack</a>','/a[contains(../a,"j")]')
+select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]') as xml;
+xml
 Jack
-select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin);
-extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin)
+select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin) as xml;
+xml
 
-select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]');
-extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]')
+select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]') as xml;
+xml
 
 select ExtractValue('<tag1><![CDATA[test]]></tag1>','/tag1');
 ExtractValue('<tag1><![CDATA[test]]></tag1>','/tag1')
@@ -702,25 +702,25 @@ CALL p2();
 EXTRACTVALUE(p,'/Ñ/r')
 A
 DROP PROCEDURE p2;
-select extractValue('<ns:element xmlns:ns="myns"/>','count(ns:element)');
-extractValue('<ns:element xmlns:ns="myns"/>','count(ns:element)')
+select extractValue('<ns:element xmlns:ns="myns"/>','count(ns:element)') as xml;
+xml
 1
-select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element');
-extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element')
+select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element') as xml;
+xml
 a
-select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element/@xmlns:ns');
-extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element/@xmlns:ns')
+select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element/@xmlns:ns') as xml;
+xml
 myns
-select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/foo.bar');
-extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/foo.bar')
+select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/foo.bar')  as xml;
+xml
 Data
-select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/something');
-extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/something')
+select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/something') as xml;
+xml
 Otherdata
-select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','/zot/tim0/02');
+select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','/zot/tim0/02') as xml;
 ERROR HY000: XPATH syntax error: '02'
-select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','//*');
-extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','//*')
+select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','//*') as xml;
+xml
 NULL
 Warnings:
 Warning	1525	Incorrect XML value: 'parse error at line 1 pos 13: unknown token unexpected (ident or '/' wanted)'
@@ -816,17 +816,17 @@ ExtractValue(@xml, "/entry[(50<pt)]/id")
 select ExtractValue(@xml, "/entry[(50<=pt)]/id");
 ExtractValue(@xml, "/entry[(50<=pt)]/id")
 pt50
-select ExtractValue('<a><b><Text>test</Text></b></a>','/a/b/Text');
-ExtractValue('<a><b><Text>test</Text></b></a>','/a/b/Text')
+select ExtractValue('<a><b><Text>test</Text></b></a>','/a/b/Text') as xml;
+xml
 test
-select ExtractValue('<a><b><comment>test</comment></b></a>','/a/b/comment');
-ExtractValue('<a><b><comment>test</comment></b></a>','/a/b/comment')
+select ExtractValue('<a><b><comment>test</comment></b></a>','/a/b/comment') as xml;
+xml
 test
-select ExtractValue('<a><b><node>test</node></b></a>','/a/b/node');
-ExtractValue('<a><b><node>test</node></b></a>','/a/b/node')
+select ExtractValue('<a><b><node>test</node></b></a>','/a/b/node') as xml;
+xml
 test
-select ExtractValue('<a><b><processing-instruction>test</processing-instruction></b></a>','/a/b/processing-instruction');
-ExtractValue('<a><b><processing-instruction>test</processing-instruction></b></a>','/a/b/processing-instruction')
+select ExtractValue('<a><b><processing-instruction>test</processing-instruction></b></a>','/a/b/processing-instruction') as xml;
+xml
 test
 select ExtractValue('<a><and>test</and></a>', '/a/and');
 ExtractValue('<a><and>test</and></a>', '/a/and')
@@ -852,44 +852,44 @@ test
 select ExtractValue('<a><div:div>test</div:div></a>', '/a/div:div');
 ExtractValue('<a><div:div>test</div:div></a>', '/a/div:div')
 test
-select ExtractValue('<a><ancestor>test</ancestor></a>', '/a/ancestor');
-ExtractValue('<a><ancestor>test</ancestor></a>', '/a/ancestor')
+select ExtractValue('<a><ancestor>test</ancestor></a>', '/a/ancestor') as xml;
+xml
 test
-select ExtractValue('<a><ancestor-or-self>test</ancestor-or-self></a>', '/a/ancestor-or-self');
-ExtractValue('<a><ancestor-or-self>test</ancestor-or-self></a>', '/a/ancestor-or-self')
+select ExtractValue('<a><ancestor-or-self>test</ancestor-or-self></a>', '/a/ancestor-or-self') as xml;
+xml
 test
-select ExtractValue('<a><attribute>test</attribute></a>', '/a/attribute');
-ExtractValue('<a><attribute>test</attribute></a>', '/a/attribute')
+select ExtractValue('<a><attribute>test</attribute></a>', '/a/attribute') as xml;
+xml
 test
-select ExtractValue('<a><child>test</child></a>', '/a/child');
-ExtractValue('<a><child>test</child></a>', '/a/child')
+select ExtractValue('<a><child>test</child></a>', '/a/child') as xml;
+xml
 test
-select ExtractValue('<a><descendant>test</descendant></a>', '/a/descendant');
-ExtractValue('<a><descendant>test</descendant></a>', '/a/descendant')
+select ExtractValue('<a><descendant>test</descendant></a>', '/a/descendant') as xml;
+xml
 test
-select ExtractValue('<a><descendant-or-self>test</descendant-or-self></a>', '/a/descendant-or-self');
-ExtractValue('<a><descendant-or-self>test</descendant-or-self></a>', '/a/descendant-or-self')
+select ExtractValue('<a><descendant-or-self>test</descendant-or-self></a>', '/a/descendant-or-self') as xml;
+xml
 test
-select ExtractValue('<a><following>test</following></a>', '/a/following');
-ExtractValue('<a><following>test</following></a>', '/a/following')
+select ExtractValue('<a><following>test</following></a>', '/a/following') as xml;
+xml
 test
-select ExtractValue('<a><following-sibling>test</following-sibling></a>', '/a/following-sibling');
-ExtractValue('<a><following-sibling>test</following-sibling></a>', '/a/following-sibling')
+select ExtractValue('<a><following-sibling>test</following-sibling></a>', '/a/following-sibling') as xml;
+xml
 test
-select ExtractValue('<a><namespace>test</namespace></a>', '/a/namespace');
-ExtractValue('<a><namespace>test</namespace></a>', '/a/namespace')
+select ExtractValue('<a><namespace>test</namespace></a>', '/a/namespace') as xml;
+xml
 test
-select ExtractValue('<a><parent>test</parent></a>', '/a/parent');
-ExtractValue('<a><parent>test</parent></a>', '/a/parent')
+select ExtractValue('<a><parent>test</parent></a>', '/a/parent') as xml;
+xml
 test
-select ExtractValue('<a><preceding>test</preceding></a>', '/a/preceding');
-ExtractValue('<a><preceding>test</preceding></a>', '/a/preceding')
+select ExtractValue('<a><preceding>test</preceding></a>', '/a/preceding') as xml;
+xml
 test
-select ExtractValue('<a><preceding-sibling>test</preceding-sibling></a>', '/a/preceding-sibling');
-ExtractValue('<a><preceding-sibling>test</preceding-sibling></a>', '/a/preceding-sibling')
+select ExtractValue('<a><preceding-sibling>test</preceding-sibling></a>', '/a/preceding-sibling') as xml;
+xml
 test
-select ExtractValue('<a><self>test</self></a>', '/a/self');
-ExtractValue('<a><self>test</self></a>', '/a/self')
+select ExtractValue('<a><self>test</self></a>', '/a/self') as xml;
+xml
 test
 set @i=1;
 select ExtractValue('<a><b>b1</b><b>b2</b></a>','/a/b[$@i]');
@@ -1181,8 +1181,8 @@ UPDATEXML('<a><c><a>x</a></c></a>','(a)//a','<b />')
 SELECT ExtractValue('<a><a>aa</a><b>bb</b></a>','(a)/a|(a)/b');
 ExtractValue('<a><a>aa</a><b>bb</b></a>','(a)/a|(a)/b')
 aa bb
-SELECT ExtractValue('<a><b>abc</b><c>2</c><d>1</d></a>','substring(/a/b,..)');
-ExtractValue('<a><b>abc</b><c>2</c><d>1</d></a>','substring(/a/b,..)')
+SELECT ExtractValue('<a><b>abc</b><c>2</c><d>1</d></a>','substring(/a/b,..)') as xml;
+xml
 
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
diff --git a/mysql-test/main/xml.test b/mysql-test/main/xml.test
index f042c4371ce..2d0dd9907bb 100644
--- a/mysql-test/main/xml.test
+++ b/mysql-test/main/xml.test
@@ -166,14 +166,11 @@ select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[2=position()]');
 select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[3=position()]');
 select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[2>=position()]');
 select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[2<=position()]');
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[position()=3 or position()=2]');
+select extractValue('<a b="b1" b="b2" b="b3"/>','/a/@b[position()=3 or position()=2]') as xml;
 
-SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=0]');
-SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=1]');
-select extractValue('<a>a1<b ba="1" ba="2">b1</b><b>b2</b>4</a>','/a/b[sum(@ba)=3]');
---enable_view_protocol
+SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=0]') as xml;
+SELECT extractValue('<a>a<b>a1<c>c1</c></b><b>a2</b></a>','/a/b[count(c)=1]') as xml;
+select extractValue('<a>a1<b ba="1" ba="2">b1</b><b>b2</b>4</a>','/a/b[sum(@ba)=3]') as xml;
 
 select extractValue('<a><b>b1</b><b>b2</b></a>','/a/b[1]');
 select extractValue('<a><b>b1</b><b>b2</b></a>','/a/b[boolean(1)]');
@@ -216,12 +213,9 @@ select extractValue(@xml,'/a/@b[contains(.,"1")][contains(.,"2")]');
 select extractValue(@xml,'/a/@b[contains(.,"1")][contains(.,"2")][2]');
 
 SET @xml='<a>a1<b>b1<c>c1</c>b2</b>a2</a>';
-#enable after fix MDEV-27871
---disable_view_protocol
-select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','+++++++++');
-select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1>+++++++++</c1>');
---enable_view_protocol
-select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1/>');
+select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','+++++++++') as xml;
+select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1>+++++++++</c1>') as xml;
+select UpdateXML('<a>a1<b>b1<c>c1</c>b2</b>a2</a>','/a/b/c','<c1/>') as xml;
 
 SET @xml='<a><b>bb</b></a>';
 select UpdateXML(@xml, '/a/b', '<b>ccc</b>');
@@ -277,10 +271,7 @@ select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!');
 #
 select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant::*');
 select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*');
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*');
---enable_view_protocol
+select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*') as xml;
 # Bug #16320 XML: extractvalue() won't accept names containing underscores
 #
 select extractvalue('<A_B>A</A_B>','/A_B');
@@ -288,37 +279,26 @@ select extractvalue('<A_B>A</A_B>','/A_B');
 #
 # Bug#16318: XML: extractvalue() incorrectly returns last() = 1
 #
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[position()]');
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=last()]');
---enable_view_protocol
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()]');
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()-1]');
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=1]');
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=2]');
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=position()]');
---enable_view_protocol
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)]');
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)-1]');
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=1]');
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=2]');
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=position()]');
---enable_view_protocol
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[position()]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=last()]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()-1]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=1]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=2]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=position()]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)-1]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=1]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=2]') as xml;
+select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=position()]') as xml;
+
 #
 # Bug#16316: XML: extractvalue() is case-sensitive with contains()
 #
-select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]');
-select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]');
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin);
-select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]');
---enable_view_protocol
+select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]') as xml;
+select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]') as xml;
+select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin) as xml;
+select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]') as xml;
 
 #
 # Bug#18285: ExtractValue not returning character
@@ -383,33 +363,25 @@ DROP PROCEDURE p2;
 # Bug#18170: XML: ExtractValue():
 # XPath expression can't use QNames (colon in names)
 #
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractValue('<ns:element xmlns:ns="myns"/>','count(ns:element)');
-select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element');
-select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element/@xmlns:ns');
---enable_view_protocol
+select extractValue('<ns:element xmlns:ns="myns"/>','count(ns:element)') as xml;
+select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element') as xml;
+select extractValue('<ns:element xmlns:ns="myns">a</ns:element>','/ns:element/@xmlns:ns') as xml;
+
 #
 # Bug#20795 extractvalue() won't accept names containing a dot (.)
 #
-#enable after fix MDEV-27871
---disable_view_protocol
-select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/foo.bar');
-select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/something');
---enable_view_protocol
+select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/foo.bar')  as xml;
+select extractValue('<foo><foo.bar>Data</foo.bar><something>Otherdata</something></foo>','/foo/something') as xml;
 
 #
 # Bug#20854 XML functions: wrong result in ExtractValue
 #
-#enable after fix MDEV-27871
---disable_view_protocol
---error 1105
-select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','/zot/tim0/02');
-select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','//*');
---enable_view_protocol
-
 #view protocol generates additional warning
 --disable_view_protocol
+--error 1105
+select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','/zot/tim0/02') as xml;
+select extractValue('<zot><tim0><01>10:39:15</01><02>140</02></tim0></zot>','//*') as xml;
+
 # dot and dash are bad identtifier start character
 select extractValue('<.>test</.>','//*');
 select extractValue('<->test</->','//*');
@@ -457,13 +429,10 @@ select ExtractValue(@xml, "/entry[(50<=pt)]/id");
 #
 # Test nodetypes in node name context
 #
-select ExtractValue('<a><b><Text>test</Text></b></a>','/a/b/Text');
-#enable after fix MDEV-27871
---disable_view_protocol
-select ExtractValue('<a><b><comment>test</comment></b></a>','/a/b/comment');
-select ExtractValue('<a><b><node>test</node></b></a>','/a/b/node');
-select ExtractValue('<a><b><processing-instruction>test</processing-instruction></b></a>','/a/b/processing-instruction');
---enable_view_protocol
+select ExtractValue('<a><b><Text>test</Text></b></a>','/a/b/Text') as xml;
+select ExtractValue('<a><b><comment>test</comment></b></a>','/a/b/comment') as xml;
+select ExtractValue('<a><b><node>test</node></b></a>','/a/b/node') as xml;
+select ExtractValue('<a><b><processing-instruction>test</processing-instruction></b></a>','/a/b/processing-instruction') as xml;
 
 #
 # Test keywords in node name contexts
@@ -479,22 +448,19 @@ select ExtractValue('<a><div:div>test</div:div></a>', '/a/div:div');
 #
 # Test axis names in node name context
 #
-select ExtractValue('<a><ancestor>test</ancestor></a>', '/a/ancestor');
-#enable after fix MDEV-27871
---disable_view_protocol
-select ExtractValue('<a><ancestor-or-self>test</ancestor-or-self></a>', '/a/ancestor-or-self');
-select ExtractValue('<a><attribute>test</attribute></a>', '/a/attribute');
-select ExtractValue('<a><child>test</child></a>', '/a/child');
-select ExtractValue('<a><descendant>test</descendant></a>', '/a/descendant');
-select ExtractValue('<a><descendant-or-self>test</descendant-or-self></a>', '/a/descendant-or-self');
-select ExtractValue('<a><following>test</following></a>', '/a/following');
-select ExtractValue('<a><following-sibling>test</following-sibling></a>', '/a/following-sibling');
-select ExtractValue('<a><namespace>test</namespace></a>', '/a/namespace');
-select ExtractValue('<a><parent>test</parent></a>', '/a/parent');
-select ExtractValue('<a><preceding>test</preceding></a>', '/a/preceding');
-select ExtractValue('<a><preceding-sibling>test</preceding-sibling></a>', '/a/preceding-sibling');
---enable_view_protocol
-select ExtractValue('<a><self>test</self></a>', '/a/self');
+select ExtractValue('<a><ancestor>test</ancestor></a>', '/a/ancestor') as xml;
+select ExtractValue('<a><ancestor-or-self>test</ancestor-or-self></a>', '/a/ancestor-or-self') as xml;
+select ExtractValue('<a><attribute>test</attribute></a>', '/a/attribute') as xml;
+select ExtractValue('<a><child>test</child></a>', '/a/child') as xml;
+select ExtractValue('<a><descendant>test</descendant></a>', '/a/descendant') as xml;
+select ExtractValue('<a><descendant-or-self>test</descendant-or-self></a>', '/a/descendant-or-self') as xml;
+select ExtractValue('<a><following>test</following></a>', '/a/following') as xml;
+select ExtractValue('<a><following-sibling>test</following-sibling></a>', '/a/following-sibling') as xml;
+select ExtractValue('<a><namespace>test</namespace></a>', '/a/namespace') as xml;
+select ExtractValue('<a><parent>test</parent></a>', '/a/parent') as xml;
+select ExtractValue('<a><preceding>test</preceding></a>', '/a/preceding') as xml;
+select ExtractValue('<a><preceding-sibling>test</preceding-sibling></a>', '/a/preceding-sibling') as xml;
+select ExtractValue('<a><self>test</self></a>', '/a/self') as xml;
 
 #
 # Bug#26518 XPath and variables problem
@@ -751,10 +717,7 @@ SELECT ExtractValue('<a><a>aa</a><b>bb</b></a>','(a)/a|(a)/b');
 # MDEV-5689 ExtractValue(xml, 'substring(/x,/y)') crashes
 # MySQL bug#12428404 MYSQLD.EXE CRASHES WHEN EXTRACTVALUE() IS CALLED WITH MALFORMED XPATH EXP
 #
-#enable after fix MDEV-27871
---disable_view_protocol
-SELECT ExtractValue('<a><b>abc</b><c>2</c><d>1</d></a>','substring(/a/b,..)');
---enable_view_protocol
+SELECT ExtractValue('<a><b>abc</b><c>2</c><d>1</d></a>','substring(/a/b,..)') as xml;
 
 --echo #
 --echo # Bug#62429 XML: ExtractValue, UpdateXML max arg length 127 chars
diff --git a/mysql-test/suite/binlog/r/binlog_truncate_active_log.result b/mysql-test/suite/binlog/r/binlog_truncate_active_log.result
index 85d37534c0b..53cfb9577d7 100644
--- a/mysql-test/suite/binlog/r/binlog_truncate_active_log.result
+++ b/mysql-test/suite/binlog/r/binlog_truncate_active_log.result
@@ -40,7 +40,7 @@ disconnect master1;
 disconnect master2;
 disconnect master3;
 disconnect master4;
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --log-warnings=3
+# restart: --init-rpl-role=SLAVE --sync-binlog=1 --log-warnings=3
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-7/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
@@ -104,7 +104,7 @@ disconnect master1;
 disconnect master2;
 disconnect master3;
 disconnect master4;
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --log-warnings=3
+# restart: --init-rpl-role=SLAVE --sync-binlog=1 --log-warnings=3
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-11/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
@@ -173,7 +173,7 @@ disconnect master1;
 disconnect master2;
 disconnect master3;
 disconnect master4;
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --log-warnings=3
+# restart: --init-rpl-role=SLAVE --sync-binlog=1 --log-warnings=3
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-15/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
@@ -248,7 +248,7 @@ disconnect master1;
 disconnect master2;
 disconnect master3;
 disconnect master4;
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --log-warnings=3
+# restart: --init-rpl-role=SLAVE --sync-binlog=1 --log-warnings=3
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-21/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
diff --git a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
index 7fcde14d3ee..cbdc6c2fda6 100644
--- a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
+++ b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
@@ -31,9 +31,9 @@ Log_name	File_size
 master-bin.000001	#
 master-bin.000002	#
 master-bin.000003	#
-# restart the server with --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+# restart the server with --init-rpl-role=SLAVE --sync-binlog=1
 # the server is restarted
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+# restart: --init-rpl-role=SLAVE --sync-binlog=1
 connection default;
 #
 # *** Summary: 1 row should be present in both tables; binlog is truncated; number of binlogs at reconnect - 3:
@@ -98,7 +98,7 @@ INSERT INTO t2 VALUES (2, REPEAT("x", 4100));
 INSERT INTO t1 VALUES (2, REPEAT("x", 4100));
 COMMIT;
 connection default;
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+# restart: --init-rpl-role=SLAVE --sync-binlog=1
 connection default;
 #
 # *** Summary: 2 rows should be present in both tables; no binlog truncation; one extra binlog file compare with A; number of binlogs at reconnect - 4:
@@ -155,9 +155,9 @@ Log_name	File_size
 master-bin.000001	#
 master-bin.000002	#
 master-bin.000003	#
-# restart the server with --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+# restart the server with --init-rpl-role=SLAVE --sync-binlog=1
 # the server is restarted
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+# restart: --init-rpl-role=SLAVE --sync-binlog=1
 connection default;
 #
 # *** Summary: 2 rows should be present in both tables; no binlog truncation; the same # of binlog files as in B; number of binlogs at reconnect - 4:
diff --git a/mysql-test/suite/binlog/r/binlog_truncate_multi_log.result b/mysql-test/suite/binlog/r/binlog_truncate_multi_log.result
index 271e3c50b19..7d128c71941 100644
--- a/mysql-test/suite/binlog/r/binlog_truncate_multi_log.result
+++ b/mysql-test/suite/binlog/r/binlog_truncate_multi_log.result
@@ -42,7 +42,7 @@ connection default;
 disconnect master1;
 disconnect master2;
 disconnect master3;
-# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --log-warnings=3
+# restart: --init-rpl-role=SLAVE --sync-binlog=1 --log-warnings=3
 FOUND 1 /truncated binlog file:.*master.*000002/ in mysqld.1.err
 "One record should be present in table"
 SELECT * FROM ti;
diff --git a/mysql-test/suite/binlog/t/binlog_recover_checksum_error.test b/mysql-test/suite/binlog/t/binlog_recover_checksum_error.test
index 12c9f3d914f..377eaba89a5 100644
--- a/mysql-test/suite/binlog/t/binlog_recover_checksum_error.test
+++ b/mysql-test/suite/binlog/t/binlog_recover_checksum_error.test
@@ -16,7 +16,7 @@ call mtr.add_suppression("Error in Log_event::read_log_event");
 
 # Proof of no crash follows.
 # There's no need for actual bin-loggable queries to the server
---let $restart_parameters=  --master_verify_checksum=ON --debug_dbug="+d,corrupt_read_log_event_char"
+--let $restart_parameters=  --master_verify_checksum=ON --debug_dbug=+d,corrupt_read_log_event_char
 --let $shutdown_timeout=0
 --source include/restart_mysqld.inc
 --let $restart_parameters=
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_active_log.inc b/mysql-test/suite/binlog/t/binlog_truncate_active_log.inc
index 68ac752725e..050e4ad8665 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_active_log.inc
+++ b/mysql-test/suite/binlog/t/binlog_truncate_active_log.inc
@@ -42,7 +42,7 @@ SELECT @@global.gtid_binlog_pos as 'Before the crash and never logged trx';
 #
 # Server restart
 #
---let $restart_parameters= --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --log-warnings=3
+--let $restart_parameters= --init-rpl-role=SLAVE --sync-binlog=1 --log-warnings=3
 --source include/start_mysqld.inc
 
 # Check error log for a successful truncate message.
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_active_log.test b/mysql-test/suite/binlog/t/binlog_truncate_active_log.test
index 7c63a853da6..e288aa47660 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_active_log.test
+++ b/mysql-test/suite/binlog/t/binlog_truncate_active_log.test
@@ -36,7 +36,7 @@ CREATE TABLE tm (f INT) ENGINE=Aria;
 # Using 'debug_sync' hold 'query1' execution after 'query1' is flushed and
 # synced to binary log but not yet committed. In an another connection hold
 # 'query2' execution after 'query2' is flushed and synced to binlog.
-# Crash and restart server with --rpl-semi-sync-slave-enabled=1
+# Crash and restart server with --init-rpl-role=SLAVE
 #
 # During recovery of binary log 'query1' status is checked with InnoDB engine,
 # it will be in prepared but not yet commited. All transactions starting from
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
index 61d097a8af7..21b026925c4 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
+++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
@@ -29,7 +29,7 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb;
 # The transaction is killed along with the server after that.
 --let $shutdown_timeout=0
 --let $debug_sync_action = "commit_after_release_LOCK_log SIGNAL con1_ready WAIT_FOR signal_no_signal"
---let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+--let $restart_parameters = --init-rpl-role=SLAVE --sync-binlog=1
 --let $test_outcome= 1 row should be present in both tables; binlog is truncated; number of binlogs at reconnect - 3
 --source binlog_truncate_multi_engine.inc
 --echo Proof of the truncated binlog file is readable (two transactions must be seen):
@@ -42,7 +42,7 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb;
 --let $debug_sync_action = ""
 # Both debug_sync and debug-dbug are required to make sure Engines remember the commit state
 # debug_sync alone will not help.
---let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+--let $restart_parameters = --init-rpl-role=SLAVE --sync-binlog=1
 --let $test_outcome= 2 rows should be present in both tables; no binlog truncation; one extra binlog file compare with A; number of binlogs at reconnect - 4
 --source binlog_truncate_multi_engine.inc
 
@@ -51,7 +51,7 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb;
 --let $debug_sync_action = "commit_after_run_commit_ordered SIGNAL con1_ready"
 # Hold off after both engines have committed. The server is shut down.
 --let $shutdown_timeout=
---let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
+--let $restart_parameters = --init-rpl-role=SLAVE --sync-binlog=1
 --let $test_outcome= 2 rows should be present in both tables; no binlog truncation; the same # of binlog files as in B; number of binlogs at reconnect - 4
 --source binlog_truncate_multi_engine.inc
 
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_log.test b/mysql-test/suite/binlog/t/binlog_truncate_multi_log.test
index 079c79b2984..18aa2ff060a 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_multi_log.test
+++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_log.test
@@ -63,7 +63,7 @@ SELECT @@global.gtid_binlog_state;
 #
 # Server restart
 #
---let $restart_parameters= --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --log-warnings=3
+--let $restart_parameters= --init-rpl-role=SLAVE --sync-binlog=1 --log-warnings=3
 --source include/start_mysqld.inc
 
 # Check error log for a successful truncate message.
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_log_unsafe.test b/mysql-test/suite/binlog/t/binlog_truncate_multi_log_unsafe.test
index 5a5cc66742b..07f4e6a23dd 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_multi_log_unsafe.test
+++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_log_unsafe.test
@@ -92,7 +92,7 @@ SELECT @@global.gtid_binlog_state;
 #
 --echo # Failed restart as the semisync slave
 --error 1
---exec $MYSQLD_LAST_CMD  --rpl-semi-sync-slave-enabled=1 >> $MYSQLTEST_VARDIR/log/mysqld.1.err 2>&1
+--exec $MYSQLD_LAST_CMD  --init-rpl-role=SLAVE >> $MYSQLTEST_VARDIR/log/mysqld.1.err 2>&1
 
 --echo # Normal restart
 --source include/start_mysqld.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
index 144f86cceba..609d35d7ef6 100644
--- a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
+++ b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
@@ -3,5 +3,5 @@
 --source include/not_windows.inc
 --source include/have_binlog_format_mixed.inc
 
---source suite/rpl/include/rpl_binlog_max_cache_size.test
+--source suite/rpl/include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/encryption/r/tempfiles_encrypted.result b/mysql-test/suite/encryption/r/tempfiles_encrypted.result
index ae463dfb556..e701f0c076c 100644
--- a/mysql-test/suite/encryption/r/tempfiles_encrypted.result
+++ b/mysql-test/suite/encryption/r/tempfiles_encrypted.result
@@ -1105,11 +1105,9 @@ select
 a,
 count(col1) over (order by a
 range between 0.1 preceding
-and 0.1 following)
+and 0.1 following) as count
 from t1;
-a	count(col1) over (order by a
-range between 0.1 preceding
-and 0.1 following)
+a	count
 0.450	3
 0.500	3
 0.550	3
@@ -1255,33 +1253,33 @@ insert into t1 values (1,1,'foo');
 insert into t1 values (2,2,'bar');
 select
 count(*) over (order by a,b
-range between unbounded preceding and current row)
+range between unbounded preceding and current row) as count
 from t1;
 ERROR HY000: RANGE-type frame requires ORDER BY clause with single sort key
 select
 count(*) over (order by c
-range between unbounded preceding and current row)
+range between unbounded preceding and current row) as count
 from t1;
 ERROR HY000: Numeric datatype is required for RANGE-type frame
 select
 count(*) over (order by a
-range between 'abcd' preceding and current row)
+range between 'abcd' preceding and current row) as count
 from t1;
 ERROR HY000: Numeric datatype is required for RANGE-type frame
 select
 count(*) over (order by a
-range between current row and 'foo' following)
+range between current row and 'foo' following) as count
 from t1;
 ERROR HY000: Numeric datatype is required for RANGE-type frame
 # Try range frame with invalid bounds
 select
 count(*) over (order by a
-rows between 0.5 preceding and current row)
+rows between 0.5 preceding and current row) as count
 from t1;
 ERROR HY000: Integer is required for ROWS-type frame
 select
 count(*) over (order by a
-rows between current row and 3.14 following)
+rows between current row and 3.14 following) as count
 from t1;
 ERROR HY000: Integer is required for ROWS-type frame
 #
@@ -1290,29 +1288,27 @@ ERROR HY000: Integer is required for ROWS-type frame
 select
 count(*) over (order by a
 rows between 1 preceding and 1 following
-exclude current row)
+exclude current row) as count
 from t1;
 ERROR HY000: Frame exclusion is not supported yet
 select
 count(*) over (order by a
 range between 1 preceding and 1 following
-exclude ties)
+exclude ties) as count
 from t1;
 ERROR HY000: Frame exclusion is not supported yet
 select
 count(*) over (order by a
 range between 1 preceding and 1 following
-exclude group)
+exclude group) as count
 from t1;
 ERROR HY000: Frame exclusion is not supported yet
 select
 count(*) over (order by a
 rows between 1 preceding and 1 following
-exclude no others)
+exclude no others) as count
 from t1;
-count(*) over (order by a
-rows between 1 preceding and 1 following
-exclude no others)
+count
 2
 2
 drop table t1;
@@ -1644,10 +1640,10 @@ insert into t1 values
 #  Check using counters
 flush status;
 select
-rank() over (partition by c order by a),
-rank() over (partition by c order by b)
+rank() over (partition by c order by a) as rank_a,
+rank() over (partition by c order by b) as rank_b
 from t1;
-rank() over (partition by c order by a)	rank() over (partition by c order by b)
+rank_a	rank_b
 1	3
 2	2
 3	1
@@ -1660,10 +1656,10 @@ Sort_rows	6
 Sort_scan	2
 flush status;
 select
-rank() over (partition by c order by a),
-rank() over (partition by c order by a)
+rank() over (partition by c order by a) as rank_a,
+rank() over (partition by c order by a) as rank_b
 from t1;
-rank() over (partition by c order by a)	rank() over (partition by c order by a)
+rank_a	rank_b
 1	1
 2	2
 3	3
@@ -1676,8 +1672,8 @@ Sort_rows	3
 Sort_scan	1
 explain format=json
 select
-rank() over (partition by c order by a),
-rank() over (partition by c order by a)
+rank() over (partition by c order by a) as rank_a,
+rank() over (partition by c order by a) as rank_b
 from t1;
 EXPLAIN
 {
@@ -1746,8 +1742,8 @@ EXPLAIN
 }
 explain format=json
 select
-rank() over (partition by c order by a),
-count(*) over (partition by c)
+rank() over (partition by c order by a) as rank_a,
+count(*) over (partition by c) as count_c
 from t1;
 EXPLAIN
 {
@@ -1781,8 +1777,8 @@ EXPLAIN
 }
 explain format=json
 select
-count(*) over (partition by c),
-rank() over (partition by c order by a)
+count(*) over (partition by c) as count_c,
+rank() over (partition by c order by a) as rank_a
 from t1;
 EXPLAIN
 {
@@ -1929,18 +1925,18 @@ insert into t1 values (1, 3, 4);
 insert into t1 values (1, 4, 8);
 select
 pk, a,
-sum(a) over (order by pk rows between 0 preceding and current row)
+sum(a) over (order by pk rows between 0 preceding and current row) as sum
 from t1;
-pk	a	sum(a) over (order by pk rows between 0 preceding and current row)
+pk	a	sum
 1	1	1
 2	2	2
 3	4	4
 4	8	8
 select
 pk, a,
-sum(a) over (order by pk rows between 1 preceding and 0 preceding)
+sum(a) over (order by pk rows between 1 preceding and 0 preceding) as sum
 from t1;
-pk	a	sum(a) over (order by pk rows between 1 preceding and 0 preceding)
+pk	a	sum
 1	1	1
 2	2	3
 3	4	6
@@ -1951,9 +1947,9 @@ insert into t1 values (200, 3, 4);
 insert into t1 values (200, 4, 8);
 select
 part_id, pk, a,
-sum(a) over (partition by part_id order by pk rows between 0 preceding and current row)
+sum(a) over (partition by part_id order by pk rows between 0 preceding and current row) as sum
 from t1;
-part_id	pk	a	sum(a) over (partition by part_id order by pk rows between 0 preceding and current row)
+part_id	pk	a	sum
 1	1	1	1
 1	2	2	2
 1	3	4	4
@@ -1964,9 +1960,9 @@ part_id	pk	a	sum(a) over (partition by part_id order by pk rows between 0 preced
 200	4	8	8
 select
 part_id, pk, a,
-sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding)
+sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding) as sum
 from t1;
-part_id	pk	a	sum(a) over (partition by part_id order by pk rows between 1 preceding and 0 preceding)
+part_id	pk	a	sum
 1	1	1	1
 1	2	2	3
 1	3	4	6
@@ -1991,8 +1987,8 @@ insert into t1 values
 (2000, 3),
 (2000, 3),
 (2000, 3);
-select          rank() over (partition by part_id order by a) from t1;
-rank() over (partition by part_id order by a)
+select          rank() over (partition by part_id order by a) as rank from t1;
+rank
 1
 2
 2
@@ -2002,14 +1998,14 @@ rank() over (partition by part_id order by a)
 3
 3
 3
-select distinct rank() over (partition by part_id order by a) from t1;
-rank() over (partition by part_id order by a)
+select distinct rank() over (partition by part_id order by a) as rank from t1;
+rank
 1
 2
 4
 3
 explain format=json
-select distinct rank() over (partition by part_id order by a) from t1;
+select distinct rank() over (partition by part_id order by a) as rank from t1;
 EXPLAIN
 {
   "query_block": {
@@ -2098,11 +2094,8 @@ INSERT INTO `orders` VALUES (59940,238);
 SELECT o_custkey, avg(o_custkey) OVER (PARTITION BY abs(o_custkey)
 ORDER BY o_custkey
 RANGE BETWEEN 15 FOLLOWING
-AND 15 FOLLOWING) from orders;
-o_custkey	avg(o_custkey) OVER (PARTITION BY abs(o_custkey)
-ORDER BY o_custkey
-RANGE BETWEEN 15 FOLLOWING
-AND 15 FOLLOWING)
+AND 15 FOLLOWING) as avg from orders;
+o_custkey	avg
 238	NULL
 242	NULL
 DROP table orders;
@@ -2332,15 +2325,15 @@ a
 NULL
 NULL
 NULL
-SELECT ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0) from t;
-ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0)
+SELECT ifnull(((t.a) / CASE WHEN sum(t.a) over(partition by t.b) =0 then null else null end) ,0)  as result from t;
+result
 0.00000000000000
 0.00000000000000
 0.00000000000000
 SELECT sum(t.a) over (partition by t.b order by a),
-sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0))
+sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0)) as sum
 from t;
-sum(t.a) over (partition by t.b order by a)	sqrt(ifnull((sum(t.a) over (partition by t.b order by a)), 0))
+sum(t.a) over (partition by t.b order by a)	sum
 0.0000000000	0
 1.0000000000	1
 3.0000000000	1.7320508075688772
@@ -2515,9 +2508,9 @@ INSERT INTO t1 VALUES
 (1,1000), (2,1100), (3,1800), (4,1500), (5,1700), (6,1200),
 (7,2000), (8,2100), (9,1600);
 SELECT id, sum(a) OVER (PARTITION BY id 
-ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as sum
 FROM t1;
-id	sum(a) OVER (PARTITION BY id 
+id	sum
 1	1000
 2	1100
 3	1800
@@ -2527,10 +2520,9 @@ id	sum(a) OVER (PARTITION BY id
 7	2000
 8	2100
 9	1600
-ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
-SELECT id, sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+SELECT id, sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) as sum
 FROM t1;
-id	sum(a) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)
+id	sum
 1	14000
 2	13000
 3	5900
@@ -3265,8 +3257,8 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (c CHAR(8)) ENGINE=MyISAM;
 INSERT IGNORE INTO t1 VALUES ('foo');
-SELECT ('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1);
-('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1)
+SELECT ('bar',1) IN ( SELECT c, ROW_NUMBER() OVER (PARTITION BY c) FROM t1) as result;
+result
 0
 DROP TABLE t1;
 #
@@ -3299,8 +3291,8 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (dt DATETIME);
 INSERT INTO t1 VALUES ('2017-05-17');
-SELECT MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) FROM t1;
-MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING)
+SELECT MAX(dt) OVER (ORDER BY dt ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) as result FROM t1;
+result
 NULL
 DROP TABLE t1;
 #
diff --git a/mysql-test/suite/galera/r/MDEV-33064.result b/mysql-test/suite/galera/r/MDEV-33064.result
new file mode 100644
index 00000000000..22e1ce7a77a
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-33064.result
@@ -0,0 +1,26 @@
+connection node_2;
+connection node_1;
+connect con1,127.0.0.1,root,,test,$NODE_MYPORT_1;
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t1_fk(c1 INT PRIMARY KEY, c2 INT, INDEX (c2), FOREIGN KEY (c2) REFERENCES t1(c1)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+connection con1;
+SET SESSION wsrep_retry_autocommit = 0;
+SET DEBUG_SYNC = 'ib_after_row_insert SIGNAL may_alter WAIT_FOR bf_abort';
+INSERT INTO t1_fk VALUES (1, 1);
+connection node_1;
+SET DEBUG_SYNC = 'now WAIT_FOR may_alter';
+SET DEBUG_SYNC = 'lock_wait_end WAIT_FOR alter_continue';
+ALTER TABLE t1 ADD COLUMN c2 INT, ALGORITHM=INPLACE;
+connection con1;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+SET DEBUG_SYNC = 'now SIGNAL alter_continue';
+connection node_1;
+connection node_2;
+INSERT INTO t1 (c1, c2) VALUES (2, 2);
+connection node_1;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1_fk, t1;
+disconnect con1;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/r/galera_kill_applier.result b/mysql-test/suite/galera/r/galera_kill_applier.result
index a47f486b5fb..c0538212a5f 100644
--- a/mysql-test/suite/galera/r/galera_kill_applier.result
+++ b/mysql-test/suite/galera/r/galera_kill_applier.result
@@ -6,13 +6,13 @@ SELECT @@wsrep_slave_threads;
 1
 SET GLOBAL wsrep_slave_threads=2;
 KILL ID;
-Got one of the listed errors
+ERROR HY000: This is a high priority thread/query and cannot be killed without compromising the consistency of the cluster
 KILL QUERY ID;
-Got one of the listed errors
+ERROR HY000: This is a high priority thread/query and cannot be killed without compromising the consistency of the cluster
 KILL ID;
-Got one of the listed errors
+ERROR HY000: This is a high priority thread/query and cannot be killed without compromising the consistency of the cluster
 KILL QUERY ID;
-Got one of the listed errors
+ERROR HY000: This is a high priority thread/query and cannot be killed without compromising the consistency of the cluster
 SET GLOBAL wsrep_slave_threads=DEFAULT;
 connection node_1;
 create table t1(a int not null primary key) engine=innodb;
diff --git a/mysql-test/suite/galera/r/galera_kill_bf.result b/mysql-test/suite/galera/r/galera_kill_bf.result
new file mode 100644
index 00000000000..783ce7e09e4
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_kill_bf.result
@@ -0,0 +1,25 @@
+connection node_2;
+connection node_1;
+connect con1,127.0.0.1,root,,test,$NODE_MYPORT_1;
+call mtr.add_suppression("WSREP: ALTER TABLE isolation failure");
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT) ENGINE=InnoDB;
+INSERT into t1 values (1,1);
+SET DEBUG_SYNC = 'alter_table_after_open_tables SIGNAL bf_started WAIT_FOR bf_continue';
+ALTER TABLE t1 DROP COLUMN c2;;
+connection node_1;
+SET SESSION wsrep_sync_wait = 0;
+SET DEBUG_SYNC = 'now WAIT_FOR bf_started';
+KILL ID;
+ERROR HY000: This is a high priority thread/query and cannot be killed without compromising the consistency of the cluster
+KILL QUERY ID;
+ERROR HY000: This is a high priority thread/query and cannot be killed without compromising the consistency of the cluster
+connection node_1;
+SET DEBUG_SYNC = 'now SIGNAL bf_continue';
+connection con1;
+SET DEBUG_SYNC = 'RESET';
+SELECT * FROM t1;
+c1
+1
+connection node_1;
+DROP TABLE t1;
+disconnect con1;
diff --git a/mysql-test/suite/galera/t/MDEV-33064.test b/mysql-test/suite/galera/t/MDEV-33064.test
new file mode 100644
index 00000000000..704ed70ab56
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-33064.test
@@ -0,0 +1,57 @@
+#
+# MDEV-33064: ALTER INPLACE running TOI should abort a conflicting DML operation
+#
+# DDL operations may commit InnoDB transactions more than once during the execution.
+# In this case wsrep flag on trx object is cleared, which may cause wrong logic of
+# such operations afterwards (wsrep-related hooks are not run).
+# One of the consequences was that DDL operation couldn't abort a DML operation
+# holding conflicting locks.
+#
+# The fix: re-enable wsrep flag on trx restart if it's a part of a DDL operation.
+#
+
+--source include/galera_cluster.inc
+--source include/have_debug_sync.inc
+--source include/have_debug.inc
+
+--connect con1,127.0.0.1,root,,test,$NODE_MYPORT_1
+
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t1_fk(c1 INT PRIMARY KEY, c2 INT, INDEX (c2), FOREIGN KEY (c2) REFERENCES t1(c1)) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (1);
+
+--connection con1
+SET SESSION wsrep_retry_autocommit = 0;
+SET DEBUG_SYNC = 'ib_after_row_insert SIGNAL may_alter WAIT_FOR bf_abort';
+# INSERT also grabs FK-referenced table lock.
+--send
+  INSERT INTO t1_fk VALUES (1, 1);
+
+--connection node_1
+SET DEBUG_SYNC = 'now WAIT_FOR may_alter';
+SET DEBUG_SYNC = 'lock_wait_end WAIT_FOR alter_continue';
+# ALTER BF-aborts INSERT.
+--send
+  ALTER TABLE t1 ADD COLUMN c2 INT, ALGORITHM=INPLACE;
+
+--connection con1
+# INSERT gets BF-aborted.
+--error ER_LOCK_DEADLOCK
+--reap
+SET DEBUG_SYNC = 'now SIGNAL alter_continue';
+
+--connection node_1
+# ALTER succeeds.
+--reap
+
+--connection node_2
+# Sanity check that ALTER has been replicated.
+INSERT INTO t1 (c1, c2) VALUES (2, 2);
+
+# Cleanup.
+--connection node_1
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1_fk, t1;
+--disconnect con1
+--source include/galera_end.inc
diff --git a/mysql-test/suite/galera/t/galera_kill_applier.test b/mysql-test/suite/galera/t/galera_kill_applier.test
index 88ec55ed0c1..90c553a0591 100644
--- a/mysql-test/suite/galera/t/galera_kill_applier.test
+++ b/mysql-test/suite/galera/t/galera_kill_applier.test
@@ -17,21 +17,21 @@ SET GLOBAL wsrep_slave_threads=2;
 --let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep applier idle' LIMIT 1`
 
 --replace_result $applier_thread ID
---error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
+--error ER_KILL_DENIED_ERROR
 --eval KILL $applier_thread
 
 --replace_result $applier_thread ID
---error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
+--error ER_KILL_DENIED_ERROR
 --eval KILL QUERY $applier_thread
 
 --let $aborter_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep aborter idle' LIMIT 1`
 
 --replace_result $aborter_thread ID
---error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
+--error ER_KILL_DENIED_ERROR
 --eval KILL $aborter_thread
 
 --replace_result $aborter_thread ID
---error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
+--error ER_KILL_DENIED_ERROR
 --eval KILL QUERY $aborter_thread
 
 SET GLOBAL wsrep_slave_threads=DEFAULT;
diff --git a/mysql-test/suite/galera/t/galera_kill_bf.test b/mysql-test/suite/galera/t/galera_kill_bf.test
new file mode 100644
index 00000000000..ba588ab659d
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_kill_bf.test
@@ -0,0 +1,41 @@
+--source include/galera_cluster.inc
+--source include/have_debug_sync.inc
+--source include/have_debug.inc
+
+--connect con1,127.0.0.1,root,,test,$NODE_MYPORT_1
+
+call mtr.add_suppression("WSREP: ALTER TABLE isolation failure");
+
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT) ENGINE=InnoDB;
+INSERT into t1 values (1,1);
+
+SET DEBUG_SYNC = 'alter_table_after_open_tables SIGNAL bf_started WAIT_FOR bf_continue';
+--send ALTER TABLE t1 DROP COLUMN c2;
+
+--connection node_1
+SET SESSION wsrep_sync_wait = 0;
+SET DEBUG_SYNC = 'now WAIT_FOR bf_started';
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'debug sync point: alter_table_after_open_tables'
+--source include/wait_condition.inc
+
+--let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'debug sync point:%' LIMIT 1`
+
+--replace_result $applier_thread ID
+--error ER_KILL_DENIED_ERROR
+--eval KILL $applier_thread
+
+--replace_result $applier_thread ID
+--error ER_KILL_DENIED_ERROR
+--eval KILL QUERY $applier_thread
+
+--connection node_1
+SET DEBUG_SYNC = 'now SIGNAL bf_continue';
+
+--connection con1
+--reap
+SET DEBUG_SYNC = 'RESET';
+SELECT * FROM t1;
+
+--connection node_1
+DROP TABLE t1;
+--disconnect con1
diff --git a/mysql-test/suite/galera_3nodes/r/galera_duplicate_primary_value.result b/mysql-test/suite/galera_3nodes/r/galera_duplicate_primary_value.result
new file mode 100644
index 00000000000..c1d69efaf6f
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/r/galera_duplicate_primary_value.result
@@ -0,0 +1,68 @@
+connection node_2;
+connection node_1;
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connect node_1d, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connect node_1e, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connection node_1;
+CREATE TABLE t1(a int not null primary key auto_increment, b int) engine=innodb;
+INSERT INTO t1(b) VALUES (1);
+connection node_1c;
+begin;
+insert into t1 values (2,2);
+connection node_1d;
+begin;
+insert into t1 values (3,3);
+connection node_1a;
+SET GLOBAL DEBUG_DBUG='+d,wsrep_after_kill';
+connection node_2;
+insert into t1 values (2,6);
+connection node_1a;
+SET SESSION wsrep_sync_wait=0;
+SET DEBUG_SYNC='now WAIT_FOR wsrep_after_kill_reached';
+SET GLOBAL DEBUG_DBUG='';
+SET GLOBAL DEBUG_DBUG='+d,wsrep_after_kill_2';
+connection node_3;
+insert into t1 values (3,9);
+connection node_1a;
+SET DEBUG_SYNC='now WAIT_FOR wsrep_after_kill_reached_2';
+SET GLOBAL DEBUG_DBUG='';
+SET DEBUG_SYNC='now SIGNAL wsrep_after_kill_continue';
+connection node_1c;
+COMMIT;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_1a;
+SET GLOBAL DEBUG_DBUG='';
+SET DEBUG_SYNC='now SIGNAL wsrep_after_kill_continue_2';
+connection node_1d;
+COMMIT;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_2;
+SELECT * from t1;
+a	b
+1	1
+2	6
+3	9
+connection node_3;
+SELECT * from t1;
+a	b
+1	1
+2	6
+3	9
+connection node_1a;
+SET DEBUG_SYNC = reset;
+connection node_1e;
+set debug_sync = reset;
+connection node_1;
+SELECT * from t1;
+a	b
+1	1
+2	6
+3	9
+disconnect node_1a;
+disconnect node_1b;
+disconnect node_1c;
+disconnect node_1d;
+disconnect node_1e;
+drop table t1;
diff --git a/mysql-test/suite/galera_3nodes/t/MDEV-29171.test b/mysql-test/suite/galera_3nodes/t/MDEV-29171.test
index 1ce33bee974..9e35cd0e0d9 100644
--- a/mysql-test/suite/galera_3nodes/t/MDEV-29171.test
+++ b/mysql-test/suite/galera_3nodes/t/MDEV-29171.test
@@ -90,7 +90,7 @@ show variables like 'wsrep_gtid_domain_id';
 # If bug is present, node_3 remains on domain id 100
 #
 --connection node_3
---let $restart_parameters = --wsrep_sst_donor="node2"
+--let $restart_parameters = --wsrep_sst_donor=node2
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.3.expect
 --source include/start_mysqld.inc
 
diff --git a/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.cnf b/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.cnf
new file mode 100644
index 00000000000..862997d2afd
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.cnf
@@ -0,0 +1,19 @@
+!include ../galera_3nodes.cnf
+
+[mysqld.1]
+wsrep-debug=SERVER
+loose-wsrep-duplicate-primary-value=1
+wsrep-auto-increment-control=OFF
+auto-increment-offset=1
+
+[mysqld.2]
+wsrep-debug=SERVER
+loose-wsrep-duplicate-primary-value=1
+wsrep-auto-increment-control=OFF
+auto-increment-offset=1
+
+[mysqld.3]
+wsrep-debug=SERVER
+loose-wsrep-duplicate-primary-value=1
+wsrep-auto-increment-control=OFF
+auto-increment-offset=1
diff --git a/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.test b/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.test
new file mode 100644
index 00000000000..49ddb31d2d7
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.test
@@ -0,0 +1,81 @@
+--source include/galera_cluster.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/big_test.inc
+
+--let $galera_connection_name = node_3
+--let $galera_server_number = 3
+--source include/galera_connect.inc
+
+--connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
+--connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1
+--connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1
+--connect node_1d, 127.0.0.1, root, , test, $NODE_MYPORT_1
+--connect node_1e, 127.0.0.1, root, , test, $NODE_MYPORT_1
+
+--connection node_1
+CREATE TABLE t1(a int not null primary key auto_increment, b int) engine=innodb;
+INSERT INTO t1(b) VALUES (1);
+
+--connection node_1c
+begin;
+insert into t1 values (2,2);
+
+--connection node_1d
+begin;
+insert into t1 values (3,3);
+
+--connection node_1a
+SET GLOBAL DEBUG_DBUG='+d,wsrep_after_kill';
+
+--connection node_2
+insert into t1 values (2,6);
+
+--connection node_1a
+SET SESSION wsrep_sync_wait=0;
+SET DEBUG_SYNC='now WAIT_FOR wsrep_after_kill_reached';
+SET GLOBAL DEBUG_DBUG='';
+SET GLOBAL DEBUG_DBUG='+d,wsrep_after_kill_2';
+
+--connection node_3
+insert into t1 values (3,9);
+
+--connection node_1a
+SET DEBUG_SYNC='now WAIT_FOR wsrep_after_kill_reached_2';
+SET GLOBAL DEBUG_DBUG='';
+SET DEBUG_SYNC='now SIGNAL wsrep_after_kill_continue';
+
+--connection node_1c
+--error 1213
+COMMIT;
+
+--connection node_1a
+SET GLOBAL DEBUG_DBUG='';
+SET DEBUG_SYNC='now SIGNAL wsrep_after_kill_continue_2';
+
+--connection node_1d
+--error 1213
+COMMIT;
+
+--connection node_2
+SELECT * from t1;
+
+--connection node_3
+SELECT * from t1;
+
+--connection node_1a
+SET DEBUG_SYNC = reset;
+
+--connection node_1e
+set debug_sync = reset;
+
+--connection node_1
+SELECT * from t1;
+
+--disconnect node_1a
+--disconnect node_1b
+--disconnect node_1c
+--disconnect node_1d
+--disconnect node_1e
+
+drop table t1;
diff --git a/mysql-test/suite/innodb/r/alter_copy.result b/mysql-test/suite/innodb/r/alter_copy.result
index 72ae28e9652..f9151409a44 100644
--- a/mysql-test/suite/innodb/r/alter_copy.result
+++ b/mysql-test/suite/innodb/r/alter_copy.result
@@ -186,6 +186,11 @@ t1	CREATE TABLE `t1` (
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
+SET GLOBAL innodb_doublewrite=ON;
+SELECT @@GLOBAL.innodb_doublewrite "OFF expected";
+OFF expected
+OFF
+SET GLOBAL innodb_buf_flush_list_now=ON;
 # restart
 FTS_INDEX_1.ibd
 FTS_INDEX_2.ibd
diff --git a/mysql-test/suite/innodb/r/deadlock_detect.result b/mysql-test/suite/innodb/r/deadlock_detect.result
index 8131585aea2..284556e56c9 100644
--- a/mysql-test/suite/innodb/r/deadlock_detect.result
+++ b/mysql-test/suite/innodb/r/deadlock_detect.result
@@ -3,7 +3,12 @@ CREATE TABLE t1(
 id	INT,
 PRIMARY KEY(id)
 ) ENGINE=InnoDB;
+CREATE TABLE dl(
+id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, 
+cnt INT UNSIGNED
+) ENGINE=InnoDB;
 INSERT INTO t1 VALUES(1), (2), (3);
+INSERT INTO dl(cnt) SELECT variable_value FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_deadlocks';
 BEGIN;
 SELECT * FROM t1 WHERE id = 1 LOCK IN SHARE MODE;
 connect  con1,localhost,root,,;
@@ -20,5 +25,8 @@ disconnect con1;
 ROLLBACK;
 disconnect con2;
 connection default;
+'Deadlock counter is valid';
+1
 ROLLBACK;
 DROP TABLE t1;
+DROP TABLE dl;
diff --git a/mysql-test/suite/innodb/r/innodb_buffer_pool_fail.result b/mysql-test/suite/innodb/r/innodb_buffer_pool_fail.result
index 9879ef206f2..1a8f16e4efb 100644
--- a/mysql-test/suite/innodb/r/innodb_buffer_pool_fail.result
+++ b/mysql-test/suite/innodb/r/innodb_buffer_pool_fail.result
@@ -6,3 +6,4 @@ call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE faile
 # MDEV-25019 memory allocation failures during startup cause server failure in different, confusing ways
 #
 # restart: --debug_dbug=+d,ib_buf_chunk_init_fails
+FOUND 1 /\[ERROR\] InnoDB: Cannot allocate memory for the buffer pool/ in mysqld.1.err
diff --git a/mysql-test/suite/innodb/r/innodb_ctype_big5.result b/mysql-test/suite/innodb/r/innodb_ctype_big5.result
index 4c9f7a81cc3..bba6d4b82e4 100644
--- a/mysql-test/suite/innodb/r/innodb_ctype_big5.result
+++ b/mysql-test/suite/innodb/r/innodb_ctype_big5.result
@@ -100,20 +100,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'big5_chinese_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'big5_chinese_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'big5_chinese_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -237,20 +237,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'big5_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'big5_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'big5_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'big5_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'big5_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/suite/innodb/r/innodb_ctype_latin1.result b/mysql-test/suite/innodb/r/innodb_ctype_latin1.result
index d576f210d5a..c70c50ff3ef 100644
--- a/mysql-test/suite/innodb/r/innodb_ctype_latin1.result
+++ b/mysql-test/suite/innodb/r/innodb_ctype_latin1.result
@@ -100,20 +100,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin1_swedish_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin1_swedish_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin1_swedish_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -237,20 +237,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'latin1_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'latin1_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'latin1_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'latin1_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'latin1_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/suite/innodb/r/innodb_ctype_utf8.result b/mysql-test/suite/innodb/r/innodb_ctype_utf8.result
index d817af2735c..e811409e997 100644
--- a/mysql-test/suite/innodb/r/innodb_ctype_utf8.result
+++ b/mysql-test/suite/innodb/r/innodb_ctype_utf8.result
@@ -100,20 +100,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_general_nopad_ci' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_general_nopad_ci' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_general_nopad_ci' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_general_nopad_ci', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
@@ -237,20 +237,20 @@ DROP TABLE t1;
 #
 # IF, CASE, LEAST
 #
-SELECT IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad');
-IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad')
+SELECT IF('abc' COLLATE 'utf8_nopad_bin' = 'abc ', 'pad', 'nopad') as exp;
+exp
 nopad
-SELECT CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE 'abc' COLLATE 'utf8_nopad_bin' WHEN 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END;
-CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END
+SELECT CASE WHEN 'abc' COLLATE 'utf8_nopad_bin' = 'abc ' THEN 'pad' ELSE 'nopad' END as exp;
+exp
 nopad
-SELECT HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '));
-HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '))
+SELECT HEX(LEAST('abc ' COLLATE 'utf8_nopad_bin', 'abc  ')) as exp;
+exp
 61626320
-SELECT HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '));
-HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  '))
+SELECT HEX(GREATEST('abc ' COLLATE 'utf8_nopad_bin', 'abc  ')) as exp;
+exp
 6162632020
 #
 # Collation mix
diff --git a/mysql-test/suite/innodb/r/lock_isolation.result b/mysql-test/suite/innodb/r/lock_isolation.result
index 31843266617..1ddb9deb24c 100644
--- a/mysql-test/suite/innodb/r/lock_isolation.result
+++ b/mysql-test/suite/innodb/r/lock_isolation.result
@@ -103,6 +103,27 @@ SELECT * FROM t;
 a	b
 10	1
 10	20
+TRUNCATE TABLE t;
+#
+# MDEV-34108 Inappropriate semi-consistent read in snapshot isolation
+#
+INSERT INTO t VALUES(NULL, 1), (1, 1);
+BEGIN;
+UPDATE t SET b = 3;
+connection consistent;
+SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+UPDATE t SET b = 2 WHERE a;
+connection default;
+UPDATE t SET a = 1;
+COMMIT;
+connection consistent;
+COMMIT;
+connection default;
+SELECT * FROM t;
+a	b
+1	2
+1	2
 DROP TABLE t;
 #
 # MDEV-33802 Weird read view after ROLLBACK of other transactions
diff --git a/mysql-test/suite/innodb/r/log_file.result b/mysql-test/suite/innodb/r/log_file.result
index f5e98d30b30..19789f42768 100644
--- a/mysql-test/suite/innodb/r/log_file.result
+++ b/mysql-test/suite/innodb/r/log_file.result
@@ -287,7 +287,20 @@ WHERE engine='innodb'
 AND support IN ('YES', 'DEFAULT', 'ENABLED');
 1
 1
-# restart
+# restart: --innodb-log-write-ahead-size=513
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+# restart: --innodb-log-write-ahead-size=4095
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+# restart: --innodb-log-write-ahead-size=10000
+SELECT @@innodb_log_write_ahead_size;
+@@innodb_log_write_ahead_size
+4096
 # Cleanup
 bak_ib_logfile0
 bak_ibdata1
diff --git a/mysql-test/suite/innodb/r/log_file_overwrite.result b/mysql-test/suite/innodb/r/log_file_overwrite.result
new file mode 100644
index 00000000000..58aa4a32bdb
--- /dev/null
+++ b/mysql-test/suite/innodb/r/log_file_overwrite.result
@@ -0,0 +1,21 @@
+call mtr.add_suppression("InnoDB: Plugin initialization aborted");
+call mtr.add_suppression("plugin 'InnoDB' registration as a STORAGE ENGINE failed.");
+CREATE TABLE t1(f1 INT NOT NULL, f2 TEXT)ENGINE=InnoDB;
+# restart: --debug_dbug=+d,ib_log_checkpoint_avoid_hard --innodb_flush_sync=0
+INSERT INTO t1 SELECT seq, repeat('a', 4000) FROM seq_1_to_1800;
+# restart: --debug_dbug=+d,before_final_redo_apply --innodb_log_file_size=8M
+# restart: --innodb_log_file_size=10M
+#
+# MDEV-34519 innodb_log_checkpoint_now crashes when
+#              innodb_read_only is enabled
+#
+# restart: --innodb-force-recovery=6
+SET GLOBAL innodb_log_checkpoint_now=1;
+Warnings:
+Warning	138	InnoDB doesn't force checkpoint when innodb-force-recovery=6.
+# restart: --innodb-read-only=1
+SET GLOBAL innodb_log_checkpoint_now=1;
+Warnings:
+Warning	138	InnoDB doesn't force checkpoint when innodb-read-only=1.
+# restart
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/alter_copy.test b/mysql-test/suite/innodb/t/alter_copy.test
index 90f2171d10b..7592d6c37d6 100644
--- a/mysql-test/suite/innodb/t/alter_copy.test
+++ b/mysql-test/suite/innodb/t/alter_copy.test
@@ -87,6 +87,10 @@ SELECT * FROM t1 WHERE MATCH(b,c) AGAINST ('column');
 SHOW CREATE TABLE t1;
 CHECK TABLE t1;
 
+SET GLOBAL innodb_doublewrite=ON;
+SELECT @@GLOBAL.innodb_doublewrite "OFF expected";
+SET GLOBAL innodb_buf_flush_list_now=ON;
+
 --let $restart_parameters=
 --source include/restart_mysqld.inc
 --replace_regex /FTS_[0-9a-f]*_[0-9a-f]*/FTS/
diff --git a/mysql-test/suite/innodb/t/deadlock_detect.test b/mysql-test/suite/innodb/t/deadlock_detect.test
index e853790755a..a84e6fc328f 100644
--- a/mysql-test/suite/innodb/t/deadlock_detect.test
+++ b/mysql-test/suite/innodb/t/deadlock_detect.test
@@ -14,7 +14,14 @@ CREATE TABLE t1(
 	PRIMARY KEY(id)
 ) ENGINE=InnoDB;
 
+CREATE TABLE dl(
+    id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, 
+    cnt INT UNSIGNED
+) ENGINE=InnoDB;
+
 INSERT INTO t1 VALUES(1), (2), (3);
+# Preserve the initial value of the deadlock counter
+INSERT INTO dl(cnt) SELECT variable_value FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_deadlocks';
 
 # We are not interested query results, only errors
 --disable_result_log
@@ -61,6 +68,7 @@ disconnect con2;
 # and does the update.
 #
 connection default;
+--let $valid_deadlock_cnt= 1
 if (!$have_deadlock) {
 --error 0,ER_LOCK_WAIT_TIMEOUT
 reap;
@@ -68,12 +76,21 @@ reap;
 if ($have_deadlock) {
 --error 0,ER_LOCK_DEADLOCK
 reap;
+--disable_query_log
+INSERT INTO dl(cnt) SELECT variable_value FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_deadlocks';
+set @init_deadlock_cnt = (SELECT min(k.cnt) FROM dl k);
+--let $valid_deadlock_cnt= `SELECT (max(t.cnt-@init_deadlock_cnt) = 1) FROM dl t`
+--enable_query_log
 }
+# Indicates that the deadlock counter works well.
+# Use the default =1 where is no deadlock detection,
+# to enable unconditional check.
+--echo 'Deadlock counter is valid';
+--echo $valid_deadlock_cnt
 
 ROLLBACK;
 
 --enable_result_log
-
 DROP TABLE t1;
-
+DROP TABLE dl;
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/innodb_buffer_pool_fail.test b/mysql-test/suite/innodb/t/innodb_buffer_pool_fail.test
index 1d938e12e78..e8e070c5061 100644
--- a/mysql-test/suite/innodb/t/innodb_buffer_pool_fail.test
+++ b/mysql-test/suite/innodb/t/innodb_buffer_pool_fail.test
@@ -7,5 +7,8 @@ call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE faile
 --echo #
 --echo # MDEV-25019 memory allocation failures during startup cause server failure in different, confusing ways
 --echo #
-let restart_parameters=--debug_dbug="+d,ib_buf_chunk_init_fails";
+let restart_parameters=--debug_dbug=+d,ib_buf_chunk_init_fails;
 --source include/restart_mysqld.inc
+let SEARCH_FILE = $MYSQLTEST_VARDIR/log/mysqld.1.err;
+let SEARCH_PATTERN=\[ERROR\] InnoDB: Cannot allocate memory for the buffer pool;
+--source include/search_pattern_in_file.inc
diff --git a/mysql-test/suite/innodb/t/lock_isolation.test b/mysql-test/suite/innodb/t/lock_isolation.test
index 5c60f6e707c..4e44cea8c2e 100644
--- a/mysql-test/suite/innodb/t/lock_isolation.test
+++ b/mysql-test/suite/innodb/t/lock_isolation.test
@@ -103,6 +103,40 @@ COMMIT;
 --reap
 COMMIT;
 
+--connection default
+SELECT * FROM t;
+TRUNCATE TABLE t;
+
+--echo #
+--echo # MDEV-34108 Inappropriate semi-consistent read in snapshot isolation
+--echo #
+INSERT INTO t VALUES(NULL, 1), (1, 1);
+BEGIN;
+UPDATE t SET b = 3;
+
+--connection consistent
+SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+# As semi-consistent read is disabled for innodb_snapshot_isolation=ON, the
+# following UPDATE must be blocked on the first record.
+--send UPDATE t SET b = 2 WHERE a
+
+--connection default
+let $wait_condition=
+  select count(*) = 1 from information_schema.processlist
+  where state = 'Updating' and info = 'UPDATE t SET b = 2 WHERE a';
+--source include/wait_condition.inc
+
+UPDATE t SET a = 1;
+COMMIT;
+--connection consistent
+# If the bug wouldn't be fixed, the result would be (1,3),(1,2), because
+# "UPDATE t SET b = 2 WHERE a" would be blocked on the second (1,3) record,
+# as semi-consistent read would filter out the first (null,3) record without
+# blocking.
+--reap
+COMMIT;
+
 --connection default
 SELECT * FROM t;
 DROP TABLE t;
diff --git a/mysql-test/suite/innodb/t/log_file.test b/mysql-test/suite/innodb/t/log_file.test
index 805a4b4cd56..7ff0de0fc01 100644
--- a/mysql-test/suite/innodb/t/log_file.test
+++ b/mysql-test/suite/innodb/t/log_file.test
@@ -210,8 +210,20 @@ eval $check_no_innodb;
 eval $check_yes_innodb;
 --source include/shutdown_mysqld.inc
 
---let $restart_parameters=
+--let $restart_parameters=--innodb-log-write-ahead-size=513
 --source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+
+--let $restart_parameters=--innodb-log-write-ahead-size=4095
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+
+# this will be silently truncated to the maximum
+--let $restart_parameters=--innodb-log-write-ahead-size=10000
+--source include/start_mysqld.inc
+SELECT @@innodb_log_write_ahead_size;
 
 --echo # Cleanup
 --list_files $bugdir
diff --git a/mysql-test/suite/innodb/t/log_file_overwrite.test b/mysql-test/suite/innodb/t/log_file_overwrite.test
new file mode 100644
index 00000000000..b6ee84a169c
--- /dev/null
+++ b/mysql-test/suite/innodb/t/log_file_overwrite.test
@@ -0,0 +1,31 @@
+--source include/have_innodb.inc
+--source include/have_sequence.inc
+--source include/have_debug.inc
+
+call mtr.add_suppression("InnoDB: Plugin initialization aborted");
+call mtr.add_suppression("plugin 'InnoDB' registration as a STORAGE ENGINE failed.");
+CREATE TABLE t1(f1 INT NOT NULL, f2 TEXT)ENGINE=InnoDB;
+let $restart_parameters=--debug_dbug=+d,ib_log_checkpoint_avoid_hard --innodb_flush_sync=0;
+--source include/restart_mysqld.inc
+INSERT INTO t1 SELECT seq, repeat('a', 4000) FROM seq_1_to_1800;
+let $restart_parameters=--debug_dbug=+d,before_final_redo_apply --innodb_log_file_size=8M;
+let $shutdown_timeout=0;
+--source include/restart_mysqld.inc
+let $restart_parameters=--innodb_log_file_size=10M;
+let $shutdown_timeout=;
+--source include/restart_mysqld.inc
+
+--echo #
+--echo # MDEV-34519 innodb_log_checkpoint_now crashes when
+--echo #              innodb_read_only is enabled
+--echo #
+--let $restart_parameters=--innodb-force-recovery=6
+--source include/restart_mysqld.inc
+SET GLOBAL innodb_log_checkpoint_now=1;
+--let $restart_parameters=--innodb-read-only=1
+--source include/restart_mysqld.inc
+SET GLOBAL innodb_log_checkpoint_now=1;
+let $restart_parameters=;
+--source include/restart_mysqld.inc
+
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/recovery_memory.test b/mysql-test/suite/innodb/t/recovery_memory.test
index 145b39d56f6..241e56af248 100644
--- a/mysql-test/suite/innodb/t/recovery_memory.test
+++ b/mysql-test/suite/innodb/t/recovery_memory.test
@@ -33,7 +33,7 @@ DROP PROCEDURE dorepeat;
 --echo #
 if ($have_debug) {
 SET DEBUG_DBUG="+d,ib_log_checkpoint_avoid_hard";
-let $restart_parameters=--innodb_buffer_pool_size=5242880 --debug_dbug="+d,ibuf_init_corrupt";
+let $restart_parameters=--innodb_buffer_pool_size=5242880 --debug_dbug=+d,hdr_page_corrupt;
 }
 if (!$have_debug) {
 --echo SET DEBUG_DBUG="+d,ib_log_checkpoint_avoid_hard";
diff --git a/mysql-test/suite/innodb_gis/r/precise.result b/mysql-test/suite/innodb_gis/r/precise.result
index 6cc0368fbb4..a3fd4b1a480 100644
--- a/mysql-test/suite/innodb_gis/r/precise.result
+++ b/mysql-test/suite/innodb_gis/r/precise.result
@@ -456,30 +456,26 @@ dist	buffer	buf_area
 -1	POLYGON	16.00
 SELECT ST_CONTAINS(
 GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)'));
-ST_CONTAINS(
-GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)'))
+GeomFromText('POINT(5 10)')) as geom;
+geom
 0
 SELECT AsText(ST_UNION(
 GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)')));
-AsText(ST_UNION(
-GeomFromText('MULTIPOLYGON(((0 0, 0 5, 5 5, 5 0, 0 0)),((6 6, 6 11, 11 11, 11 6, 6 6)))'),
-GeomFromText('POINT(5 10)')))
+GeomFromText('POINT(5 10)'))) as geom;
+geom
 GEOMETRYCOLLECTION(POLYGON((0 0,0 5,5 5,5 0,0 0)),POLYGON((6 6,6 11,11 11,11 6,6 6)),POINT(5 10))
 DROP PROCEDURE p1;
 #
 # Bug #13833019 ASSERTION `T1->RESULT_RANGE' FAILED IN GCALC_OPERATION_REDUCER::END_COUPLE
 #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3));
-GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3))
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((0 0,9 4,3 3,0 0)),((2 2,2 2,8 8,2 3,2 2)))'), 3)) as geom;
+geom
 POLYGON
 #
 # Bug #13832749 	HANDLE_FATAL_SIGNAL IN GCALC_FUNCTION::COUNT_INTERNAL
 #
-SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1));
-GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1))
+SELECT GeometryType(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2), (4 4,4 6,6 6,6 4,4 4)), ((9 9,8 1,1 5,9 9)))'),1)) as geom;
+geom
 POLYGON
 #
 # Bug#13358363 - ASSERTION: N > 0 && N < SINUSES_CALCULATED*2+1 | GET_N_SINCOS/ADD_EDGE_BUFFER
@@ -490,25 +486,19 @@ Warning	1292	Truncated incorrect DOUBLE value: ''
 SELECT ST_WITHIN(
 LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
 ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) '))));
-ST_WITHIN(
-LINESTRINGFROMTEXT(' LINESTRING(3 8,9 2,3 8,3 3,7 6,4 7,4 7,8 1) '),
-ST_BUFFER(MULTIPOLYGONFROMTEXT(' MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5)),((2 2,2 8,8 8,8 2,2 2),(4 4,4 6,6 6,6 4,4 4)),((0 5,3 5,3 2,1 2,1 1,3 1,3 0,0 0,0 3,2 3,2 4,0 4,0 5))) ')
+ST_NUMINTERIORRINGS(POLYGONFROMTEXT('POLYGON((3 5,2 4,2 5,3 5)) ')))) as st;
+st
 0
 SELECT ST_DIMENSION(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((3 5,2 5,2 4,3 4,3 5)) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))'))));
-ST_DIMENSION(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((3 5,2 5,2 4,3 4,3 5)) '),
-ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))'))))
+ST_NUMINTERIORRINGS(POLYGONFROMTEXT(' POLYGON((0 0,9 3,4 2,0 0))')))) as st;
+st
 2
 SELECT ST_NUMINTERIORRINGS(
 ST_ENVELOPE(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5))) '),
-SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) ')))));
-ST_NUMINTERIORRINGS(
-ST_ENVELOPE(ST_BUFFER(MULTIPOLYGONFROMTEXT('MULTIPOLYGON(((3 5,2 5,2 4,3 4,3 5))) '),
-SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) ')))))
+SRID(MULTILINESTRINGFROMTEXT('MULTILINESTRING((2 2,4 2,1 2,2 4,2 2)) '))))) as st;
+st
 0
 SELECT ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
-SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))));
-ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
-SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))))
+SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) ')))) as st;
+st
 POLYGON((9 9,5 2,4 5,9 9))
diff --git a/mysql-test/suite/mariabackup/full_backup.test b/mysql-test/suite/mariabackup/full_backup.test
index 385f3b8785d..d3d3661ce6c 100644
--- a/mysql-test/suite/mariabackup/full_backup.test
+++ b/mysql-test/suite/mariabackup/full_backup.test
@@ -7,7 +7,9 @@ let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
 --let $backup_log=$MYSQLTEST_VARDIR/tmp/backup.log
 
 --disable_result_log
-exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir --parallel=10 > $backup_log 2>&1;
+--error 1
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir --parallel=10 --innodb-log-write-ahead-size=4095 > $backup_log 2>&1;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir --parallel=10 --innodb-log-write-ahead-size=10000 > $backup_log 2>&1;
 --enable_result_log
 
 # The following warning must not appear after MDEV-27343 fix
diff --git a/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test b/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.inc
similarity index 100%
rename from mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test
rename to mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.inc
diff --git a/mysql-test/suite/rpl/include/rpl_charset.test b/mysql-test/suite/rpl/include/rpl_charset.inc
similarity index 100%
rename from mysql-test/suite/rpl/include/rpl_charset.test
rename to mysql-test/suite/rpl/include/rpl_charset.inc
diff --git a/mysql-test/suite/rpl/include/rpl_extra_col_master.test b/mysql-test/suite/rpl/include/rpl_extra_col_master.inc
similarity index 100%
rename from mysql-test/suite/rpl/include/rpl_extra_col_master.test
rename to mysql-test/suite/rpl/include/rpl_extra_col_master.inc
diff --git a/mysql-test/suite/rpl/r/rpl_change_master_demote.result b/mysql-test/suite/rpl/r/rpl_change_master_demote.result
index 5deb412c91b..48693807bc2 100644
--- a/mysql-test/suite/rpl/r/rpl_change_master_demote.result
+++ b/mysql-test/suite/rpl/r/rpl_change_master_demote.result
@@ -500,6 +500,9 @@ START SLAVE UNTIL master_gtid_pos="ssu_middle_binlog_pos";
 Warnings:
 Note	1278	It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mariadbd restart
 # Slave needs time to start and stop automatically
+# Waiting for both SQL and IO threads to have started..
+# Waiting for SQL thread to be killed..
+# Waiting for IO thread to be killed..
 # Validating neither SQL nor IO threads are running..
 # ..success
 # Clean slave state of master
diff --git a/mysql-test/suite/rpl/r/rpl_mdev382.result b/mysql-test/suite/rpl/r/rpl_mdev382.result
index e302c45322b..b3488da7cc9 100644
--- a/mysql-test/suite/rpl/r/rpl_mdev382.result
+++ b/mysql-test/suite/rpl/r/rpl_mdev382.result
@@ -355,7 +355,7 @@ a`
 show binlog events in 'master-bin.000002' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Gtid	1	#	GTID #-#-#
-master-bin.000002	#	Query	1	#	DELETE FROM `db1``; select 'oops!'`.`t``1`
+master-bin.000002	#	Query	1	#	TRUNCATE TABLE `db1``; select 'oops!'`.`t``1`
 connection slave;
 include/start_slave.inc
 connection master;
diff --git a/mysql-test/suite/rpl/r/rpl_memory_engine_truncate_on_restart.result b/mysql-test/suite/rpl/r/rpl_memory_engine_truncate_on_restart.result
new file mode 100644
index 00000000000..11543e711f9
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_memory_engine_truncate_on_restart.result
@@ -0,0 +1,39 @@
+include/master-slave.inc
+[connection master]
+connection master;
+create table t (val int) engine=MEMORY;
+# DELETE trigger should never be activated
+create trigger tr after delete on t for each row update t2 set val = 1;
+insert into t values (1),(2);
+include/save_master_gtid.inc
+connection slave;
+include/sync_with_master_gtid.inc
+# Check pre-restart values
+include/diff_tables.inc [master:test.t,slave:test.t]
+# Restarting master should empty master and slave `t`
+connection master;
+include/rpl_restart_server.inc [server_number=1]
+connection master;
+# Validating MEMORY table on master is empty after restart
+# MYSQL_BINLOG datadir/binlog_file --result-file=assert_file
+include/assert_grep.inc [Query to truncate the MEMORY table should be the contents of the new event]
+# Ensuring slave MEMORY table is empty
+connection master;
+include/save_master_gtid.inc
+connection slave;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [master:test.t,slave:test.t]
+# Ensure new events replicate correctly
+connection master;
+insert into t values (3),(4);
+include/save_master_gtid.inc
+connection slave;
+include/sync_with_master_gtid.inc
+# Validate values on slave, after master restart, do not include those inserted previously
+include/diff_tables.inc [master:test.t,slave:test.t]
+#
+# Cleanup
+connection master;
+drop table t;
+include/rpl_end.inc
+# End of rpl_memory_engine_truncate_on_restart.test
diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_fail_over.result b/mysql-test/suite/rpl/r/rpl_semi_sync_fail_over.result
index b881f69ad8a..b751c0873fa 100644
--- a/mysql-test/suite/rpl/r/rpl_semi_sync_fail_over.result
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync_fail_over.result
@@ -50,7 +50,7 @@ on slave must be 2
 SELECT @@GLOBAL.gtid_current_pos;
 @@GLOBAL.gtid_current_pos
 0-1-4
-# restart: --skip-slave-start=1 --rpl-semi-sync-slave-enabled=1
+# restart: --skip-slave-start=1 --rpl-semi-sync-slave-enabled=1 --init-rpl-role=SLAVE
 connection server_1;
 # Ensuring variable rpl_semi_sync_slave_enabled is ON..
 # Ensuring status rpl_semi_sync_slave_status is OFF..
@@ -136,7 +136,7 @@ on slave must be 5
 SELECT @@GLOBAL.gtid_current_pos;
 @@GLOBAL.gtid_current_pos
 0-2-7
-# restart: --skip-slave-start=1 --rpl-semi-sync-slave-enabled=1
+# restart: --skip-slave-start=1 --rpl-semi-sync-slave-enabled=1 --init-rpl-role=SLAVE
 connection server_2;
 # Ensuring variable rpl_semi_sync_slave_enabled is ON..
 # Ensuring status rpl_semi_sync_slave_status is OFF..
@@ -221,7 +221,7 @@ on slave must be 7
 SELECT @@GLOBAL.gtid_current_pos;
 @@GLOBAL.gtid_current_pos
 0-1-9
-# restart: --skip-slave-start=1 --rpl-semi-sync-slave-enabled=1
+# restart: --skip-slave-start=1 --rpl-semi-sync-slave-enabled=1 --init-rpl-role=SLAVE
 connection server_1;
 # Ensuring variable rpl_semi_sync_slave_enabled is ON..
 # Ensuring status rpl_semi_sync_slave_status is OFF..
diff --git a/mysql-test/suite/rpl/r/rpl_slave_restart_long_password.result b/mysql-test/suite/rpl/r/rpl_slave_restart_long_password.result
new file mode 100644
index 00000000000..52686c1b6ee
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_slave_restart_long_password.result
@@ -0,0 +1,28 @@
+include/master-slave.inc
+[connection master]
+include/assert.inc [Password length is 96]
+connection master;
+SET SQL_LOG_BIN=0;
+GRANT REPLICATION SLAVE ON *.* TO rpl@127.0.0.1 IDENTIFIED BY '123456789X12141618202224262830323436384042444648505254565860626466687072747678808284868890929496';
+SET SQL_LOG_BIN=1;
+connection slave;
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', master_user='rpl', master_password='123456789X12141618202224262830323436384042444648505254565860626466687072747678808284868890929496';
+include/start_slave.inc
+include/check_slave_param.inc [Slave_IO_Running]
+connection master;
+include/rpl_restart_server.inc [server_number=2]
+connection slave;
+include/start_slave.inc
+include/check_slave_param.inc [Slave_IO_Running]
+connection master;
+SET SQL_LOG_BIN=0;
+DROP USER rpl@127.0.0.1;
+FLUSH PRIVILEGES;
+SET SQL_LOG_BIN=1;
+connection slave;
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER = 'root', MASTER_PASSWORD = '';
+include/start_slave.inc
+connection master;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result
index b6c28458561..a62b02b2f44 100644
--- a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result
+++ b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result
@@ -64,7 +64,10 @@ connection server_2;
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 domain_id	seq_no
 0	12
+connection server_1;
+include/save_master_gtid.inc
 connection server_3;
+include/sync_with_master_gtid.inc
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 domain_id	seq_no
 0	12
@@ -77,6 +80,7 @@ select @@slave_parallel_threads;
 @@slave_parallel_threads
 0
 connection server_4;
+include/sync_with_master_gtid.inc
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 domain_id	seq_no
 0	12
diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result b/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
index 39b98042e10..12706f724b8 100644
--- a/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
@@ -52,6 +52,7 @@ master-bin.000001	#	Query	1	#	use `test`; create table t3( a int primary key, b
 # let's stop at first CA processing (in process_commit_alter)
 connection slave;
 include/sync_with_master_gtid.inc
+# wait for CA_1 waiting itself
 connect extra_slave,127.0.0.1,root,,test,$SLAVE_MYPORT;
 stop slave;;
 connection slave;
diff --git a/mysql-test/suite/rpl/t/rpl_change_master_demote.test b/mysql-test/suite/rpl/t/rpl_change_master_demote.test
index 6304d3526d1..9754b03f1cc 100644
--- a/mysql-test/suite/rpl/t/rpl_change_master_demote.test
+++ b/mysql-test/suite/rpl/t/rpl_change_master_demote.test
@@ -276,14 +276,27 @@ SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHER
 --echo # binlog position and should still succeed despite the SSU stop
 --echo # position pointing to a previous event (because
 --echo # master_demote_to_slave=1 merges gtid_binlog_pos into gtid_slave_pos).
+
+--let $pre_start_slave_thread_count= query_get_value(SHOW STATUS LIKE 'Connections', Value, 1)
+
 --replace_result $ssu_middle_binlog_pos ssu_middle_binlog_pos
 eval START SLAVE UNTIL master_gtid_pos="$ssu_middle_binlog_pos";
 
 --echo # Slave needs time to start and stop automatically
-# Note sync_with_master_gtid.inc, wait_for_slave_to_start.inc, and
-# wait_for_slave_to_stop.inc won't work due to replication state and race
-# conditions
---sleep 1
+--echo # Waiting for both SQL and IO threads to have started..
+--let $expected_cons_after_start_slave= `SELECT ($pre_start_slave_thread_count + 2)`
+--let $status_var= Connections
+--let $status_var_value= $expected_cons_after_start_slave
+--let $status_var_comparsion= >=
+--source include/wait_for_status_var.inc
+--let $status_var_comparsion=
+
+--echo # Waiting for SQL thread to be killed..
+--let $wait_condition= SELECT count(*)=0 from information_schema.PROCESSLIST where COMMAND="Slave_SQL"
+--source include/wait_condition.inc
+--echo # Waiting for IO thread to be killed..
+--let $wait_condition= SELECT count(*)=0 from information_schema.PROCESSLIST where COMMAND="Slave_IO"
+--source include/wait_condition.inc
 
 --echo # Validating neither SQL nor IO threads are running..
 --let $io_state= query_get_value("SHOW SLAVE STATUS", Slave_IO_State, 1)
diff --git a/mysql-test/suite/rpl/t/rpl_charset.test b/mysql-test/suite/rpl/t/rpl_charset.test
index 31ea2bc8f07..13737854d31 100644
--- a/mysql-test/suite/rpl/t/rpl_charset.test
+++ b/mysql-test/suite/rpl/t/rpl_charset.test
@@ -1,2 +1,2 @@
 let $engine_type=myisam;
-source include/rpl_charset.test;
+source include/rpl_charset.inc;
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
index 63ae0fce9ba..f0820c7d6e7 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
@@ -6,6 +6,6 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'InnoDB';
---source include/rpl_extra_col_master.test
+--source include/rpl_extra_col_master.inc
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
index 72a35992fe5..51242ab93b5 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
@@ -5,6 +5,6 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'MyISAM';
---source include/rpl_extra_col_master.test
+--source include/rpl_extra_col_master.inc
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_memory_engine_truncate_on_restart.test b/mysql-test/suite/rpl/t/rpl_memory_engine_truncate_on_restart.test
new file mode 100644
index 00000000000..a6e0b39ca85
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_memory_engine_truncate_on_restart.test
@@ -0,0 +1,82 @@
+#
+#   This test ensures that a table with engine=memory is kept consistent with
+# the slave when the master restarts. That is, when the master is restarted, it
+# should binlog a new TRUNCATE TABLE command for tables with MEMORY engines,
+# such that after the slave executes these events, its MEMORY-engine tables
+# should be empty.
+#
+# References:
+#   MDEV-25607: Auto-generated DELETE from HEAP table can break replication
+#
+--source include/master-slave.inc
+
+--connection master
+create table t (val int) engine=MEMORY;
+
+-- echo # DELETE trigger should never be activated
+create trigger tr after delete on t for each row update t2 set val = 1;
+
+insert into t values (1),(2);
+--source include/save_master_gtid.inc
+--connection slave
+--source include/sync_with_master_gtid.inc
+
+-- echo # Check pre-restart values
+--let $diff_tables= master:test.t,slave:test.t
+--source include/diff_tables.inc
+
+--echo # Restarting master should empty master and slave `t`
+--connection master
+--let $seq_no_before_restart= `SELECT REGEXP_REPLACE(@@global.gtid_binlog_pos, "0-1-", "")`
+--let $rpl_server_number= 1
+--source include/rpl_restart_server.inc
+
+--connection master
+--echo # Validating MEMORY table on master is empty after restart
+--let $table_size= `select count(*) from t`
+if ($table_size)
+{
+  --echo # MEMORY table is not empty
+  --die MEMORY table is not empty
+}
+--let $seq_no_after_restart= `SELECT REGEXP_REPLACE(@@global.gtid_binlog_pos, "0-1-", "")`
+if ($seq_no_before_restart == $seq_no_after_restart)
+{
+  --echo # Event to empty MEMORY table was not binlogged
+  --die Event to empty MEMORY table was not binlogged
+}
+
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $datadir=`select @@datadir`
+--let assert_file= $MYSQLTEST_VARDIR/tmp/binlog_decoded.out
+--echo # MYSQL_BINLOG datadir/binlog_file --result-file=assert_file
+--exec $MYSQL_BINLOG $datadir/$binlog_file --result-file=$assert_file
+
+--let assert_text= Query to truncate the MEMORY table should be the contents of the new event
+--let assert_count= 1
+--let assert_select= TRUNCATE TABLE
+--source include/assert_grep.inc
+
+--echo # Ensuring slave MEMORY table is empty
+--connection master
+--source include/save_master_gtid.inc
+--connection slave
+--source include/sync_with_master_gtid.inc
+--source include/diff_tables.inc
+
+--echo # Ensure new events replicate correctly
+--connection master
+insert into t values (3),(4);
+--source include/save_master_gtid.inc
+--connection slave
+--source include/sync_with_master_gtid.inc
+
+--echo # Validate values on slave, after master restart, do not include those inserted previously
+--source include/diff_tables.inc
+
+--echo #
+--echo # Cleanup
+--connection master
+drop table t;
+--source include/rpl_end.inc
+--echo # End of rpl_memory_engine_truncate_on_restart.test
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
index c4c89d9048b..cc104996852 100644
--- a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_mixed.inc
 --source include/master-slave.inc
 
---source include/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
index a4db32cf46e..8ea43a096fc 100644
--- a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
---source include/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_crash.inc b/mysql-test/suite/rpl/t/rpl_semi_sync_crash.inc
index 1bb5ff9fd4a..5207a55b281 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_crash.inc
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_crash.inc
@@ -74,7 +74,7 @@ source include/wait_for_slave_param.inc;
 
 SELECT @@GLOBAL.gtid_current_pos;
 
---let $restart_parameters=--skip-slave-start=1 --rpl-semi-sync-slave-enabled=1
+--let $restart_parameters=--skip-slave-start=1 --rpl-semi-sync-slave-enabled=1 --init-rpl-role=SLAVE
 --let $allow_rpl_inited=1
 --source include/start_mysqld.inc
 --connection server_$server_to_crash
diff --git a/mysql-test/suite/rpl/t/rpl_slave_restart_long_password.test b/mysql-test/suite/rpl/t/rpl_slave_restart_long_password.test
new file mode 100644
index 00000000000..e004777aa76
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_slave_restart_long_password.test
@@ -0,0 +1,80 @@
+#
+#  This test validates a fix for a bug where slaves only read the
+# first 41 characters of MASTER_PASSWORD from the master.info file
+# after restarts.
+#
+#  The test ensures that passwords up to the maximum allowable
+# length (96 ASCII characters) will be read from the master.info
+# file after slave restarts
+#
+# References:
+#  MDEV-23857: replication master password length
+#
+
+# Test is format independent, so only run with one format
+--source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
+
+
+#####
+# Setup
+#
+--let $passwd=123456789X12141618202224262830323436384042444648505254565860626466687072747678808284868890929496
+--let $expected_pwlen=96
+--let assert_cond=CHAR_LENGTH("$passwd")=$expected_pwlen
+--let assert_text=Password length is $expected_pwlen
+--source include/assert.inc
+
+connection master;
+SET SQL_LOG_BIN=0;
+--eval GRANT REPLICATION SLAVE ON *.* TO rpl@127.0.0.1 IDENTIFIED BY '$passwd'
+SET SQL_LOG_BIN=1;
+#####
+
+
+#####
+# Change master to new user/password combination
+#
+connection slave;
+--source include/stop_slave.inc
+--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', master_user='rpl', master_password='$passwd'
+
+--source include/start_slave.inc
+--let $slave_param= Slave_IO_Running
+--let $slave_param_value= Yes
+--source include/check_slave_param.inc
+#####
+
+
+#####
+#  Ensure slave can re-connect to master after restart
+#
+connection master;
+--let $rpl_server_number= 2
+--source include/rpl_restart_server.inc
+
+connection slave;
+--source include/start_slave.inc
+--let $slave_param= Slave_IO_Running
+--let $slave_param_value= Yes
+--source include/check_slave_param.inc
+#####
+
+
+#####
+# Cleanup
+#
+connection master;
+SET SQL_LOG_BIN=0;
+DROP USER rpl@127.0.0.1;
+FLUSH PRIVILEGES;
+SET SQL_LOG_BIN=1;
+
+connection slave;
+--source include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER = 'root', MASTER_PASSWORD = '';
+--source include/start_slave.inc
+
+connection master;
+-- source include/rpl_end.inc
+#####
diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test
index 2c6f9c0fd72..efb667ad6fa 100644
--- a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test
@@ -39,7 +39,11 @@ connect(slave_node,127.0.0.1,root,,test, $SERVER_MYPORT_2);
 --connection server_2
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 
+--connection server_1
+--source include/save_master_gtid.inc
 --connection server_3
+--source include/sync_with_master_gtid.inc
+
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 --source include/stop_slave.inc
 --eval set global slave_parallel_threads = $slave_parallel_threads;
@@ -49,6 +53,7 @@ select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 select @@slave_parallel_threads;
 
 --connection server_4
+--source include/sync_with_master_gtid.inc
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test b/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test
index 43586fdd6a4..af589445038 100644
--- a/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test
@@ -73,6 +73,10 @@ create table t3( a int primary key, b int) engine=innodb;
 
 --connection slave
 --source include/sync_with_master_gtid.inc
+--echo # wait for CA_1 waiting itself
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'debug sync point: now';
+--source include/wait_condition.inc
+
 # set debug_sync="now wait_for CA_1_processing";
 connect(extra_slave,127.0.0.1,root,,test,$SLAVE_MYPORT);
 --send stop slave;
diff --git a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
index f893f9090e4..9c815d23f8d 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
---source include/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index d0ba5ceb239..acab71a57d6 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -955,6 +955,18 @@ NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	INNODB_LOG_WRITE_AHEAD_SIZE
+SESSION_VALUE	NULL
+DEFAULT_VALUE	512
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_COMMENT	Redo log write size to avoid read-on-write; must be a power of two
+NUMERIC_MIN_VALUE	512
+NUMERIC_MAX_VALUE	4096
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	INNODB_LRU_FLUSH_SIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	32
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index 58e9413d8e5..5e07fcddaa0 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -1017,7 +1017,7 @@ VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Extra port number to use for tcp connections in a one-thread-per-connection manner. 0 means don't use another port
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	65535
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3077,7 +3077,7 @@ VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Port number to use for connection or 0 to default to, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306), whatever comes first
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	65535
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3372,6 +3372,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SERVER_UID
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	VARCHAR
+VARIABLE_COMMENT	Automatically calculated server unique id hash
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	SKIP_EXTERNAL_LOCKING
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 8444a0f5403..a615822d1e2 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -1087,7 +1087,7 @@ VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Extra port number to use for tcp connections in a one-thread-per-connection manner. 0 means don't use another port
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	65535
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3287,7 +3287,7 @@ VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Port number to use for connection or 0 to default to, my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default (3306), whatever comes first
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	4294967295
+NUMERIC_MAX_VALUE	65535
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
@@ -3892,6 +3892,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SERVER_UID
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	VARCHAR
+VARIABLE_COMMENT	Automatically calculated server unique id hash
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	SESSION_TRACK_SCHEMA
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BOOLEAN
diff --git a/mysql-test/suite/vcol/r/vcol_utf32.result b/mysql-test/suite/vcol/r/vcol_utf32.result
new file mode 100644
index 00000000000..f5bb46f45ea
--- /dev/null
+++ b/mysql-test/suite/vcol/r/vcol_utf32.result
@@ -0,0 +1,37 @@
+#
+# MDEV-27966 Assertion `fixed()' failed and Assertion `fixed == 1' failed, both in Item_func_concat::val_str on SELECT after INSERT with collation utf32_bin on utf8_bin table
+#
+SET NAMES utf8mb3;
+SET sql_mode='';
+CREATE TABLE t (c1 INT,c2 CHAR AS (CONCAT ('',DAYNAME ('')))) COLLATE utf8_bin ENGINE=InnoDB;
+Warnings:
+Warning	1286	Unknown storage engine 'InnoDB'
+Warning	1266	Using storage engine MyISAM for table 't'
+INSERT INTO t VALUES (0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0);
+Warnings:
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+Warning	1906	The value specified for generated column 'c2' in table 't' has been ignored
+Warning	1292	Incorrect datetime value: ''
+SET collation_connection='utf32_bin';
+INSERT INTO t VALUES (0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0);
+ERROR HY000: Illegal mix of collations (utf8mb3_bin,COERCIBLE) and (utf32_bin,COERCIBLE) for operation 'concat'
+SELECT * FROM t;
+ERROR HY000: Illegal mix of collations (utf8mb3_bin,COERCIBLE) and (utf32_bin,COERCIBLE) for operation 'concat'
+DROP TABLE t;
+SET sql_mode=DEFAULT;
+SET NAMES utf8mb3;
diff --git a/mysql-test/suite/vcol/t/vcol_utf32.test b/mysql-test/suite/vcol/t/vcol_utf32.test
new file mode 100644
index 00000000000..a8a116201de
--- /dev/null
+++ b/mysql-test/suite/vcol/t/vcol_utf32.test
@@ -0,0 +1,18 @@
+--source include/have_utf32.inc
+
+--echo #
+--echo # MDEV-27966 Assertion `fixed()' failed and Assertion `fixed == 1' failed, both in Item_func_concat::val_str on SELECT after INSERT with collation utf32_bin on utf8_bin table
+--echo #
+
+SET NAMES utf8mb3;
+SET sql_mode='';
+CREATE TABLE t (c1 INT,c2 CHAR AS (CONCAT ('',DAYNAME ('')))) COLLATE utf8_bin ENGINE=InnoDB;
+INSERT INTO t VALUES (0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0);
+SET collation_connection='utf32_bin';
+--error ER_CANT_AGGREGATE_2COLLATIONS
+INSERT INTO t VALUES (0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0);
+--error ER_CANT_AGGREGATE_2COLLATIONS
+SELECT * FROM t;
+DROP TABLE t;
+SET sql_mode=DEFAULT;
+SET NAMES utf8mb3;
diff --git a/mysys/crc32/crc32_arm64.c b/mysys/crc32/crc32_arm64.c
index df7e69366aa..c39f7b5f6f6 100644
--- a/mysys/crc32/crc32_arm64.c
+++ b/mysys/crc32/crc32_arm64.c
@@ -54,7 +54,7 @@ my_crc32_t crc32c_aarch64_available(void)
 static unsigned long getauxval(unsigned int key)
 {
   unsigned long val;
-  if (elf_aux_info(key, (void *)&val, (int)sizeof(val) != 0)
+  if (elf_aux_info(key, (void *)&val, (int)sizeof(val) != 0))
     return 0ul;
   return val;
 }
diff --git a/mysys/crc32/crc32c_x86.cc b/mysys/crc32/crc32c_x86.cc
index 6d9169f9384..0a4fd9db812 100644
--- a/mysys/crc32/crc32c_x86.cc
+++ b/mysys/crc32/crc32c_x86.cc
@@ -264,7 +264,8 @@ static unsigned crc32_avx512(unsigned crc, const char *buf, size_t size,
     c4 = xor3_512(c4, _mm512_clmulepi64_epi128(l1, b384, 0x10),
                   extract512_128<3>(l1));
 
-    __m256i c2 = _mm512_castsi512_si256(_mm512_shuffle_i64x2(c4, c4, 0b01001110));
+    __m256i c2 =
+      _mm512_castsi512_si256(_mm512_shuffle_i64x2(c4, c4, 0b01001110));
     c2 = xor256(c2, _mm512_castsi512_si256(c4));
     crc_out = xor128(_mm256_extracti64x2_epi64(c2, 1),
                      _mm256_castsi256_si128(c2));
@@ -289,7 +290,8 @@ static unsigned crc32_avx512(unsigned crc, const char *buf, size_t size,
         xor3_512(_mm512_clmulepi64_epi128(lo, b384, 1),
                  _mm512_clmulepi64_epi128(lo, b384, 0x10),
                  extract512_128<3>(lo));
-      crc512 = xor512(crc512, _mm512_shuffle_i64x2(crc512, crc512, 0b01001110));
+      crc512 =
+	xor512(crc512, _mm512_shuffle_i64x2(crc512, crc512, 0b01001110));
       const __m256i crc256 = _mm512_castsi512_si256(crc512);
       crc_out = xor128(_mm256_extracti64x2_epi64(crc256, 1),
                       _mm256_castsi256_si128(crc256));
@@ -318,7 +320,7 @@ static unsigned crc32_avx512(unsigned crc, const char *buf, size_t size,
     size += 16;
     if (size) {
     get_last_two_xmms:
-      const __m128i crc2 = crc_out, d = load128(buf + (size - 16));
+      const __m128i crc2 = crc_out, d = load128(buf + ssize_t(size) - 16);
       __m128i S = load128(reinterpret_cast<const char*>(shuffle128) + size);
       crc_out = _mm_shuffle_epi8(crc_out, S);
       S = xor128(S, _mm_set1_epi32(0x80808080));
diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c
index 8726349daa4..ae2991fc11c 100644
--- a/mysys/lf_alloc-pin.c
+++ b/mysys/lf_alloc-pin.c
@@ -103,12 +103,6 @@
 #include <lf.h>
 #include "my_cpu.h"
 
-/*
-  when using alloca() leave at least that many bytes of the stack -
-  for functions we might be calling from within this stack frame
-*/
-#define ALLOCA_SAFETY_MARGIN 8192
-
 #define LF_PINBOX_MAX_PINS 65536
 
 static void lf_pinbox_real_free(LF_PINS *pins);
@@ -239,26 +233,21 @@ void lf_pinbox_put_pins(LF_PINS *pins)
   } while (!my_atomic_cas32((int32 volatile*) &pinbox->pinstack_top_ver,
                             (int32*) &top_ver,
                             top_ver-pins->link+nr+LF_PINBOX_MAX_PINS));
-  return;
 }
 
-static int ptr_cmp(const void *pa, const void *pb)
+/*
+  Get the next pointer in the purgatory list.
+  Note that next_node is not used to avoid the extra volatile.
+*/
+#define pnext_node(P, X) (*((void **)(((char *)(X)) + (P)->free_ptr_offset)))
+
+static inline void add_to_purgatory(LF_PINS *pins, void *addr)
 {
-  const void *const*a= pa;
-  const void *const*b= pb;
-  return *a < *b ? -1 : *a == *b ? 0 : 1;
+  pnext_node(pins->pinbox, addr)= pins->purgatory;
+  pins->purgatory= addr;
+  pins->purgatory_count++;
 }
 
-#define add_to_purgatory(PINS, ADDR)                                    \
-  do                                                                    \
-  {                                                                     \
-    my_atomic_storeptr_explicit(                                        \
-      (void **)((char *)(ADDR)+(PINS)->pinbox->free_ptr_offset),        \
-      (PINS)->purgatory, MY_MEMORY_ORDER_RELEASE);                      \
-    (PINS)->purgatory= (ADDR);                                          \
-    (PINS)->purgatory_count++;                                          \
-  } while (0)
-
 /*
   Free an object allocated via pinbox allocator
 
@@ -276,139 +265,87 @@ void lf_pinbox_free(LF_PINS *pins, void *addr)
                       lf_pinbox_real_free(pins););
 }
 
-struct st_harvester {
-  void **granary;
-  int npins;
+struct st_match_and_save_arg {
+  LF_PINS *pins;
+  LF_PINBOX *pinbox;
+  void *old_purgatory;
 };
 
 /*
-  callback forlf_dynarray_iterate:
-  scan all pins of all threads and accumulate all pins
+  Callback for lf_dynarray_iterate:
+  Scan all pins of all threads, for each active (non-null) pin,
+  scan the current thread's purgatory. If present there, move it
+  to a new purgatory. At the end, the old purgatory will contain
+  pointers not pinned by any thread.
 */
-static int harvest_pins(void *e, void *h)
+static int match_and_save(void *e, void *a)
 {
   LF_PINS *el= e;
-  struct st_harvester *hv= h;
+  struct st_match_and_save_arg *arg= a;
+
   int i;
-  LF_PINS *el_end= el+MY_MIN(hv->npins, LF_DYNARRAY_LEVEL_LENGTH);
+  LF_PINS *el_end= el + LF_DYNARRAY_LEVEL_LENGTH;
   for (; el < el_end; el++)
   {
     for (i= 0; i < LF_PINBOX_PINS; i++)
     {
       void *p= my_atomic_loadptr((void **)&el->pin[i]);
       if (p)
-        *hv->granary++= p;
+      {
+        void *cur= arg->old_purgatory;
+        void **list_prev= &arg->old_purgatory;
+        while (cur)
+        {
+          void *next= pnext_node(arg->pinbox, cur);
+
+          if (p == cur)
+          {
+            /* pinned - keeping */
+            add_to_purgatory(arg->pins, cur);
+            /* unlink from old purgatory */
+            *list_prev= next;
+          }
+          else
+            list_prev= (void **)((char *)cur+arg->pinbox->free_ptr_offset);
+          cur= next;
+        }
+        if (!arg->old_purgatory)
+          return 1;
+      }
     }
   }
-  /*
-    hv->npins may become negative below, but it means that
-    we're on the last dynarray page and harvest_pins() won't be
-    called again. We don't bother to make hv->npins() correct
-    (that is 0) in this case.
-  */
-  hv->npins-= LF_DYNARRAY_LEVEL_LENGTH;
   return 0;
 }
 
-/*
-  callback forlf_dynarray_iterate:
-  scan all pins of all threads and see if addr is present there
-*/
-static int match_pins(void *e, void *addr)
-{
-  LF_PINS *el= e;
-  int i;
-  LF_PINS *el_end= el+LF_DYNARRAY_LEVEL_LENGTH;
-  for (; el < el_end; el++)
-    for (i= 0; i < LF_PINBOX_PINS; i++)
-      if (my_atomic_loadptr((void **)&el->pin[i]) == addr)
-        return 1;
-  return 0;
-}
-
-#define next_node(P, X) (*((uchar * volatile *)(((uchar *)(X)) + (P)->free_ptr_offset)))
-#define anext_node(X) next_node(&allocator->pinbox, (X))
-
 /*
   Scan the purgatory and free everything that can be freed
 */
 static void lf_pinbox_real_free(LF_PINS *pins)
 {
-  int npins;
-  void *list;
-  void **addr= NULL;
-  void *first= NULL, *last= NULL;
-  struct st_my_thread_var *var= my_thread_var;
-  void *stack_ends_here= var ? var->stack_ends_here : NULL;
   LF_PINBOX *pinbox= pins->pinbox;
 
-  npins= pinbox->pins_in_array+1;
-
-#ifdef HAVE_ALLOCA
-  if (stack_ends_here != NULL)
-  {
-    int alloca_size= sizeof(void *)*LF_PINBOX_PINS*npins;
-    /* create a sorted list of pinned addresses, to speed up searches */
-    if (available_stack_size(&pinbox, stack_ends_here) >
-        alloca_size + ALLOCA_SAFETY_MARGIN)
-    {
-      struct st_harvester hv;
-      addr= (void **) alloca(alloca_size);
-      hv.granary= addr;
-      hv.npins= npins;
-      /* scan the dynarray and accumulate all pinned addresses */
-     lf_dynarray_iterate(&pinbox->pinarray, harvest_pins, &hv);
-
-      npins= (int)(hv.granary-addr);
-      /* and sort them */
-      if (npins)
-        qsort(addr, npins, sizeof(void *), ptr_cmp);
-    }
-  }
-#endif
-
-  list= pins->purgatory;
-  pins->purgatory= 0;
+  /* Store info about current purgatory. */
+  struct st_match_and_save_arg arg = {pins, pinbox, pins->purgatory};
+  /* Reset purgatory. */
+  pins->purgatory= NULL;
   pins->purgatory_count= 0;
-  while (list)
+
+
+  lf_dynarray_iterate(&pinbox->pinarray, match_and_save, &arg);
+
+  if (arg.old_purgatory)
   {
-    void *cur= list;
-    list= *(void **)((char *)cur+pinbox->free_ptr_offset);
-    if (npins)
-    {
-      if (addr) /* use binary search */
-      {
-        void **a, **b, **c;
-        for (a= addr, b= addr+npins-1, c= a+(b-a)/2; (b-a) > 1; c= a+(b-a)/2)
-          if (cur == *c)
-            a= b= c;
-          else if (cur > *c)
-            a= c;
-          else
-            b= c;
-        if (cur == *a || cur == *b)
-          goto found;
-      }
-      else /* no alloca - no cookie. linear search here */
-      {
-        if (lf_dynarray_iterate(&pinbox->pinarray, match_pins, cur))
-          goto found;
-      }
-    }
-    /* not pinned - freeing */
-    if (last)
-      last= next_node(pinbox, last)= (uchar *)cur;
-    else
-      first= last= (uchar *)cur;
-    continue;
-found:
-    /* pinned - keeping */
-    add_to_purgatory(pins, cur);
+    /* Some objects in the old purgatory were not pinned, free them. */
+    void *last= arg.old_purgatory;
+    while (pnext_node(pinbox, last))
+      last= pnext_node(pinbox, last);
+    pinbox->free_func(arg.old_purgatory, last, pinbox->free_func_arg);
   }
-  if (last)
-    pinbox->free_func(first, last, pinbox->free_func_arg);
 }
 
+#define next_node(P, X) (*((uchar * volatile *)(((uchar *)(X)) + (P)->free_ptr_offset)))
+#define anext_node(X) next_node(&allocator->pinbox, (X))
+
 /* lock-free memory allocator for fixed-size objects */
 
 /*
diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c
index e16825cedd2..a5a6ccdbb8e 100644
--- a/mysys/my_rdtsc.c
+++ b/mysys/my_rdtsc.c
@@ -338,7 +338,7 @@ static ulonglong my_timer_init_resolution(ulonglong (*this_timer)(void),
 static ulonglong my_timer_init_frequency(MY_TIMER_INFO *mti)
 {
   int i;
-  ulonglong time1, time2, time3, time4;
+  ulonglong time1, time2, time3, time4, denominator;
   time1= my_timer_cycles();
   time2= my_timer_microseconds();
   time3= time2; /* Avoids a Microsoft/IBM compiler warning */
@@ -349,7 +349,8 @@ static ulonglong my_timer_init_frequency(MY_TIMER_INFO *mti)
   }
   time4= my_timer_cycles() - mti->cycles.overhead;
   time4-= mti->microseconds.overhead;
-  return (mti->microseconds.frequency * (time4 - time1)) / (time3 - time2);
+  denominator = ((time3 - time2) == 0) ? 1 : time3 - time2;
+  return (mti->microseconds.frequency * (time4 - time1)) / denominator;
 }
 
 /*
@@ -582,7 +583,7 @@ void my_timer_init(MY_TIMER_INFO *mti)
   &&  mti->microseconds.routine
   &&  mti->cycles.routine)
   {
-    ulonglong time3, time4;
+    ulonglong time3, time4, denominator;
     time1= my_timer_cycles();
     time2= my_timer_milliseconds();
     time3= time2; /* Avoids a Microsoft/IBM compiler warning */
@@ -592,8 +593,9 @@ void my_timer_init(MY_TIMER_INFO *mti)
       if (time3 - time2 > 10) break;
     }
     time4= my_timer_cycles();
+    denominator = ((time4 - time1) == 0) ? 1 : time4 - time1;
     mti->milliseconds.frequency=
-    (mti->cycles.frequency * (time3 - time2)) / (time4 - time1);
+    (mti->cycles.frequency * (time3 - time2)) / denominator;
   }
 
 /*
@@ -607,7 +609,7 @@ void my_timer_init(MY_TIMER_INFO *mti)
   &&  mti->microseconds.routine
   &&  mti->cycles.routine)
   {
-    ulonglong time3, time4;
+    ulonglong time3, time4, denominator;
     time1= my_timer_cycles();
     time2= my_timer_ticks();
     time3= time2; /* Avoids a Microsoft/IBM compiler warning */
@@ -621,8 +623,9 @@ void my_timer_init(MY_TIMER_INFO *mti)
       if (time3 - time2 > 10) break;
     }
     time4= my_timer_cycles();
+    denominator = ((time4 - time1) == 0) ? 1 : time4 - time1;
     mti->ticks.frequency=
-    (mti->cycles.frequency * (time3 - time2)) / (time4 - time1);
+    (mti->cycles.frequency * (time3 - time2)) / denominator;
   }
 }
 
diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc
index 00447e73d79..0356b64ccfb 100644
--- a/mysys_ssl/my_crypt.cc
+++ b/mysys_ssl/my_crypt.cc
@@ -101,10 +101,10 @@ public:
   uchar source_tail[MY_AES_BLOCK_SIZE];
 
   MyCTX_nopad() : MyCTX() { }
-  ~MyCTX_nopad() = default;
+  ~MyCTX_nopad() override = default;
 
   int init(const EVP_CIPHER *cipher, int encrypt, const uchar *key, uint klen,
-           const uchar *iv, uint ivlen)
+           const uchar *iv, uint ivlen) override
   {
     compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_nopad));
     this->key= key;
@@ -141,13 +141,13 @@ public:
     source_tail_len= new_tail_len;
   }
 
-  int update(const uchar *src, uint slen, uchar *dst, uint *dlen)
+  int update(const uchar *src, uint slen, uchar *dst, uint *dlen) override
   {
     update_source_tail(src, slen);
     return MyCTX::update(src, slen, dst, dlen);
   }
 
-  int finish(uchar *dst, uint *dlen)
+  int finish(uchar *dst, uint *dlen) override
   {
     if (source_tail_len)
     {
@@ -206,10 +206,10 @@ public:
   const uchar *aad;
   int aadlen;
   MyCTX_gcm() : MyCTX() { }
-  ~MyCTX_gcm() { }
+  ~MyCTX_gcm() override { }
 
   int init(const EVP_CIPHER *cipher, int encrypt, const uchar *key, uint klen,
-           const uchar *iv, uint ivlen)
+           const uchar *iv, uint ivlen) override
   {
     compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_gcm));
     int res= MyCTX::init(cipher, encrypt, key, klen, iv, ivlen);
@@ -219,7 +219,7 @@ public:
     return res;
   }
 
-  int update(const uchar *src, uint slen, uchar *dst, uint *dlen)
+  int update(const uchar *src, uint slen, uchar *dst, uint *dlen) override
   {
     /*
       note that this GCM class cannot do streaming decryption, because
@@ -244,7 +244,7 @@ public:
     return MyCTX::update(src, slen, dst, dlen);
   }
 
-  int finish(uchar *dst, uint *dlen)
+  int finish(uchar *dst, uint *dlen) override
   {
     int fin;
     if (!EVP_CipherFinal_ex(ctx, dst, &fin))
diff --git a/plugin/aws_key_management/aws_key_management_plugin.cc b/plugin/aws_key_management/aws_key_management_plugin.cc
index 65f51b0cb4a..f4f6dee9a63 100644
--- a/plugin/aws_key_management/aws_key_management_plugin.cc
+++ b/plugin/aws_key_management/aws_key_management_plugin.cc
@@ -155,7 +155,7 @@ public:
     Base(logLevel) 
   {
   }
-  virtual LogLevel GetLogLevel(void) const override
+  LogLevel GetLogLevel(void) const override
   {
     return (LogLevel)log_level;
   }
@@ -163,12 +163,12 @@ public:
   {
   }
 
-  virtual void Flush(void) override
+  void Flush(void) override
   {
   }
 
 protected:
-  virtual void ProcessFormattedStatement(Aws::String&& statement) override
+  void ProcessFormattedStatement(Aws::String&& statement) override
   {
 #ifdef _WIN32
     /*
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc
index 02e2c4a68cc..bc8a98c11ae 100644
--- a/plugin/feedback/feedback.cc
+++ b/plugin/feedback/feedback.cc
@@ -26,10 +26,8 @@ namespace feedback {
 ulong debug_startup_interval, debug_first_interval, debug_interval;
 #endif
 
-char server_uid_buf[SERVER_UID_SIZE+1]; ///< server uid will be written here
-
 /* backing store for system variables */
-static char *server_uid= server_uid_buf, *url, *http_proxy;
+static char *url, *http_proxy;
 char *user_info;
 ulong send_timeout, send_retry_wait;
 
@@ -253,9 +251,6 @@ static int init(void *p)
   PSI_register(cond);
   PSI_register(thread);
 
-  if (calculate_server_uid(server_uid_buf))
-    return 1;
-
   prepare_linux_info();
 
 #ifndef DBUG_OFF
@@ -361,9 +356,6 @@ static int free(void *p)
 #define DEFAULT_PROTO "http://"
 #endif
 
-static MYSQL_SYSVAR_STR(server_uid, server_uid,
-       PLUGIN_VAR_READONLY | PLUGIN_VAR_NOCMDOPT,
-       "Automatically calculated server unique id hash", NULL, NULL, 0);
 static MYSQL_SYSVAR_STR(user_info, user_info,
        PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG,
        "User specified string that will be included in the feedback report",
@@ -394,7 +386,6 @@ static MYSQL_SYSVAR_ULONG(debug_interval, debug_interval,
 #endif
 
 static struct st_mysql_sys_var* settings[] = {
-  MYSQL_SYSVAR(server_uid),
   MYSQL_SYSVAR(user_info),
   MYSQL_SYSVAR(url),
   MYSQL_SYSVAR(send_timeout),
diff --git a/plugin/feedback/feedback.h b/plugin/feedback/feedback.h
index 6021eb85860..30ad1203ae7 100644
--- a/plugin/feedback/feedback.h
+++ b/plugin/feedback/feedback.h
@@ -25,8 +25,7 @@ int fill_misc_data(THD *thd, TABLE_LIST *tables);
 int fill_linux_info(THD *thd, TABLE_LIST *tables);
 int fill_collation_statistics(THD *thd, TABLE_LIST *tables);
 
-static const int SERVER_UID_SIZE= 29;
-extern char server_uid_buf[SERVER_UID_SIZE+1], *user_info;
+extern char *user_info;
 int calculate_server_uid(char *);
 int prepare_linux_info();
 
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc
index 1c0384bdfbb..830e1e1e3e5 100644
--- a/plugin/feedback/sender_thread.cc
+++ b/plugin/feedback/sender_thread.cc
@@ -183,7 +183,7 @@ static void send_report(const char *when)
     str.length(0);
     str.append(STRING_WITH_LEN("FEEDBACK_SERVER_UID"));
     str.append('\t');
-    str.append(server_uid_buf, sizeof(server_uid_buf)-1);
+    str.append(server_uid,  sizeof(server_uid)-1);
     str.append('\n');
     str.append(STRING_WITH_LEN("FEEDBACK_WHEN"));
     str.append('\t');
diff --git a/plugin/feedback/url_http.cc b/plugin/feedback/url_http.cc
index aa1706bb0dd..79dc4cea5e8 100644
--- a/plugin/feedback/url_http.cc
+++ b/plugin/feedback/url_http.cc
@@ -53,7 +53,7 @@ class Url_http: public Url {
     {
       proxy_host.length= 0;
     }
-  ~Url_http()
+  ~Url_http() override
   {
     my_free(host.str);
     my_free(port.str);
@@ -62,9 +62,9 @@ class Url_http: public Url {
   }
 
   public:
-  void abort();
-  int send(const char* data, size_t data_length);
-  int set_proxy(const char *proxy, size_t proxy_len)
+  void abort() override;
+  int send(const char* data, size_t data_length) override;
+  int set_proxy(const char *proxy, size_t proxy_len) override
   {
     if (use_proxy())
     {
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc
index c31422cc7ec..efd9d0f59b5 100644
--- a/plugin/feedback/utils.cc
+++ b/plugin/feedback/utils.cc
@@ -412,31 +412,4 @@ int fill_collation_statistics(THD *thd, TABLE_LIST *tables)
   }
   return 0;
 };
-
-/**
-  calculates the server unique identifier
-  
-  UID is a base64 encoded SHA1 hash of the MAC address of one of
-  the interfaces, and the tcp port that the server is listening on
-*/
-int calculate_server_uid(char *dest)
-{
-  uchar rawbuf[2 + 6];
-  uchar shabuf[MY_SHA1_HASH_SIZE];
-
-  int2store(rawbuf, mysqld_port);
-  if (my_gethwaddr(rawbuf + 2))
-  {
-    sql_print_error("feedback plugin: failed to retrieve the MAC address");
-    return 1;
-  }
-
-  my_sha1((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf));
-
-  assert(my_base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE);
-  my_base64_encode(shabuf, sizeof(shabuf), dest);
-
-  return 0;
-}
-
 } // namespace feedback
diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index db24e33a141..0a006a42f00 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -84,10 +84,10 @@ prep_stmt::operator =(const prep_stmt& x)
 
 struct database : public database_i, private noncopyable {
   database(const config& c);
-  virtual ~database();
-  virtual dbcontext_ptr create_context(bool for_write) volatile;
-  virtual void stop() volatile;
-  virtual const config& get_conf() const volatile;
+  ~database() override;
+  dbcontext_ptr create_context(bool for_write) volatile override;
+  void stop() volatile override;
+  const config& get_conf() const volatile override;
  public:
   int child_running;
  private:
@@ -128,21 +128,21 @@ struct expr_user_lock : private noncopyable {
 
 struct dbcontext : public dbcontext_i, private noncopyable {
   dbcontext(volatile database *d, bool for_write);
-  virtual ~dbcontext();
-  virtual void init_thread(const void *stack_botton,
-    volatile int& shutdown_flag);
-  virtual void term_thread();
-  virtual bool check_alive();
-  virtual void lock_tables_if();
-  virtual void unlock_tables_if();
-  virtual bool get_commit_error();
-  virtual void clear_error();
-  virtual void close_tables_if();
-  virtual void table_addref(size_t tbl_id);
-  virtual void table_release(size_t tbl_id);
-  virtual void cmd_open(dbcallback_i& cb, const cmd_open_args& args);
-  virtual void cmd_exec(dbcallback_i& cb, const cmd_exec_args& args);
-  virtual void set_statistics(size_t num_conns, size_t num_active);
+  ~dbcontext() override;
+  void init_thread(const void *stack_botton,
+    volatile int& shutdown_flag) override;
+  void term_thread() override;
+  bool check_alive() override;
+  void lock_tables_if() override;
+  void unlock_tables_if() override;
+  bool get_commit_error() override;
+  void clear_error() override;
+  void close_tables_if() override;
+  void table_addref(size_t tbl_id) override;
+  void table_release(size_t tbl_id) override;
+  void cmd_open(dbcallback_i& cb, const cmd_open_args& args) override;
+  void cmd_exec(dbcallback_i& cb, const cmd_exec_args& args) override;
+  void set_statistics(size_t num_conns, size_t num_active) override;
  private:
   int set_thread_message(const char *fmt, ...)
     __attribute__((format (printf, 2, 3)));
diff --git a/plugin/handler_socket/handlersocket/hstcpsvr.cpp b/plugin/handler_socket/handlersocket/hstcpsvr.cpp
index 250ef2c7be5..336d36422b0 100644
--- a/plugin/handler_socket/handlersocket/hstcpsvr.cpp
+++ b/plugin/handler_socket/handlersocket/hstcpsvr.cpp
@@ -34,8 +34,8 @@ struct worker_throbj {
 
 struct hstcpsvr : public hstcpsvr_i, private noncopyable {
   hstcpsvr(const config& c);
-  ~hstcpsvr();
-  virtual std::string start_listen();
+  ~hstcpsvr() override;
+  std::string start_listen() override;
  private:
   hstcpsvr_shared_c cshared;
   volatile hstcpsvr_shared_v vshared;
diff --git a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
index f6bbe9004c2..0796546cb5e 100644
--- a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
+++ b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
@@ -77,15 +77,15 @@ struct hstcpsvr_conn : public dbcallback_i {
   bool write_more(bool *more_r = 0);
   bool read_more(bool *more_r = 0);
  public:
-  virtual void dbcb_set_prep_stmt(size_t pst_id, const prep_stmt& v);
-  virtual const prep_stmt *dbcb_get_prep_stmt(size_t pst_id) const;
-  virtual void dbcb_resp_short(uint32_t code, const char *msg);
-  virtual void dbcb_resp_short_num(uint32_t code, uint32_t value);
-  virtual void dbcb_resp_short_num64(uint32_t code, uint64_t value);
-  virtual void dbcb_resp_begin(size_t num_flds);
-  virtual void dbcb_resp_entry(const char *fld, size_t fldlen);
-  virtual void dbcb_resp_end();
-  virtual void dbcb_resp_cancel();
+  void dbcb_set_prep_stmt(size_t pst_id, const prep_stmt& v) override;
+  const prep_stmt *dbcb_get_prep_stmt(size_t pst_id) const override;
+  void dbcb_resp_short(uint32_t code, const char *msg) override;
+  void dbcb_resp_short_num(uint32_t code, uint32_t value) override;
+  void dbcb_resp_short_num64(uint32_t code, uint64_t value) override;
+  void dbcb_resp_begin(size_t num_flds) override;
+  void dbcb_resp_entry(const char *fld, size_t fldlen) override;
+  void dbcb_resp_end() override;
+  void dbcb_resp_cancel() override;
  public:
   hstcpsvr_conn() : addr_len(sizeof(addr)), readsize(4096),
     nonblocking(false), read_finished(false), write_finished(false),
@@ -254,7 +254,7 @@ hstcpsvr_conn::dbcb_resp_cancel()
 
 struct hstcpsvr_worker : public hstcpsvr_worker_i, private noncopyable {
   hstcpsvr_worker(const hstcpsvr_worker_arg& arg);
-  virtual void run();
+  void run() override;
  private:
   const hstcpsvr_shared_c& cshared;
   volatile hstcpsvr_shared_v& vshared;
diff --git a/plugin/handler_socket/libhsclient/hstcpcli.cpp b/plugin/handler_socket/libhsclient/hstcpcli.cpp
index 461bed3f5d0..c2823d139fd 100644
--- a/plugin/handler_socket/libhsclient/hstcpcli.cpp
+++ b/plugin/handler_socket/libhsclient/hstcpcli.cpp
@@ -27,23 +27,23 @@ namespace dena {
 
 struct hstcpcli : public hstcpcli_i, private noncopyable {
   hstcpcli(const socket_args& args);
-  virtual void close();
-  virtual int reconnect();
-  virtual bool stable_point();
-  virtual void request_buf_open_index(size_t pst_id, const char *dbn,
-    const char *tbl, const char *idx, const char *retflds, const char *filflds);
-  virtual void request_buf_auth(const char *secret, const char *typ);
-  virtual void request_buf_exec_generic(size_t pst_id, const string_ref& op,
+  void close() override;
+  int reconnect() override;
+  bool stable_point() override;
+  void request_buf_open_index(size_t pst_id, const char *dbn,
+    const char *tbl, const char *idx, const char *retflds, const char *filflds) override;
+  void request_buf_auth(const char *secret, const char *typ) override;
+  void request_buf_exec_generic(size_t pst_id, const string_ref& op,
     const string_ref *kvs, size_t kvslen, uint32_t limit, uint32_t skip,
     const string_ref& mod_op, const string_ref *mvs, size_t mvslen,
     const hstcpcli_filter *fils, size_t filslen, int invalues_keypart,
-    const string_ref *invalues, size_t invalueslen);
-  virtual int request_send();
-  virtual int response_recv(size_t& num_flds_r);
-  virtual const string_ref *get_next_row();
-  virtual void response_buf_remove();
-  virtual int get_error_code();
-  virtual std::string get_error();
+    const string_ref *invalues, size_t invalueslen) override;
+  int request_send() override;
+  int response_recv(size_t& num_flds_r) override;
+  const string_ref *get_next_row() override;
+  void response_buf_remove() override;
+  int get_error_code() override;
+  std::string get_error() override;
  private:
   int read_more();
   void clear_error();
diff --git a/plugin/metadata_lock_info/metadata_lock_info.cc b/plugin/metadata_lock_info/metadata_lock_info.cc
index 35b9b507513..7fe4b72b77f 100644
--- a/plugin/metadata_lock_info/metadata_lock_info.cc
+++ b/plugin/metadata_lock_info/metadata_lock_info.cc
@@ -32,14 +32,25 @@ static const LEX_STRING metadata_lock_info_lock_name[] = {
   { C_STRING_WITH_LEN("User lock") },
 };
 
+
+#ifndef DBUG_OFF
+static const LEX_STRING duration_name[] = {
+  { C_STRING_WITH_LEN("statement") },
+  { C_STRING_WITH_LEN("transaction") },
+  { C_STRING_WITH_LEN("explicit") },
+};
+#endif
+
 namespace Show {
 
 static ST_FIELD_INFO i_s_metadata_lock_info_fields_info[] =
 {
   Column("THREAD_ID",     ULonglong(20), NOT_NULL, "thread_id"),
-  Column("LOCK_MODE",     Varchar(24),   NULLABLE, "lock_mode"),
-  Column("LOCK_DURATION", Varchar(30),   NULLABLE, "lock_duration"),
-  Column("LOCK_TYPE",     Varchar(33),   NULLABLE, "lock_type"),
+  Column("LOCK_MODE",     Varchar(24),   NOT_NULL, "lock_mode"),
+  Column("LOCK_DURATION", Varchar(33),   NULLABLE, "lock_duration"),
+  Column("LOCK_TIME_MS",  ULonglong(8),  NULLABLE, "lock_time_ms"),
+  Column("LOCK_TYPE",     Varchar(33),   NOT_NULL, "lock_type"),
+  Column("TABLE_CATALOG", Name(),        NULLABLE, "table_catalog"),
   Column("TABLE_SCHEMA",  Name(),        NULLABLE, "table_schema"),
   Column("TABLE_NAME",    Name(),        NULLABLE, "table_name"),
   CEnd()
@@ -71,17 +82,31 @@ int i_s_metadata_lock_info_fill_row(
   table->field[0]->store((longlong) mdl_ctx->get_thread_id(), TRUE);
   table->field[1]->set_notnull();
   table->field[1]->store(*mdl_ticket->get_type_name(), system_charset_info);
+#ifndef DBUG_OFF
+  table->field[2]->set_notnull();
+  table->field[2]->store(duration_name[mdl_ticket->m_duration],
+                         system_charset_info);
+#else
   table->field[2]->set_null();
-  table->field[3]->set_notnull();
-  table->field[3]->store(
-    metadata_lock_info_lock_name[(int) mdl_namespace].str,
-    metadata_lock_info_lock_name[(int) mdl_namespace].length,
-    system_charset_info);
+#endif
+  if (!mdl_ticket->m_time)
+    table->field[3]->set_null();
+  else
+  {
+    ulonglong now= microsecond_interval_timer();
+    table->field[3]->set_notnull();
+    table->field[3]->store((now - mdl_ticket->m_time) / 1000, TRUE);
+  }
   table->field[4]->set_notnull();
-  table->field[4]->store(mdl_key->db_name(),
-    mdl_key->db_name_length(), system_charset_info);
+  table->field[4]->store(metadata_lock_info_lock_name[(int) mdl_namespace],
+                         system_charset_info);
   table->field[5]->set_notnull();
-  table->field[5]->store(mdl_key->name(),
+  table->field[5]->store(STRING_WITH_LEN("def"), system_charset_info);
+  table->field[6]->set_notnull();
+  table->field[6]->store(mdl_key->db_name(),
+    mdl_key->db_name_length(), system_charset_info);
+  table->field[7]->set_notnull();
+  table->field[7]->store(mdl_key->name(),
     mdl_key->name_length(), system_charset_info);
   if (schema_table_store_record(thd, table))
     DBUG_RETURN(1);
@@ -112,6 +137,7 @@ static int i_s_metadata_lock_info_init(
   schema->fields_info = Show::i_s_metadata_lock_info_fields_info;
   schema->fill_table = i_s_metadata_lock_info_fill_table;
   schema->idx_field1 = 0;
+  metadata_lock_info_plugin_loaded= 1;
   DBUG_RETURN(0);
 }
 
@@ -119,6 +145,7 @@ static int i_s_metadata_lock_info_deinit(
   void *p
 ) {
   DBUG_ENTER("i_s_metadata_lock_info_deinit");
+  metadata_lock_info_plugin_loaded= 0;
   DBUG_RETURN(0);
 }
 
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result
index 12afd5010cc..f5843c6b445 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/global_read_lock.result
@@ -1,9 +1,9 @@
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
 FLUSH TABLES WITH READ LOCK;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
-MDL_BACKUP_FTWRL2	NULL	Backup lock		
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
+MDL_BACKUP_FTWRL2	Backup lock		
 UNLOCK TABLES;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result
index 1b76b9e8222..5f704e54edd 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/table_metadata_lock.result
@@ -1,13 +1,13 @@
 CREATE TABLE IF NOT EXISTS t1(a int);
 BEGIN;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
 SELECT * FROM t1;
 a
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
-MDL_SHARED_READ	NULL	Table metadata lock	test	t1
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
+MDL_SHARED_READ	Table metadata lock	test	t1
 ROLLBACK;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
 DROP TABLE t1;
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
index 34d238cb43b..a0c938950aa 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
@@ -1,13 +1,13 @@
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
 SELECT GET_LOCK('LOCK1',0);
 GET_LOCK('LOCK1',0)
 1
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
-MDL_SHARED_NO_WRITE	NULL	User lock	LOCK1	
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
+MDL_SHARED_NO_WRITE	User lock	LOCK1	
 SELECT RELEASE_LOCK('LOCK1');
 RELEASE_LOCK('LOCK1')
 1
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
-lock_mode	lock_duration	lock_type	table_schema	table_name
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+lock_mode	lock_type	table_schema	table_name
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test
index 103050e3fb8..d9950b3ad75 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/global_read_lock.test
@@ -1,6 +1,6 @@
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 FLUSH TABLES WITH READ LOCK;
 --sorted_result
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 UNLOCK TABLES;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/table_metadata_lock.test b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/table_metadata_lock.test
index 3451dff039d..b415e190994 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/table_metadata_lock.test
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/table_metadata_lock.test
@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS t1(a int);
 BEGIN;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 SELECT * FROM t1;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 ROLLBACK;
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 DROP TABLE t1;
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/user_lock.test b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/user_lock.test
index 85dec3dcf75..b651185531e 100644
--- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/user_lock.test
+++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/t/user_lock.test
@@ -1,5 +1,5 @@
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 SELECT GET_LOCK('LOCK1',0);
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
 SELECT RELEASE_LOCK('LOCK1');
-SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
+SELECT lock_mode, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
diff --git a/plugin/type_inet/item_inetfunc.h b/plugin/type_inet/item_inetfunc.h
index da87c7b3309..69d1a2a79a2 100644
--- a/plugin/type_inet/item_inetfunc.h
+++ b/plugin/type_inet/item_inetfunc.h
@@ -90,7 +90,7 @@ public:
   {
     null_value= false;
   }
-  bool need_parentheses_in_default() { return false; }
+  bool need_parentheses_in_default() override { return false; }
 };
 
 
diff --git a/plugin/type_inet/plugin.cc b/plugin/type_inet/plugin.cc
index 7a69d23b455..38dad45a4f5 100644
--- a/plugin/type_inet/plugin.cc
+++ b/plugin/type_inet/plugin.cc
@@ -47,7 +47,7 @@ public:
   static Create_func_inet_ntoa s_singleton;
 protected:
   Create_func_inet_ntoa() {}
-  virtual ~Create_func_inet_ntoa() {}
+  ~Create_func_inet_ntoa() override {}
 };
 
 
@@ -61,7 +61,7 @@ public:
   static Create_func_inet_aton s_singleton;
 protected:
   Create_func_inet_aton() {}
-  virtual ~Create_func_inet_aton() {}
+  ~Create_func_inet_aton() override {}
 };
 
 
@@ -75,7 +75,7 @@ public:
   static Create_func_inet6_aton s_singleton;
 protected:
   Create_func_inet6_aton() {}
-  virtual ~Create_func_inet6_aton() {}
+  ~Create_func_inet6_aton() override {}
 };
 
 
@@ -89,7 +89,7 @@ public:
   static Create_func_inet6_ntoa s_singleton;
 protected:
   Create_func_inet6_ntoa() {}
-  virtual ~Create_func_inet6_ntoa() {}
+  ~Create_func_inet6_ntoa() override {}
 };
 
 
@@ -103,7 +103,7 @@ public:
   static Create_func_is_ipv4 s_singleton;
 protected:
   Create_func_is_ipv4() {}
-  virtual ~Create_func_is_ipv4() {}
+  ~Create_func_is_ipv4() override {}
 };
 
 
@@ -117,7 +117,7 @@ public:
   static Create_func_is_ipv6 s_singleton;
 protected:
   Create_func_is_ipv6() {}
-  virtual ~Create_func_is_ipv6() {}
+  ~Create_func_is_ipv6() override {}
 };
 
 
@@ -131,7 +131,7 @@ public:
   static Create_func_is_ipv4_compat s_singleton;
 protected:
   Create_func_is_ipv4_compat() {}
-  virtual ~Create_func_is_ipv4_compat() {}
+  ~Create_func_is_ipv4_compat() override {}
 };
 
 
@@ -145,7 +145,7 @@ public:
   static Create_func_is_ipv4_mapped s_singleton;
 protected:
   Create_func_is_ipv4_mapped() {}
-  virtual ~Create_func_is_ipv4_mapped() {}
+  ~Create_func_is_ipv4_mapped() override {}
 };
 
 
diff --git a/plugin/type_mysql_json/type.cc b/plugin/type_mysql_json/type.cc
index 331e3bb26ab..de96e3f0e8e 100644
--- a/plugin/type_mysql_json/type.cc
+++ b/plugin/type_mysql_json/type.cc
@@ -74,14 +74,14 @@ public:
                  &my_charset_utf8mb4_bin)
   {}
 
-  String *val_str(String *val_buffer, String *val_str);
-  const Type_handler *type_handler() const { return &type_handler_mysql_json; }
+  String *val_str(String *val_buffer, String *val_str) override;
+  const Type_handler *type_handler() const override { return &type_handler_mysql_json; }
   bool parse_mysql(String *dest, const char *data, size_t length) const;
-  bool send(Protocol *protocol) { return Field::send(protocol); }
-  void sql_type(String &s) const
+  bool send(Protocol *protocol) override { return Field::send(protocol); }
+  void sql_type(String &s) const override
   { s.set_ascii(STRING_WITH_LEN("mysql_json /* JSON from MySQL 5.7 */")); }
   /* this will make ALTER TABLE to consider it different from built-in field */
-  Compression_method *compression_method() const { return (Compression_method*)1; }
+  Compression_method *compression_method() const override { return (Compression_method*)1; }
 };
 
 Field *Type_handler_mysql_json::make_conversion_table_field(MEM_ROOT *root,
diff --git a/plugin/type_test/mysql-test/type_test/type_test_double.result b/plugin/type_test/mysql-test/type_test/type_test_double.result
index edcfdc0eff8..ff009885072 100644
--- a/plugin/type_test/mysql-test/type_test/type_test_double.result
+++ b/plugin/type_test/mysql-test/type_test/type_test_double.result
@@ -83,7 +83,7 @@ SELECT HEX(a), a;
 END;
 $$
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					HEX(a)	253	44	3	Y	0	0	8
+def					HEX(a)	253	16	3	Y	0	0	8
 def				a	a	5	22	3	Y	32768	31	63
 HEX(a)	a
 100	256
diff --git a/plugin/type_test/mysql-test/type_test/type_test_int8.result b/plugin/type_test/mysql-test/type_test/type_test_int8.result
index 75fcf1f2f5e..4d7175ffe69 100644
--- a/plugin/type_test/mysql-test/type_test/type_test_int8.result
+++ b/plugin/type_test/mysql-test/type_test/type_test_int8.result
@@ -62,7 +62,7 @@ SELECT HEX(a), a;
 END;
 $$
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					HEX(a)	253	40	3	Y	0	0	8
+def					HEX(a)	253	16	3	Y	0	0	8
 def				a	a	8	20	3	Y	32768	0	63
 HEX(a)	a
 100	256
diff --git a/plugin/type_uuid/plugin.cc b/plugin/type_uuid/plugin.cc
index d19e9b8f76b..e35df1caf5f 100644
--- a/plugin/type_uuid/plugin.cc
+++ b/plugin/type_uuid/plugin.cc
@@ -116,7 +116,7 @@ public:
   {
     DBUG_ENTER("Create_func_uuid::create");
     thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-    thd->lex->safe_to_cache_query= 0;
+    thd->lex->uncacheable(UNCACHEABLE_RAND);
     DBUG_RETURN(new (thd->mem_root) Item_func_uuid(thd));
   }
   static Create_func_uuid s_singleton;
@@ -134,7 +134,7 @@ public:
   {
     DBUG_ENTER("Create_func_sys_guid::create");
     thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-    thd->lex->safe_to_cache_query= 0;
+    thd->lex->uncacheable(UNCACHEABLE_RAND);
     DBUG_RETURN(new (thd->mem_root) Item_func_sys_guid(thd));
   }
   static Create_func_sys_guid s_singleton;
diff --git a/plugin/versioning/versioning.cc b/plugin/versioning/versioning.cc
index 222b6b14ac5..b4557afc897 100644
--- a/plugin/versioning/versioning.cc
+++ b/plugin/versioning/versioning.cc
@@ -29,14 +29,14 @@ template <TR_table::field_id_t TRT_FIELD>
 class Create_func_trt : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_trt<TRT_FIELD> s_singleton;
 
 protected:
   Create_func_trt() = default;
-  virtual ~Create_func_trt() = default;
+  ~Create_func_trt() override = default;
 };
 
 template<TR_table::field_id_t TRT_FIELD>
@@ -103,8 +103,8 @@ template <class Item_func_trt_trx_seesX>
 class Create_func_trt_trx_sees : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list)
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override
   {
     Item *func= NULL;
     int arg_count= 0;
@@ -132,7 +132,7 @@ public:
 
 protected:
   Create_func_trt_trx_sees() = default;
-  virtual ~Create_func_trt_trx_sees() = default;
+  ~Create_func_trt_trx_sees() override = default;
 };
 
 template<class X>
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 774cdb4acf4..9e50ae833b1 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -233,6 +233,7 @@ ELSE()
   SET(sysconfdir "/etc")
 ENDIF()
 SET(bindir ${INSTALL_BINDIRABS})
+SET(sbindir ${INSTALL_SBINDIRABS})
 SET(libexecdir ${INSTALL_SBINDIRABS})
 SET(scriptdir ${INSTALL_BINDIRABS})
 SET(datadir ${INSTALL_MYSQLSHAREDIRABS})
diff --git a/scripts/sys_schema/before_setup.sql b/scripts/sys_schema/before_setup.sql
index 386125e31e6..c0219a320ac 100644
--- a/scripts/sys_schema/before_setup.sql
+++ b/scripts/sys_schema/before_setup.sql
@@ -17,6 +17,11 @@ SET NAMES utf8 COLLATE utf8_general_ci;
 SET @sql_log_bin = @@sql_log_bin;
 SET sql_log_bin = 0;
 
-CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
+
+-- If the database had existed, let's recreate its db.opt:
+-- * to fix it if it contained unexpected charset/collation values
+-- * to create it if it was removed in a mistake
+ALTER DATABASE sys CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
 
 USE sys;
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
index dbbffee7942..189e54c0c56 100644
--- a/scripts/wsrep_sst_common.sh
+++ b/scripts/wsrep_sst_common.sh
@@ -152,7 +152,6 @@ WSREP_SST_OPT_DATA=""
 WSREP_SST_OPT_AUTH="${WSREP_SST_OPT_AUTH:-}"
 WSREP_SST_OPT_USER="${WSREP_SST_OPT_USER:-}"
 WSREP_SST_OPT_PSWD="${WSREP_SST_OPT_PSWD:-}"
-WSREP_SST_OPT_REMOTE_AUTH="${WSREP_SST_OPT_REMOTE_AUTH:-}"
 WSREP_SST_OPT_DEFAULT=""
 WSREP_SST_OPT_DEFAULTS=""
 WSREP_SST_OPT_EXTRA_DEFAULT=""
@@ -1008,11 +1007,6 @@ in_config()
     echo $found
 }
 
-wsrep_auth_not_set()
-{
-    [ -z "$WSREP_SST_OPT_AUTH" ]
-}
-
 # Get rid of incorrect values resulting from substitution
 # in programs external to the script:
 if [ "$WSREP_SST_OPT_USER" = '(null)' ]; then
@@ -1028,12 +1022,12 @@ fi
 # Let's read the value of the authentication string from the
 # configuration file so that it does not go to the command line
 # and does not appear in the ps output:
-if wsrep_auth_not_set; then
+if [ -z "$WSREP_SST_OPT_AUTH" ]; then
     WSREP_SST_OPT_AUTH=$(parse_cnf 'sst' 'wsrep-sst-auth')
 fi
 
 # Splitting WSREP_SST_OPT_AUTH as "user:password" pair:
-if ! wsrep_auth_not_set; then
+if [ -n "$WSREP_SST_OPT_AUTH" ]; then
     # Extract username as shortest prefix up to first ':' character:
     WSREP_SST_OPT_AUTH_USER="${WSREP_SST_OPT_AUTH%%:*}"
     if [ -z "$WSREP_SST_OPT_USER" ]; then
@@ -1057,19 +1051,20 @@ if ! wsrep_auth_not_set; then
     fi
 fi
 
+WSREP_SST_OPT_REMOTE_AUTH="${WSREP_SST_OPT_REMOTE_AUTH:-}"
+WSREP_SST_OPT_REMOTE_USER=
+WSREP_SST_OPT_REMOTE_PSWD=
+if [ -n "$WSREP_SST_OPT_REMOTE_AUTH" ]; then
+    # Split auth string at the last ':'
+    WSREP_SST_OPT_REMOTE_USER="${WSREP_SST_OPT_REMOTE_AUTH%%:*}"
+    WSREP_SST_OPT_REMOTE_PSWD="${WSREP_SST_OPT_REMOTE_AUTH#*:}"
+fi
+
 readonly WSREP_SST_OPT_USER
 readonly WSREP_SST_OPT_PSWD
 readonly WSREP_SST_OPT_AUTH
-
-if [ -n "$WSREP_SST_OPT_REMOTE_AUTH" ]; then
-    # Split auth string at the last ':'
-    readonly WSREP_SST_OPT_REMOTE_USER="${WSREP_SST_OPT_REMOTE_AUTH%%:*}"
-    readonly WSREP_SST_OPT_REMOTE_PSWD="${WSREP_SST_OPT_REMOTE_AUTH#*:}"
-else
-    readonly WSREP_SST_OPT_REMOTE_USER=
-    readonly WSREP_SST_OPT_REMOTE_PSWD=
-fi
-
+readonly WSREP_SST_OPT_REMOTE_USER
+readonly WSREP_SST_OPT_REMOTE_PSWD
 readonly WSREP_SST_OPT_REMOTE_AUTH
 
 if [ -n "$WSREP_SST_OPT_DATA" ]; then
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
index aee96c5b30b..f66a13f17ca 100644
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@ -1100,15 +1100,13 @@ if [ "$WSREP_SST_OPT_ROLE" = 'donor' ]; then
 
         wsrep_log_info "Using '$itmpdir' as mariadb-backup working directory"
 
-        usrst=0
         if [ -n "$WSREP_SST_OPT_USER" ]; then
            INNOEXTRA="$INNOEXTRA --user='$WSREP_SST_OPT_USER'"
-           usrst=1
         fi
 
         if [ -n "$WSREP_SST_OPT_PSWD" ]; then
             export MYSQL_PWD="$WSREP_SST_OPT_PSWD"
-        elif [ $usrst -eq 1 ]; then
+        elif [ -n "$WSREP_SST_OPT_USER" ]; then
             # Empty password, used for testing, debugging etc.
             unset MYSQL_PWD
         fi
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh
index 5dce2462d01..3bb13c15b07 100644
--- a/scripts/wsrep_sst_mysqldump.sh
+++ b/scripts/wsrep_sst_mysqldump.sh
@@ -47,10 +47,8 @@ if ! $MYSQL_CLIENT --version | grep -q -E '(Distrib 10\.[1-9])|( from 1[1-9]\.)'
 fi
 
 AUTH=""
-usrst=0
 if [ -n "$WSREP_SST_OPT_USER" ]; then
     AUTH="-u$WSREP_SST_OPT_USER"
-    usrst=1
 fi
 
 # Refs https://github.com/codership/mysql-wsrep/issues/141
@@ -64,7 +62,7 @@ fi
 # word, it is arguably more secure than passing password on the command line.
 if [ -n "$WSREP_SST_OPT_PSWD" ]; then
     export MYSQL_PWD="$WSREP_SST_OPT_PSWD"
-elif [ $usrst -eq 1 ]; then
+elif [ -n "$WSREP_SST_OPT_USER" ]; then
     # Empty password, used for testing, debugging etc.
     unset MYSQL_PWD
 fi
diff --git a/sql/ddl_log.cc b/sql/ddl_log.cc
index af0b5c75324..efa4a7e4250 100644
--- a/sql/ddl_log.cc
+++ b/sql/ddl_log.cc
@@ -924,12 +924,12 @@ public:
                             first_error(0), only_ignore_non_existing_errors(0)
   {}
 
-  bool handle_condition(THD *thd,
+  bool handle_condition(THD *,
                         uint sql_errno,
-                        const char* sqlstate,
+                        const char*,
                         Sql_condition::enum_warning_level *level,
-                        const char* msg,
-                        Sql_condition ** cond_hdl)
+                        const char*,
+                        Sql_condition **cond_hdl) override
   {
     *cond_hdl= NULL;
     if (non_existing_table_error(sql_errno) ||
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index bb552aa9de8..3486e76f19d 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -71,14 +71,14 @@ public:
                            Stored_program_creation_ctx **ctx);
 
 public:
-  virtual Stored_program_creation_ctx *clone(MEM_ROOT *mem_root)
+  Stored_program_creation_ctx *clone(MEM_ROOT *mem_root) override
   {
     return new (mem_root)
                Event_creation_ctx(m_client_cs, m_connection_cl, m_db_cl);
   }
 
 protected:
-  virtual Object_creation_ctx *create_backup_ctx(THD *thd) const
+  Object_creation_ctx *create_backup_ctx(THD *thd) const override
   {
     /*
       We can avoid usual backup/restore employed in stored programs since we
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
index c51d5433e15..d66707c0eaa 100644
--- a/sql/event_data_objects.h
+++ b/sql/event_data_objects.h
@@ -117,7 +117,7 @@ public:
   virtual ~Event_queue_element();
 
   virtual bool
-  load_from_row(THD *thd, TABLE *table);
+  load_from_row(THD *thd, TABLE *table) override;
 
   bool
   compute_next_execution_time();
@@ -155,7 +155,7 @@ public:
   init();
 
   virtual bool
-  load_from_row(THD *thd, TABLE *table);
+  load_from_row(THD *thd, TABLE *table) override;
 
   int
   get_create_event(THD *thd, String *buf);
@@ -176,7 +176,7 @@ public:
   Event_job_data();
 
   virtual bool
-  load_from_row(THD *thd, TABLE *table);
+  load_from_row(THD *thd, TABLE *table) override;
 
   bool
   execute(THD *thd, bool drop);
diff --git a/sql/field.h b/sql/field.h
index ab8ffe9e27a..5fc7a8039a5 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -3233,7 +3233,7 @@ public:
     :Field_temporal(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
                     unireg_check_arg, field_name_arg)
     {}
-  bool validate_value_in_record(THD *thd, const uchar *record) const;
+  bool validate_value_in_record(THD *thd, const uchar *record) const override;
 };
 
 
@@ -5201,20 +5201,20 @@ public:
      m_table(NULL)
     {}
   ~Field_row();
-  en_fieldtype tmp_engine_column_type(bool use_packed_rows) const
+  en_fieldtype tmp_engine_column_type(bool use_packed_rows) const override
   {
     DBUG_ASSERT(0);
     return Field::tmp_engine_column_type(use_packed_rows);
   }
   enum_conv_type rpl_conv_type_from(const Conv_source &source,
                                     const Relay_log_info *rli,
-                                    const Conv_param &param) const
+                                    const Conv_param &param) const override
   {
     DBUG_ASSERT(0);
     return CONV_TYPE_IMPOSSIBLE;
   }
-  Virtual_tmp_table **virtual_tmp_table_addr() { return &m_table; }
-  bool sp_prepare_and_store_item(THD *thd, Item **value);
+  Virtual_tmp_table **virtual_tmp_table_addr() override { return &m_table; }
+  bool sp_prepare_and_store_item(THD *thd, Item **value) override;
 };
 
 
diff --git a/sql/gcalc_tools.h b/sql/gcalc_tools.h
index bb1f473e180..f7a05633ace 100644
--- a/sql/gcalc_tools.h
+++ b/sql/gcalc_tools.h
@@ -146,16 +146,16 @@ public:
   Gcalc_operation_transporter(Gcalc_function *fn, Gcalc_heap *heap) :
     Gcalc_shape_transporter(heap), m_fn(fn) {}
 
-  int single_point(double x, double y);
-  int start_line();
-  int complete_line();
-  int start_poly();
-  int complete_poly();
-  int start_ring();
-  int complete_ring();
-  int add_point(double x, double y);
-  int start_collection(int n_objects);
-  int empty_shape();
+  int single_point(double x, double y) override;
+  int start_line() override;
+  int complete_line() override;
+  int start_poly() override;
+  int complete_poly() override;
+  int start_ring() override;
+  int complete_ring() override;
+  int add_point(double x, double y) override;
+  int start_collection(int n_objects) override;
+  int empty_shape() override;
 };
 
 
diff --git a/sql/ha_handler_stats.h b/sql/ha_handler_stats.h
index 995189d063e..6669b8f181a 100644
--- a/sql/ha_handler_stats.h
+++ b/sql/ha_handler_stats.h
@@ -30,6 +30,15 @@ public:
   /* Time spent reading pages, in timer_tracker_frequency() units */
   ulonglong pages_read_time;
 
+  /* 
+    Number of pages that we've requested to prefetch while running the query.
+    Note that we don't know:
+    - how much time was spent reading these pages (and how to count the time
+      if reading was done in parallel)
+    - whether the pages were read by "us" or somebody else...
+  */
+  ulonglong pages_prefetched;
+
   ulonglong undo_records_read;
 
   /* Time spent in engine, in timer_tracker_frequency() units */
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 5a20a5cc11a..32344ea0071 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -10600,7 +10600,7 @@ public:
       m_tot_parts(tot_parts)
   {}
 
-  ~ha_partition_inplace_ctx()
+  ~ha_partition_inplace_ctx() override
   {
     if (handler_ctx_array)
     {
diff --git a/sql/ha_sequence.h b/sql/ha_sequence.h
index 72e59a40479..ac64c978b5b 100644
--- a/sql/ha_sequence.h
+++ b/sql/ha_sequence.h
@@ -67,44 +67,44 @@ public:
   ~ha_sequence();
 
   /* virtual function that are re-implemented for sequence */
-  int open(const char *name, int mode, uint test_if_locked);
+  int open(const char *name, int mode, uint test_if_locked) override;
   int create(const char *name, TABLE *form,
-             HA_CREATE_INFO *create_info);
-  handler *clone(const char *name, MEM_ROOT *mem_root);
-  int write_row(const uchar *buf);
-  Table_flags table_flags() const;
+             HA_CREATE_INFO *create_info) override;
+  handler *clone(const char *name, MEM_ROOT *mem_root) override;
+  int write_row(const uchar *buf) override;
+  Table_flags table_flags() const override;
   /* One can't update or delete from sequence engine */
-  int update_row(const uchar *old_data, const uchar *new_data)
+  int update_row(const uchar *old_data, const uchar *new_data) override
   { return HA_ERR_WRONG_COMMAND; }
-  int delete_row(const uchar *buf)
+  int delete_row(const uchar *buf) override
   { return HA_ERR_WRONG_COMMAND; }
   /* One can't delete from sequence engine */
-  int truncate()
+  int truncate() override
   { return HA_ERR_WRONG_COMMAND; }
   /* Can't use query cache */
-  uint8 table_cache_type()
+  uint8 table_cache_type() override
   { return HA_CACHE_TBL_NOCACHE; }
-  void print_error(int error, myf errflag);
-  int info(uint);
-  LEX_CSTRING *engine_name() { return hton_name(file->ht); }
-  int external_lock(THD *thd, int lock_type);
-  int extra(enum ha_extra_function operation);
+  void print_error(int error, myf errflag) override;
+  int info(uint) override;
+  LEX_CSTRING *engine_name() override { return hton_name(file->ht); }
+  int external_lock(THD *thd, int lock_type) override;
+  int extra(enum ha_extra_function operation) override;
   /* For ALTER ONLINE TABLE */
   bool check_if_incompatible_data(HA_CREATE_INFO *create_info,
-                                  uint table_changes);
+                                  uint table_changes) override;
   void write_lock() { write_locked= 1;}
   void unlock() { write_locked= 0; }
   bool is_locked() { return write_locked; }
 
   /* Functions that are directly mapped to the underlying handler */
-  int rnd_init(bool scan)
+  int rnd_init(bool scan) override
   { return file->rnd_init(scan); }
   /*
     We need to have a lock here to protect engines like MyISAM from
     simultaneous read and write. For sequence's this is not critical
     as this function is used extremely seldom.
   */
-  int rnd_next(uchar *buf)
+  int rnd_next(uchar *buf) override
   {
     int error;
     table->s->sequence->read_lock(table);
@@ -112,9 +112,9 @@ public:
     table->s->sequence->read_unlock(table);
     return error;
   }
-  int rnd_end()
+  int rnd_end() override
   { return file->rnd_end(); }
-  int rnd_pos(uchar *buf, uchar *pos)
+  int rnd_pos(uchar *buf, uchar *pos) override
   {
     int error;
     table->s->sequence->read_lock(table);
@@ -122,37 +122,37 @@ public:
     table->s->sequence->read_unlock(table);
     return error;
   }
-  void position(const uchar *record)
+  void position(const uchar *record) override
   { return file->position(record); }
-  const char *table_type() const
+  const char *table_type() const override
   { return file->table_type(); }
-  ulong index_flags(uint inx, uint part, bool all_parts) const
+  ulong index_flags(uint inx, uint part, bool all_parts) const override
   { return file->index_flags(inx, part, all_parts); }
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type)
+                             enum thr_lock_type lock_type) override
   { return file->store_lock(thd, to, lock_type); }
-  int close(void)
+  int close(void) override
   { return file->close(); }
   const char **bas_ext() const
   { return file->bas_ext(); }
-  int delete_table(const char*name)
+  int delete_table(const char*name) override
   { return file->delete_table(name); }
-  int rename_table(const char *from, const char *to)
+  int rename_table(const char *from, const char *to) override
   { return file->rename_table(from, to); }
-  void unbind_psi()
+  void unbind_psi() override
   { file->unbind_psi(); }
-  void rebind_psi()
+  void rebind_psi() override
   { file->rebind_psi(); }
 
-  bool auto_repair(int error) const
+  bool auto_repair(int error) const override
   { return file->auto_repair(error); }
-  int repair(THD* thd, HA_CHECK_OPT* check_opt)
+  int repair(THD* thd, HA_CHECK_OPT* check_opt) override
   { return file->repair(thd, check_opt); }
-  bool check_and_repair(THD *thd)
+  bool check_and_repair(THD *thd) override
   { return file->check_and_repair(thd); }
-  bool is_crashed() const
+  bool is_crashed() const override
   { return file->is_crashed(); }
-  void column_bitmaps_signal()
+  void column_bitmaps_signal() override
   { return file->column_bitmaps_signal(); }
 
   /* New methods */
diff --git a/sql/handler.cc b/sql/handler.cc
index 359cb0df68d..f9d2b045ee3 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -171,7 +171,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl)
+                        Sql_condition ** cond_hdl) override
   {
     *cond_hdl= NULL;
     if (non_existing_table_error(sql_errno))
@@ -8183,7 +8183,9 @@ int handler::ha_delete_row(const uchar *buf)
 
 #ifdef WITH_WSREP
     THD *thd= ha_thd();
-    if (WSREP_NNULL(thd))
+    /* For streaming replication, when removing fragments, don't call
+    wsrep_after_row() as that would initiate new streaming transaction */
+    if (WSREP_NNULL(thd) && !thd->wsrep_ignore_table)
     {
       /* for streaming replication, the following wsrep_after_row()
       may replicate a fragment, so we have to declare potential PA
diff --git a/sql/handler.h b/sql/handler.h
index 37b403c942c..2c526ae0748 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -5657,8 +5657,8 @@ public:
     : thd(thd_arg), wild(NULL), with_temps(true), tables(tables_arg) {}
   ~Discovered_table_list() = default;
 
-  bool add_table(const char *tname, size_t tlen);
-  bool add_file(const char *fname);
+  bool add_table(const char *tname, size_t tlen) override;
+  bool add_file(const char *fname) override;
 
   void sort();
   void remove_duplicates(); // assumes that the list is sorted
diff --git a/sql/item.cc b/sql/item.cc
index 23929ed94ef..eecca290108 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -4094,6 +4094,7 @@ Item_param::Item_param(THD *thd, const LEX_CSTRING *name_arg,
   */
   set_maybe_null();
   with_flags= with_flags | item_with_t::PARAM;
+  collation= DTCollation(&my_charset_bin, DERIVATION_IGNORABLE);
 }
 
 
@@ -4149,7 +4150,7 @@ void Item_param::sync_clones()
 }
 
 
-void Item_param::set_null()
+void Item_param::set_null(const DTCollation &c)
 {
   DBUG_ENTER("Item_param::set_null");
   /*
@@ -4164,6 +4165,7 @@ void Item_param::set_null()
   */
   max_length= 0;
   decimals= 0;
+  collation= c;
   state= NULL_VALUE;
   DBUG_VOID_RETURN;
 }
@@ -4422,7 +4424,7 @@ bool Item_param::set_from_item(THD *thd, Item *item)
     longlong val= item->val_int();
     if (item->null_value)
     {
-      set_null();
+      set_null(DTCollation_numeric());
       DBUG_RETURN(false);
     }
     else
@@ -4440,7 +4442,7 @@ bool Item_param::set_from_item(THD *thd, Item *item)
     DBUG_RETURN(set_value(thd, item, &tmp, h));
   }
   else
-    set_null();
+    set_null_string(item->collation);
 
   DBUG_RETURN(0);
 }
@@ -5023,7 +5025,7 @@ Item_param::set_value(THD *thd, sp_rcontext *ctx, Item **it)
   if (arg->save_in_value(thd, &tmp) ||
       set_value(thd, arg, &tmp, arg->type_handler()))
   {
-    set_null();
+    set_null_string(arg->collation);
     return false;
   }
   /* It is wrapper => other set_* shoud set null_value */
@@ -8076,7 +8078,7 @@ class Dependency_marker: public Field_enumerator
 public:
   THD *thd;
   st_select_lex *current_select;
-  virtual void visit_field(Item_field *item)
+  void visit_field(Item_field *item) override
   {
     // Find which select the field is in. This is achieved by walking up 
     // the select tree and looking for the table of interest.
@@ -11197,10 +11199,15 @@ bool Item::cleanup_excluding_immutables_processor (void *arg)
   if (!(get_extraction_flag() == MARKER_IMMUTABLE))
     return cleanup_processor(arg);
   else
-  {
-    clear_extraction_flag();
     return false;
-  }
+}
+
+
+bool Item::remove_immutable_flag_processor (void *arg)
+{
+  if (get_extraction_flag() == MARKER_IMMUTABLE)
+    clear_extraction_flag();
+  return false;
 }
 
 
diff --git a/sql/item.h b/sql/item.h
index 6c69f33aecb..3de7af7757d 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -458,16 +458,16 @@ public:
 class Sp_rcontext_handler_local: public Sp_rcontext_handler
 {
 public:
-  const LEX_CSTRING *get_name_prefix() const;
-  sp_rcontext *get_rcontext(sp_rcontext *ctx) const;
+  const LEX_CSTRING *get_name_prefix() const override;
+  sp_rcontext *get_rcontext(sp_rcontext *ctx) const override;
 };
 
 
 class Sp_rcontext_handler_package_body: public Sp_rcontext_handler
 {
 public:
-  const LEX_CSTRING *get_name_prefix() const;
-  sp_rcontext *get_rcontext(sp_rcontext *ctx) const;
+  const LEX_CSTRING *get_name_prefix() const override;
+  sp_rcontext *get_rcontext(sp_rcontext *ctx) const override;
 };
 
 
@@ -2209,6 +2209,7 @@ public:
   virtual bool change_context_processor(void *arg) { return 0; }
   virtual bool reset_query_id_processor(void *arg) { return 0; }
   virtual bool is_expensive_processor(void *arg) { return 0; }
+  bool remove_immutable_flag_processor (void *arg);
 
   // FIXME reduce the number of "add field to bitmap" processors
   virtual bool add_field_to_set_processor(void *arg) { return 0; }
@@ -3065,8 +3066,8 @@ class Item_basic_constant :public Item_basic_value
 public:
   Item_basic_constant(THD *thd): Item_basic_value(thd) {};
   Item_basic_constant(): Item_basic_value() {};
-  bool check_vcol_func_processor(void *arg) { return false; }
-  const Item_const *get_item_const() const { return this; }
+  bool check_vcol_func_processor(void *) override { return false; }
+  const Item_const *get_item_const() const override { return this; }
   virtual Item_basic_constant *make_string_literal_concat(THD *thd,
                                                           const LEX_CSTRING *)
   {
@@ -4245,7 +4246,32 @@ public:
 
   void set_default();
   void set_ignore();
-  void set_null();
+  void set_null(const DTCollation &c);
+  void set_null_string(const DTCollation &c)
+  {
+    /*
+      We need to distinguish explicit NULL (marked by DERIVATION_IGNORABLE)
+      from other item types:
+
+      - These statements should give an error, because
+        the character set of the bound parameter is not known:
+          EXECUTE IMMEDIATE "SELECT ? COLLATE utf8mb4_bin" USING NULL;
+          EXECUTE IMMEDIATE "SELECT ? COLLATE utf8mb4_bin" USING CONCAT(NULL);
+
+      - These statements should return a good result, because
+        the character set of the bound parameter is known:
+          EXECUTE IMMEDIATE "SELECT ? COLLATE utf8mb4_bin"
+                      USING CONVERT(NULL USING utf8mb4);
+          EXECUTE IMMEDIATE "SELECT ? COLLATE utf8mb4_bin"
+                      USING CAST(NULL AS CHAR CHARACTER SET utf8mb4);
+    */
+    set_null(DTCollation(c.collation, MY_MAX(c.derivation,
+                                             DERIVATION_COERCIBLE)));
+  }
+  void set_null()
+  {
+    set_null(DTCollation(&my_charset_bin, DERIVATION_IGNORABLE));
+  }
   void set_int(longlong i, uint32 max_length_arg);
   void set_double(double i);
   void set_decimal(const char *str, ulong length);
@@ -4814,7 +4840,7 @@ public:
                               const LEX_CSTRING &str, CHARSET_INFO *tocs):
     Item_string(thd, name_arg, str, tocs)
   { }
-  virtual bool is_cs_specified() const
+  bool is_cs_specified() const override
   {
     return true;
   }
@@ -4893,7 +4919,7 @@ public:
   {
     max_length= length;
   }
-  bool check_vcol_func_processor(void *arg) 
+  bool check_vcol_func_processor(void *arg) override 
   {
     return mark_unsupported_function("safe_string", arg, VCOL_IMPOSSIBLE);
   }
@@ -4918,7 +4944,7 @@ public:
    :Item_partition_func_safe_string(thd, LEX_CSTRING({header, strlen(header)}),
                                     length * cs->mbmaxlen, cs)
   { }
-  void make_send_field(THD *thd, Send_field *field);
+  void make_send_field(THD *thd, Send_field *field) override;
 };
 
 
@@ -5352,7 +5378,7 @@ public:
   {
     base_flags&= ~item_base_t::MAYBE_NULL;
   }
-  bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
+  bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
   {
     cached_time.copy_to_mysql_time(ltime);
     return (null_value= false);
@@ -5374,7 +5400,7 @@ public:
   {
     base_flags&= ~item_base_t::MAYBE_NULL;
   }
-  bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
+  bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
   {
     cached_time.copy_to_mysql_time(ltime);
     return (null_value= false);
@@ -7349,7 +7375,7 @@ class Item_cache_year: public Item_cache_int
 public:
   Item_cache_year(THD *thd, const Type_handler *handler)
    :Item_cache_int(thd, handler) { }
-  bool get_date(THD *thd, MYSQL_TIME *to, date_mode_t mode)
+  bool get_date(THD *thd, MYSQL_TIME *to, date_mode_t mode) override
   {
     return type_handler_year.Item_get_date_with_warn(thd, this, to, mode);
   }
@@ -7865,9 +7891,9 @@ class Item_iterator_ref_list: public Item_iterator
 public:
   Item_iterator_ref_list(List_iterator<Item*> &arg_list):
     list(arg_list) {}
-  void open() { list.rewind(); }
-  Item *next() { return *(list++); }
-  void close() {}
+  void open() override { list.rewind(); }
+  Item *next() override { return *(list++); }
+  void close() override {}
 };
 
 
@@ -7881,9 +7907,9 @@ class Item_iterator_list: public Item_iterator
 public:
   Item_iterator_list(List_iterator<Item> &arg_list):
     list(arg_list) {}
-  void open() { list.rewind(); }
-  Item *next() { return (list++); }
-  void close() {}
+  void open() override { list.rewind(); }
+  Item *next() override { return (list++); }
+  void close() override {}
 };
 
 
@@ -7897,14 +7923,14 @@ class Item_iterator_row: public Item_iterator
   uint current;
 public:
   Item_iterator_row(Item *base) : base_item(base), current(0) {}
-  void open() { current= 0; }
-  Item *next()
+  void open() override { current= 0; }
+  Item *next() override
   {
     if (current >= base_item->cols())
       return NULL;
     return base_item->element_index(current++);
   }
-  void close() {}
+  void close() override {}
 };
 
 
@@ -7950,84 +7976,85 @@ public:
 
   void change_item(THD *thd, Item *);
 
-  bool fix_fields(THD *thd, Item **it);
+  bool fix_fields(THD *thd, Item **it) override;
 
-  void print(String *str, enum_query_type query_type);
+  void print(String *str, enum_query_type query_type) override;
 
-  Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs);
-  Item *get_tmp_table_item(THD *thd)
+  Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs) override;
+  Item *get_tmp_table_item(THD *thd) override
   { return m_item->get_tmp_table_item(thd); }
-  Item *get_copy(THD *thd)
+  Item *get_copy(THD *thd) override
   { return get_item_copy<Item_direct_ref_to_item>(thd, this); }
   COND *build_equal_items(THD *thd, COND_EQUAL *inherited,
                           bool link_item_fields,
-                          COND_EQUAL **cond_equal_ref)
+                          COND_EQUAL **cond_equal_ref) override
   {
     return m_item->build_equal_items(thd, inherited, link_item_fields,
                                      cond_equal_ref);
   }
-  const char *full_name() const { return m_item->full_name(); }
-  void make_send_field(THD *thd, Send_field *field)
+  LEX_CSTRING full_name_cstring() const override
+  { return m_item->full_name_cstring(); }
+  void make_send_field(THD *thd, Send_field *field) override
   { m_item->make_send_field(thd, field); }
-  bool eq(const Item *item, bool binary_cmp) const
+  bool eq(const Item *item, bool binary_cmp) const override
   {
     const Item *it= item->real_item();
     return m_item->eq(it, binary_cmp);
   }
-  void fix_after_pullout(st_select_lex *new_parent, Item **refptr, bool merge)
+  void fix_after_pullout(st_select_lex *new_parent, Item **refptr, bool merge) override
   { m_item->fix_after_pullout(new_parent, &m_item, merge); }
-  void save_val(Field *to)
+  void save_val(Field *to) override
   { return m_item->save_val(to); }
-  void save_result(Field *to)
+  void save_result(Field *to) override
   { return m_item->save_result(to); }
-  int save_in_field(Field *to, bool no_conversions)
+  int save_in_field(Field *to, bool no_conversions) override
   { return m_item->save_in_field(to, no_conversions); }
-  const Type_handler *type_handler() const { return m_item->type_handler(); }
-  table_map used_tables() const { return m_item->used_tables(); }
-  void update_used_tables()
+  const Type_handler *type_handler() const override { return m_item->type_handler(); }
+  table_map used_tables() const override { return m_item->used_tables(); }
+  void update_used_tables() override
   { m_item->update_used_tables(); }
-  bool const_item() const { return m_item->const_item(); }
-  table_map not_null_tables() const { return m_item->not_null_tables(); }
-  bool walk(Item_processor processor, bool walk_subquery, void *arg)
+  bool const_item() const override { return m_item->const_item(); }
+  table_map not_null_tables() const override { return m_item->not_null_tables(); }
+  bool walk(Item_processor processor, bool walk_subquery, void *arg) override
   {
     return m_item->walk(processor, walk_subquery, arg) ||
       (this->*processor)(arg);
   }
-  bool enumerate_field_refs_processor(void *arg)
+  bool enumerate_field_refs_processor(void *arg) override
   { return m_item->enumerate_field_refs_processor(arg); }
-  Item_field *field_for_view_update()
+  Item_field *field_for_view_update() override
   { return m_item->field_for_view_update(); }
 
   /* Row emulation: forwarding of ROW-related calls to orig_item */
-  uint cols() const
+  uint cols() const override
   { return m_item->cols(); }
-  Item* element_index(uint i)
+  Item* element_index(uint i) override
   { return this; }
-  Item** addr(uint i)
+  Item** addr(uint i) override
   { return  &m_item; }
-  bool check_cols(uint c)
+  bool check_cols(uint c) override
   { return Item::check_cols(c); }
-  bool null_inside()
+  bool null_inside() override
   { return m_item->null_inside(); }
-  void bring_value()
+  void bring_value() override
   {}
 
-  Item_equal *get_item_equal() { return m_item->get_item_equal(); }
-  void set_item_equal(Item_equal *item_eq) { m_item->set_item_equal(item_eq); }
-  Item_equal *find_item_equal(COND_EQUAL *cond_equal)
+  Item_equal *get_item_equal() override { return m_item->get_item_equal(); }
+  void set_item_equal(Item_equal *item_eq) override { m_item->set_item_equal(item_eq); }
+  Item_equal *find_item_equal(COND_EQUAL *cond_equal) override
   { return m_item->find_item_equal(cond_equal); }
-  Item *propagate_equal_fields(THD *thd, const Context &ctx, COND_EQUAL *cond)
+  Item *propagate_equal_fields(THD *thd, const Context &ctx, COND_EQUAL *cond) override
   { return m_item->propagate_equal_fields(thd, ctx, cond); }
-  Item *replace_equal_field(THD *thd, uchar *arg)
+  Item *replace_equal_field(THD *thd, uchar *arg) override
   { return m_item->replace_equal_field(thd, arg); }
 
-  bool excl_dep_on_table(table_map tab_map)
+  bool excl_dep_on_table(table_map tab_map) override
   { return m_item->excl_dep_on_table(tab_map); }
-  bool excl_dep_on_grouping_fields(st_select_lex *sel)
+  bool excl_dep_on_grouping_fields(st_select_lex *sel) override
   { return m_item->excl_dep_on_grouping_fields(sel); }
-  bool is_expensive() { return m_item->is_expensive(); }
+  bool is_expensive() override { return m_item->is_expensive(); }
   void set_item(Item *item) { m_item= item; }
-  Item *build_clone(THD *thd)
+  Item *build_clone(THD *thd) override
   {
     Item *clone_item= m_item->build_clone(thd);
     if (clone_item)
@@ -8042,7 +8069,7 @@ public:
   }
 
   void split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array,
-                      List<Item> &fields, uint flags)
+                      List<Item> &fields, uint flags) override
   {
     m_item->split_sum_func(thd, ref_pointer_array, fields, flags);
   }
@@ -8050,7 +8077,7 @@ public:
     This processor states that this is safe for virtual columns
     (because this Item transparency)
   */
-  bool check_vcol_func_processor(void *arg) { return FALSE;}
+  bool check_vcol_func_processor(void *arg) override { return FALSE;}
 };
 
 inline bool TABLE::mark_column_with_deps(Field *field)
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 880634fca87..cccdf80985e 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -4962,7 +4962,7 @@ class Func_handler_bit_or_int_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     Longlong_null a= item->arguments()[0]->to_longlong_null();
@@ -4975,7 +4975,7 @@ class Func_handler_bit_or_dec_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     VDec a(item->arguments()[0]);
@@ -4997,7 +4997,7 @@ class Func_handler_bit_and_int_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     Longlong_null a= item->arguments()[0]->to_longlong_null();
@@ -5010,7 +5010,7 @@ class Func_handler_bit_and_dec_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     VDec a(item->arguments()[0]);
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 7bcb24d0cbb..325c8e0ea03 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -454,10 +454,10 @@ public:
   Item_bool_func2(THD *thd, Item *a, Item *b):
     Item_bool_func(thd, a, b) { }
 
-  bool is_null() { return MY_TEST(args[0]->is_null() || args[1]->is_null()); }
+  bool is_null() override { return MY_TEST(args[0]->is_null() || args[1]->is_null()); }
   COND *remove_eq_conds(THD *thd, Item::cond_result *cond_value,
-                        bool top_level);
-  bool count_sargable_conds(void *arg);
+                        bool top_level) override;
+  bool count_sargable_conds(void *arg) override;
   /*
     Specifies which result type the function uses to compare its arguments.
     This method is used in equal field propagation.
@@ -472,7 +472,7 @@ public:
     */
     return &type_handler_varchar;
   }
-  SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param, Item **cond_ptr)
+  SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param, Item **cond_ptr) override
   {
     DBUG_ENTER("Item_bool_func2::get_mm_tree");
     DBUG_ASSERT(arg_count == 2);
@@ -505,7 +505,7 @@ class Item_bool_func2_with_rev :public Item_bool_func2
 {
 protected:
   SEL_TREE *get_func_mm_tree(RANGE_OPT_PARAM *param,
-                             Field *field, Item *value)
+                             Field *field, Item *value) override
   {
     DBUG_ENTER("Item_bool_func2_with_rev::get_func_mm_tree");
     Item_func::Functype func_type=
@@ -516,7 +516,7 @@ public:
   Item_bool_func2_with_rev(THD *thd, Item *a, Item *b):
     Item_bool_func2(thd, a, b) { }
   virtual enum Functype rev_functype() const= 0;
-  SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param, Item **cond_ptr)
+  SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param, Item **cond_ptr) override
   {
     DBUG_ENTER("Item_bool_func2_with_rev::get_mm_tree");
     DBUG_ASSERT(arg_count == 2);
@@ -1278,32 +1278,32 @@ public:
     :Item_func_case_abbreviation2(thd, a, b, c)
   { }
 
-  bool date_op(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
+  bool date_op(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
   {
     Datetime_truncation_not_needed dt(thd, find_item(), fuzzydate);
     return (null_value= dt.copy_to_mysql_time(ltime, mysql_timestamp_type()));
   }
-  bool time_op(THD *thd, MYSQL_TIME *ltime)
+  bool time_op(THD *thd, MYSQL_TIME *ltime) override
   {
     return (null_value= Time(find_item()).copy_to_mysql_time(ltime));
   }
-  longlong int_op()
+  longlong int_op() override
   {
     return val_int_from_item(find_item());
   }
-  double real_op()
+  double real_op() override
   {
     return val_real_from_item(find_item());
   }
-  my_decimal *decimal_op(my_decimal *decimal_value)
+  my_decimal *decimal_op(my_decimal *decimal_value) override
   {
     return val_decimal_from_item(find_item(), decimal_value);
   }
-  String *str_op(String *str)
+  String *str_op(String *str) override
   {
     return val_str_from_item(find_item(), str);
   }
-  bool native_op(THD *thd, Native *to)
+  bool native_op(THD *thd, Native *to) override
   {
     return val_native_with_conversion_from_item(thd, find_item(), to,
                                                 type_handler());
@@ -1620,8 +1620,8 @@ public:
 
   in_temporal(THD *thd, uint elements)
     :in_longlong(thd, elements) {};
-  Item *create_item(THD *thd);
-  void value_to_item(uint pos, Item *item)
+  Item *create_item(THD *thd) override;
+  void value_to_item(uint pos, Item *item) override
   {
     packed_longlong *val= reinterpret_cast<packed_longlong*>(base)+pos;
     Item_datetime *dt= static_cast<Item_datetime*>(item);
@@ -1758,7 +1758,7 @@ public:
   cmp_item_sort_string(CHARSET_INFO *cs):
     cmp_item_string(cs),
     value(value_buff, sizeof(value_buff), cs) {}
-  void store_value(Item *item)
+  void store_value(Item *item) override
   {
     value_res= item->val_str(&value);
     m_null_value= item->null_value;
@@ -1770,13 +1770,13 @@ public:
       value_res= &value;
     }
   }
-  int cmp_not_null(const Value *val)
+  int cmp_not_null(const Value *val) override
   {
     DBUG_ASSERT(!val->is_null());
     DBUG_ASSERT(val->is_string());
     return sortcmp(value_res, &val->m_string, cmp_charset) != 0;
   }
-  int cmp(Item *arg)
+  int cmp(Item *arg) override
   {
     char buff[STRING_BUFFER_USUAL_SIZE];
     String tmp(buff, sizeof(buff), cmp_charset), *res= arg->val_str(&tmp);
@@ -1789,12 +1789,12 @@ public:
     else
       return TRUE;
   }
-  int compare(cmp_item *ci)
+  int compare(cmp_item *ci) override
   {
     cmp_item_string *l_cmp= (cmp_item_string *) ci;
     return sortcmp(value_res, l_cmp->value_res, cmp_charset);
-  } 
-  cmp_item *make_same(THD *thd);
+  }
+  cmp_item *make_same(THD *thd) override;
   void set_charset(CHARSET_INFO *cs)
   {
     cmp_charset= cs;
@@ -1807,28 +1807,28 @@ class cmp_item_int : public cmp_item_scalar
   longlong value;
 public:
   cmp_item_int() = default;                           /* Remove gcc warning */
-  void store_value(Item *item)
+  void store_value(Item *item) override
   {
     value= item->val_int();
     m_null_value= item->null_value;
   }
-  int cmp_not_null(const Value *val)
+  int cmp_not_null(const Value *val) override
   {
     DBUG_ASSERT(!val->is_null());
     DBUG_ASSERT(val->is_longlong());
     return value != val->value.m_longlong;
   }
-  int cmp(Item *arg)
+  int cmp(Item *arg) override
   {
     const bool rc= value != arg->val_int();
     return (m_null_value || arg->null_value) ? UNKNOWN : rc;
   }
-  int compare(cmp_item *ci)
+  int compare(cmp_item *ci) override
   {
     cmp_item_int *l_cmp= (cmp_item_int *)ci;
     return (value < l_cmp->value) ? -1 : ((value == l_cmp->value) ? 0 : 1);
   }
-  cmp_item *make_same(THD *thd);
+  cmp_item *make_same(THD *thd) override;
 };
 
 /*
@@ -1840,7 +1840,7 @@ protected:
   longlong value;
 public:
   cmp_item_temporal() = default;
-  int compare(cmp_item *ci);
+  int compare(cmp_item *ci) override;
 };
 
 
@@ -1850,14 +1850,14 @@ public:
   cmp_item_datetime()
    :cmp_item_temporal()
   { }
-  void store_value(Item *item)
+  void store_value(Item *item) override
   {
     value= item->val_datetime_packed(current_thd);
     m_null_value= item->null_value;
   }
-  int cmp_not_null(const Value *val);
-  int cmp(Item *arg);
-  cmp_item *make_same(THD *thd);
+  int cmp_not_null(const Value *val) override;
+  int cmp(Item *arg) override;
+  cmp_item *make_same(THD *thd) override;
 };
 
 
@@ -1867,14 +1867,14 @@ public:
   cmp_item_time()
    :cmp_item_temporal()
   { }
-  void store_value(Item *item)
+  void store_value(Item *item) override
   {
     value= item->val_time_packed(current_thd);
     m_null_value= item->null_value;
   }
-  int cmp_not_null(const Value *val);
-  int cmp(Item *arg);
-  cmp_item *make_same(THD *thd);
+  int cmp_not_null(const Value *val) override;
+  int cmp(Item *arg) override;
+  cmp_item *make_same(THD *thd) override;
 };
 
 
@@ -1883,11 +1883,11 @@ class cmp_item_timestamp: public cmp_item_scalar
   Timestamp_or_zero_datetime_native m_native;
 public:
   cmp_item_timestamp() :cmp_item_scalar() { }
-  void store_value(Item *item);
-  int cmp_not_null(const Value *val);
-  int cmp(Item *arg);
-  int compare(cmp_item *ci);
-  cmp_item *make_same(THD *thd);
+  void store_value(Item *item) override;
+  int cmp_not_null(const Value *val) override;
+  int cmp(Item *arg) override;
+  int compare(cmp_item *ci) override;
+  cmp_item *make_same(THD *thd) override;
 };
 
 
@@ -1896,28 +1896,28 @@ class cmp_item_real : public cmp_item_scalar
   double value;
 public:
   cmp_item_real() = default;                          /* Remove gcc warning */
-  void store_value(Item *item)
+  void store_value(Item *item) override
   {
     value= item->val_real();
     m_null_value= item->null_value;
   }
-  int cmp_not_null(const Value *val)
+  int cmp_not_null(const Value *val) override
   {
     DBUG_ASSERT(!val->is_null());
     DBUG_ASSERT(val->is_double());
     return value != val->value.m_double;
   }
-  int cmp(Item *arg)
+  int cmp(Item *arg) override
   {
     const bool rc= value != arg->val_real();
     return (m_null_value || arg->null_value) ? UNKNOWN : rc;
   }
-  int compare(cmp_item *ci)
+  int compare(cmp_item *ci) override
   {
     cmp_item_real *l_cmp= (cmp_item_real *) ci;
     return (value < l_cmp->value)? -1 : ((value == l_cmp->value) ? 0 : 1);
   }
-  cmp_item *make_same(THD *thd);
+  cmp_item *make_same(THD *thd) override;
 };
 
 
@@ -1926,11 +1926,11 @@ class cmp_item_decimal : public cmp_item_scalar
   my_decimal value;
 public:
   cmp_item_decimal() = default;                       /* Remove gcc warning */
-  void store_value(Item *item);
-  int cmp(Item *arg);
-  int cmp_not_null(const Value *val);
-  int compare(cmp_item *c);
-  cmp_item *make_same(THD *thd);
+  void store_value(Item *item) override;
+  int cmp(Item *arg) override;
+  int cmp_not_null(const Value *val) override;
+  int compare(cmp_item *c) override;
+  cmp_item *make_same(THD *thd) override;
 };
 
 
@@ -1946,28 +1946,28 @@ class cmp_item_sort_string_in_static :public cmp_item_string
 public:
   cmp_item_sort_string_in_static(CHARSET_INFO *cs):
     cmp_item_string(cs) {}
-  void store_value(Item *item)
+  void store_value(Item *item) override
   {
     value_res= item->val_str(&value);
     m_null_value= item->null_value;
   }
-  int cmp_not_null(const Value *val)
+  int cmp_not_null(const Value *val) override
   {
     DBUG_ASSERT(false);
     return TRUE;
   }
-  int cmp(Item *item)
+  int cmp(Item *item) override
   {
     // Should never be called
     DBUG_ASSERT(false);
     return TRUE;
   }
-  int compare(cmp_item *ci)
+  int compare(cmp_item *ci) override
   {
     cmp_item_string *l_cmp= (cmp_item_string *) ci;
     return sortcmp(value_res, l_cmp->value_res, cmp_charset);
   }
-  cmp_item *make_same(THD *thd)
+  cmp_item *make_same(THD *) override
   {
     return new cmp_item_sort_string_in_static(cmp_charset);
   }
@@ -2695,7 +2695,7 @@ public:
   bool prepare_comparators(THD *, const LEX_CSTRING &funcname,
                            const Item_args *args, uint level);
   int cmp(Item *arg) override;
-  int cmp_not_null(const Value *val) override
+  int cmp_not_null(const Value *) override
   {
     DBUG_ASSERT(false);
     return TRUE;
@@ -3695,11 +3695,11 @@ public:
   Item_func_cursor_bool_attr(THD *thd, const LEX_CSTRING *name, uint offset)
    :Item_bool_func(thd), Cursor_ref(name, offset)
   { }
-  bool check_vcol_func_processor(void *arg)
+  bool check_vcol_func_processor(void *arg) override
   {
     return mark_unsupported_function(func_name(), arg, VCOL_SESSION_FUNC);
   }
-  void print(String *str, enum_query_type query_type)
+  void print(String *str, enum_query_type query_type) override
   {
     Cursor_ref::print_func(str, func_name_cstring());
   }
@@ -3794,11 +3794,11 @@ class Eq_creator :public Comp_creator
 public:
   Eq_creator() = default;                             /* Remove gcc warning */
   virtual ~Eq_creator() = default;                    /* Remove gcc warning */
-  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const;
-  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const;
-  const char* symbol(bool invert) const { return invert? "<>" : "="; }
-  bool eqne_op() const { return 1; }
-  bool l_op() const { return 0; }
+  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const override;
+  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const override;
+  const char* symbol(bool invert) const override { return invert? "<>" : "="; }
+  bool eqne_op() const override { return 1; }
+  bool l_op() const override { return 0; }
 };
 
 class Ne_creator :public Comp_creator
@@ -3806,11 +3806,11 @@ class Ne_creator :public Comp_creator
 public:
   Ne_creator() = default;                             /* Remove gcc warning */
   virtual ~Ne_creator() = default;                    /* Remove gcc warning */
-  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const;
-  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const;
-  const char* symbol(bool invert) const { return invert? "=" : "<>"; }
-  bool eqne_op() const { return 1; }
-  bool l_op() const { return 0; }
+  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const override;
+  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const override;
+  const char* symbol(bool invert) const override { return invert? "=" : "<>"; }
+  bool eqne_op() const override { return 1; }
+  bool l_op() const override { return 0; }
 };
 
 class Gt_creator :public Comp_creator
@@ -3818,11 +3818,11 @@ class Gt_creator :public Comp_creator
 public:
   Gt_creator() = default;                             /* Remove gcc warning */
   virtual ~Gt_creator() = default;                    /* Remove gcc warning */
-  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const;
-  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const;
-  const char* symbol(bool invert) const { return invert? "<=" : ">"; }
-  bool eqne_op() const { return 0; }
-  bool l_op() const { return 0; }
+  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const override;
+  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const override;
+  const char* symbol(bool invert) const override { return invert? "<=" : ">"; }
+  bool eqne_op() const override { return 0; }
+  bool l_op() const override { return 0; }
 };
 
 class Lt_creator :public Comp_creator
@@ -3830,11 +3830,11 @@ class Lt_creator :public Comp_creator
 public:
   Lt_creator() = default;                             /* Remove gcc warning */
   virtual ~Lt_creator() = default;                    /* Remove gcc warning */
-  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const;
-  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const;
-  const char* symbol(bool invert) const { return invert? ">=" : "<"; }
-  bool eqne_op() const { return 0; }
-  bool l_op() const { return 1; }
+  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const override;
+  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const override;
+  const char* symbol(bool invert) const override { return invert? ">=" : "<"; }
+  bool eqne_op() const override { return 0; }
+  bool l_op() const override { return 1; }
 };
 
 class Ge_creator :public Comp_creator
@@ -3842,11 +3842,11 @@ class Ge_creator :public Comp_creator
 public:
   Ge_creator() = default;                             /* Remove gcc warning */
   virtual ~Ge_creator() = default;                    /* Remove gcc warning */
-  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const;
-  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const;
-  const char* symbol(bool invert) const { return invert? "<" : ">="; }
-  bool eqne_op() const { return 0; }
-  bool l_op() const { return 0; }
+  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const override;
+  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const override;
+  const char* symbol(bool invert) const override { return invert? "<" : ">="; }
+  bool eqne_op() const override { return 0; }
+  bool l_op() const override { return 0; }
 };
 
 class Le_creator :public Comp_creator
@@ -3854,11 +3854,11 @@ class Le_creator :public Comp_creator
 public:
   Le_creator() = default;                             /* Remove gcc warning */
   virtual ~Le_creator() = default;                    /* Remove gcc warning */
-  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const;
-  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const;
-  const char* symbol(bool invert) const { return invert? ">" : "<="; }
-  bool eqne_op() const { return 0; }
-  bool l_op() const { return 1; }
+  Item_bool_rowready_func2* create(THD *thd, Item *a, Item *b) const override;
+  Item_bool_rowready_func2* create_swap(THD *thd, Item *a, Item *b) const override;
+  const char* symbol(bool invert) const override { return invert? ">" : "<="; }
+  bool eqne_op() const override { return 0; }
+  bool l_op() const override { return 1; }
 };
 
 /*
diff --git a/sql/item_create.cc b/sql/item_create.cc
index bcdc06e374c..44deb904c27 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -79,7 +79,7 @@ protected:
   /** Constructor. */
   Create_sp_func() = default;
   /** Destructor. */
-  virtual ~Create_sp_func() = default;
+  ~Create_sp_func() override = default;
 };
 
 
@@ -92,46 +92,46 @@ protected:
 class Create_func_abs : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_abs s_singleton;
 
 protected:
   Create_func_abs() = default;
-  virtual ~Create_func_abs() = default;
+  ~Create_func_abs() override = default;
 };
 
 
 class Create_func_acos : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_acos s_singleton;
 
 protected:
   Create_func_acos() = default;
-  virtual ~Create_func_acos() = default;
+  ~Create_func_acos() override = default;
 };
 
 
 class Create_func_addtime : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_addtime s_singleton;
 
 protected:
   Create_func_addtime() = default;
-  virtual ~Create_func_addtime() = default;
+  ~Create_func_addtime() override = default;
 };
 
 
 class Create_func_addmonths : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_addmonths s_singleton;
 
@@ -144,36 +144,36 @@ protected:
 class Create_func_aes_encrypt : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                      List<Item> *item_list) override;
 
   static Create_func_aes_encrypt s_singleton;
 
 protected:
   Create_func_aes_encrypt() = default;
-  virtual ~Create_func_aes_encrypt() = default;
+  ~Create_func_aes_encrypt() override = default;
 };
 
 
 class Create_func_aes_decrypt : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                      List<Item> *item_list) override;
 
   static Create_func_aes_decrypt s_singleton;
 
 protected:
   Create_func_aes_decrypt() = default;
-  virtual ~Create_func_aes_decrypt() = default;
+  ~Create_func_aes_decrypt() override = default;
 };
 
 
 class Create_func_kdf : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                      List<Item> *item_list) override;
 
   static Create_func_kdf s_singleton;
 
@@ -186,112 +186,112 @@ protected:
 class Create_func_asin : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_asin s_singleton;
 
 protected:
   Create_func_asin() = default;
-  virtual ~Create_func_asin() = default;
+  ~Create_func_asin() override = default;
 };
 
 
 class Create_func_atan : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_atan s_singleton;
 
 protected:
   Create_func_atan() = default;
-  virtual ~Create_func_atan() = default;
+  ~Create_func_atan() override = default;
 };
 
 
 class Create_func_benchmark : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_benchmark s_singleton;
 
 protected:
   Create_func_benchmark() = default;
-  virtual ~Create_func_benchmark() = default;
+  ~Create_func_benchmark() override = default;
 };
 
 
 class Create_func_bin : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_bin s_singleton;
 
 protected:
   Create_func_bin() = default;
-  virtual ~Create_func_bin() = default;
+  ~Create_func_bin() override = default;
 };
 
 
 class Create_func_binlog_gtid_pos : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_binlog_gtid_pos s_singleton;
 
 protected:
   Create_func_binlog_gtid_pos() = default;
-  virtual ~Create_func_binlog_gtid_pos() = default;
+  ~Create_func_binlog_gtid_pos() override = default;
 };
 
 
 class Create_func_bit_count : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_bit_count s_singleton;
 
 protected:
   Create_func_bit_count() = default;
-  virtual ~Create_func_bit_count() = default;
+  ~Create_func_bit_count() override = default;
 };
 
 
 class Create_func_bit_length : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_bit_length s_singleton;
 
 protected:
   Create_func_bit_length() = default;
-  virtual ~Create_func_bit_length() = default;
+  ~Create_func_bit_length() override = default;
 };
 
 
 class Create_func_ceiling : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_ceiling s_singleton;
 
 protected:
   Create_func_ceiling() = default;
-  virtual ~Create_func_ceiling() = default;
+  ~Create_func_ceiling() override = default;
 };
 
 
 class Create_func_collation : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_collation s_singleton;
 
@@ -304,95 +304,95 @@ protected:
 class Create_func_chr : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_chr s_singleton;
 
 protected:
   Create_func_chr() = default;
-  virtual ~Create_func_chr() = default;
+  ~Create_func_chr() override = default;
 };
 
 
 class Create_func_char_length : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_char_length s_singleton;
 
 protected:
   Create_func_char_length() = default;
-  virtual ~Create_func_char_length() = default;
+  ~Create_func_char_length() override = default;
 };
 
 
 class Create_func_coercibility : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_coercibility s_singleton;
 
 protected:
   Create_func_coercibility() = default;
-  virtual ~Create_func_coercibility() = default;
+  ~Create_func_coercibility() override = default;
 };
 
 class Create_func_dyncol_check : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_dyncol_check s_singleton;
 
 protected:
   Create_func_dyncol_check() = default;
-  virtual ~Create_func_dyncol_check() = default;
+  ~Create_func_dyncol_check() override = default;
 };
 
 class Create_func_dyncol_exists : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_dyncol_exists s_singleton;
 
 protected:
   Create_func_dyncol_exists() = default;
-  virtual ~Create_func_dyncol_exists() = default;
+  ~Create_func_dyncol_exists() override = default;
 };
 
 class Create_func_dyncol_list : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_dyncol_list s_singleton;
 
 protected:
   Create_func_dyncol_list() = default;
-  virtual ~Create_func_dyncol_list() = default;
+  ~Create_func_dyncol_list() override = default;
 };
 
 class Create_func_dyncol_json : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_dyncol_json s_singleton;
 
 protected:
   Create_func_dyncol_json() = default;
-  virtual ~Create_func_dyncol_json() = default;
+  ~Create_func_dyncol_json() override = default;
 };
 
 
 class Create_func_coalesce : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                      List<Item> *item_list) override;
 
   static Create_func_coalesce s_singleton;
 
@@ -405,62 +405,62 @@ protected:
 class Create_func_compress : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_compress s_singleton;
 
 protected:
   Create_func_compress() = default;
-  virtual ~Create_func_compress() = default;
+  ~Create_func_compress() override = default;
 };
 
 
 class Create_func_concat : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_concat s_singleton;
 
 protected:
   Create_func_concat() = default;
-  virtual ~Create_func_concat() = default;
+  ~Create_func_concat() override = default;
 };
 
 
 class Create_func_concat_operator_oracle : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_concat_operator_oracle s_singleton;
 
 protected:
   Create_func_concat_operator_oracle() = default;
-  virtual ~Create_func_concat_operator_oracle() = default;
+  ~Create_func_concat_operator_oracle() override = default;
 };
 
 
 class Create_func_decode_histogram : public Create_func_arg2
 {
 public:
-  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_decode_histogram s_singleton;
 
 protected:
   Create_func_decode_histogram() = default;
-  virtual ~Create_func_decode_histogram() = default;
+  ~Create_func_decode_histogram() override = default;
 };
 
 
 class Create_func_decode_oracle : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list)
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override
   {
     if (unlikely(!item_list || item_list->elements < 3))
     {
@@ -474,15 +474,15 @@ public:
 
 protected:
   Create_func_decode_oracle() = default;
-  virtual ~Create_func_decode_oracle() = default;
+  ~Create_func_decode_oracle() override = default;
 };
 
 
 class Create_func_decode : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list)
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override
   {
     if (unlikely(!item_list || item_list->elements != 2))
     {
@@ -498,41 +498,41 @@ public:
 
 protected:
   Create_func_decode() {}
-  virtual ~Create_func_decode() {}
+  ~Create_func_decode() override {}
 };
 
 
 class Create_func_concat_ws : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_concat_ws s_singleton;
 
 protected:
   Create_func_concat_ws() = default;
-  virtual ~Create_func_concat_ws() = default;
+  ~Create_func_concat_ws() override = default;
 };
 
 
 class Create_func_connection_id : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_connection_id s_singleton;
 
 protected:
   Create_func_connection_id() = default;
-  virtual ~Create_func_connection_id() = default;
+  ~Create_func_connection_id() override = default;
 };
 
 
 class Create_func_database : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_database s_singleton;
 
@@ -545,65 +545,65 @@ protected:
 class Create_func_nvl2 : public Create_func_arg3
 {
 public:
-  virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3);
+  Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) override;
 
   static Create_func_nvl2 s_singleton;
 
 protected:
   Create_func_nvl2() = default;
-  virtual ~Create_func_nvl2() = default;
+  ~Create_func_nvl2() override = default;
 };
 
 
 class Create_func_conv : public Create_func_arg3
 {
 public:
-  virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3);
+  Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) override;
 
   static Create_func_conv s_singleton;
 
 protected:
   Create_func_conv() = default;
-  virtual ~Create_func_conv() = default;
+  ~Create_func_conv() override = default;
 };
 
 
 class Create_func_convert_tz : public Create_func_arg3
 {
 public:
-  virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3);
+  Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) override;
 
   static Create_func_convert_tz s_singleton;
 
 protected:
   Create_func_convert_tz() = default;
-  virtual ~Create_func_convert_tz() = default;
+  ~Create_func_convert_tz() override = default;
 };
 
 
 class Create_func_cos : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_cos s_singleton;
 
 protected:
   Create_func_cos() = default;
-  virtual ~Create_func_cos() = default;
+  ~Create_func_cos() override = default;
 };
 
 
 class Create_func_cot : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_cot s_singleton;
 
 protected:
   Create_func_cot() = default;
-  virtual ~Create_func_cot() = default;
+  ~Create_func_cot() override = default;
 };
 
 
@@ -617,7 +617,7 @@ public:
 
 protected:
   Create_func_crc32() = default;
-  virtual ~Create_func_crc32() = default;
+  ~Create_func_crc32() override = default;
 };
 
 
@@ -638,21 +638,21 @@ protected:
 class Create_func_datediff : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_datediff s_singleton;
 
 protected:
   Create_func_datediff() = default;
-  virtual ~Create_func_datediff() = default;
+  ~Create_func_datediff() override = default;
 };
 
 
 class Create_func_date_format : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                      List<Item> *item_list) override;
 
   static Create_func_date_format s_singleton;
 
@@ -667,208 +667,208 @@ protected:
 class Create_func_dayname : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_dayname s_singleton;
 
 protected:
   Create_func_dayname() = default;
-  virtual ~Create_func_dayname() = default;
+  ~Create_func_dayname() override = default;
 };
 
 
 class Create_func_dayofmonth : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_dayofmonth s_singleton;
 
 protected:
   Create_func_dayofmonth() = default;
-  virtual ~Create_func_dayofmonth() = default;
+  ~Create_func_dayofmonth() override = default;
 };
 
 
 class Create_func_dayofweek : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_dayofweek s_singleton;
 
 protected:
   Create_func_dayofweek() = default;
-  virtual ~Create_func_dayofweek() = default;
+  ~Create_func_dayofweek() override = default;
 };
 
 
 class Create_func_dayofyear : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_dayofyear s_singleton;
 
 protected:
   Create_func_dayofyear() = default;
-  virtual ~Create_func_dayofyear() = default;
+  ~Create_func_dayofyear() override = default;
 };
 
 
 class Create_func_degrees : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_degrees s_singleton;
 
 protected:
   Create_func_degrees() = default;
-  virtual ~Create_func_degrees() = default;
+  ~Create_func_degrees() override = default;
 };
 
 
 class Create_func_des_decrypt : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_des_decrypt s_singleton;
 
 protected:
   Create_func_des_decrypt() = default;
-  virtual ~Create_func_des_decrypt() = default;
+  ~Create_func_des_decrypt() override = default;
 };
 
 
 class Create_func_des_encrypt : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_des_encrypt s_singleton;
 
 protected:
   Create_func_des_encrypt() = default;
-  virtual ~Create_func_des_encrypt() = default;
+  ~Create_func_des_encrypt() override = default;
 };
 
 
 class Create_func_elt : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_elt s_singleton;
 
 protected:
   Create_func_elt() = default;
-  virtual ~Create_func_elt() = default;
+  ~Create_func_elt() override = default;
 };
 
 
 class Create_func_encode : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_encode s_singleton;
 
 protected:
   Create_func_encode() = default;
-  virtual ~Create_func_encode() = default;
+  ~Create_func_encode() override = default;
 };
 
 
 class Create_func_encrypt : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_encrypt s_singleton;
 
 protected:
   Create_func_encrypt() = default;
-  virtual ~Create_func_encrypt() = default;
+  ~Create_func_encrypt() override = default;
 };
 
 
 class Create_func_exp : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_exp s_singleton;
 
 protected:
   Create_func_exp() = default;
-  virtual ~Create_func_exp() = default;
+  ~Create_func_exp() override = default;
 };
 
 
 class Create_func_export_set : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_export_set s_singleton;
 
 protected:
   Create_func_export_set() = default;
-  virtual ~Create_func_export_set() = default;
+  ~Create_func_export_set() override = default;
 };
 
 
 class Create_func_field : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_field s_singleton;
 
 protected:
   Create_func_field() = default;
-  virtual ~Create_func_field() = default;
+  ~Create_func_field() override = default;
 };
 
 
 class Create_func_find_in_set : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_find_in_set s_singleton;
 
 protected:
   Create_func_find_in_set() = default;
-  virtual ~Create_func_find_in_set() = default;
+  ~Create_func_find_in_set() override = default;
 };
 
 
 class Create_func_floor : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_floor s_singleton;
 
 protected:
   Create_func_floor() = default;
-  virtual ~Create_func_floor() = default;
+  ~Create_func_floor() override = default;
 };
 
 
 class Create_func_format_pico_time : public Create_func_arg1
 {
 public:
-    virtual Item *create_1_arg(THD *thd, Item *arg1);
+    Item *create_1_arg(THD *thd, Item *arg1) override;
 
     static Create_func_format_pico_time s_singleton;
 
@@ -881,179 +881,179 @@ protected:
 class Create_func_format : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_format s_singleton;
 
 protected:
   Create_func_format() = default;
-  virtual ~Create_func_format() = default;
+  ~Create_func_format() override = default;
 };
 
 
 class Create_func_found_rows : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_found_rows s_singleton;
 
 protected:
   Create_func_found_rows() = default;
-  virtual ~Create_func_found_rows() = default;
+  ~Create_func_found_rows() override = default;
 };
 
 
 class Create_func_from_base64 : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_from_base64 s_singleton;
 
 protected:
   Create_func_from_base64() = default;
-  virtual ~Create_func_from_base64() = default;
+  ~Create_func_from_base64() override = default;
 };
 
 
 class Create_func_from_days : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_from_days s_singleton;
 
 protected:
   Create_func_from_days() = default;
-  virtual ~Create_func_from_days() = default;
+  ~Create_func_from_days() override = default;
 };
 
 
 class Create_func_from_unixtime : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_from_unixtime s_singleton;
 
 protected:
   Create_func_from_unixtime() = default;
-  virtual ~Create_func_from_unixtime() = default;
+  ~Create_func_from_unixtime() override = default;
 };
 
 
 class Create_func_get_lock : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_get_lock s_singleton;
 
 protected:
   Create_func_get_lock() = default;
-  virtual ~Create_func_get_lock() = default;
+  ~Create_func_get_lock() override = default;
 };
 
 
 class Create_func_greatest : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_greatest s_singleton;
 
 protected:
   Create_func_greatest() = default;
-  virtual ~Create_func_greatest() = default;
+  ~Create_func_greatest() override = default;
 };
 
 
 class Create_func_hex : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_hex s_singleton;
 
 protected:
   Create_func_hex() = default;
-  virtual ~Create_func_hex() = default;
+  ~Create_func_hex() override = default;
 };
 
 
 class Create_func_ifnull : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_ifnull s_singleton;
 
 protected:
   Create_func_ifnull() = default;
-  virtual ~Create_func_ifnull() = default;
+  ~Create_func_ifnull() override = default;
 };
 
 
 class Create_func_instr : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_instr s_singleton;
 
 protected:
   Create_func_instr() = default;
-  virtual ~Create_func_instr() = default;
+  ~Create_func_instr() override = default;
 };
 
 
 class Create_func_is_free_lock : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_is_free_lock s_singleton;
 
 protected:
   Create_func_is_free_lock() = default;
-  virtual ~Create_func_is_free_lock() = default;
+  ~Create_func_is_free_lock() override = default;
 };
 
 
 class Create_func_is_used_lock : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_is_used_lock s_singleton;
 
 protected:
   Create_func_is_used_lock() = default;
-  virtual ~Create_func_is_used_lock() = default;
+  ~Create_func_is_used_lock() override = default;
 };
 
 
 class Create_func_isnull : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_isnull s_singleton;
 
 protected:
   Create_func_isnull() = default;
-  virtual ~Create_func_isnull() = default;
+  ~Create_func_isnull() override = default;
 };
 
 
 class Create_func_json_normalize : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_normalize s_singleton;
 
@@ -1065,7 +1065,7 @@ protected:
 class Create_func_json_object_to_array : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_object_to_array s_singleton;
 
@@ -1077,7 +1077,7 @@ protected:
 class Create_func_json_equals : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_equals s_singleton;
 
@@ -1090,375 +1090,375 @@ protected:
 class Create_func_json_exists : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_exists s_singleton;
 
 protected:
   Create_func_json_exists() = default;
-  virtual ~Create_func_json_exists() = default;
+  ~Create_func_json_exists() override = default;
 };
 
 
 class Create_func_json_valid : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_valid s_singleton;
 
 protected:
   Create_func_json_valid() = default;
-  virtual ~Create_func_json_valid() = default;
+  ~Create_func_json_valid() override = default;
 };
 
 
 class Create_func_json_compact : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_compact s_singleton;
 
 protected:
   Create_func_json_compact() = default;
-  virtual ~Create_func_json_compact() = default;
+  ~Create_func_json_compact() override = default;
 };
 
 
 class Create_func_json_loose : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_loose s_singleton;
 
 protected:
   Create_func_json_loose() = default;
-  virtual ~Create_func_json_loose() = default;
+  ~Create_func_json_loose() override = default;
 };
 
 
 class Create_func_json_detailed: public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_detailed s_singleton;
 
 protected:
   Create_func_json_detailed() = default;
-  virtual ~Create_func_json_detailed() = default;
+  ~Create_func_json_detailed() override = default;
 };
 
 
 class Create_func_json_type : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_type s_singleton;
 
 protected:
   Create_func_json_type() = default;
-  virtual ~Create_func_json_type() = default;
+  ~Create_func_json_type() override = default;
 };
 
 
 class Create_func_json_depth : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_depth s_singleton;
 
 protected:
   Create_func_json_depth() = default;
-  virtual ~Create_func_json_depth() = default;
+  ~Create_func_json_depth() override = default;
 };
 
 
 class Create_func_json_value : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_value s_singleton;
 
 protected:
   Create_func_json_value() = default;
-  virtual ~Create_func_json_value() = default;
+  ~Create_func_json_value() override = default;
 };
 
 
 class Create_func_json_query : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_query s_singleton;
 
 protected:
   Create_func_json_query() = default;
-  virtual ~Create_func_json_query() = default;
+  ~Create_func_json_query() override = default;
 };
 
 
 class Create_func_json_keys: public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_keys s_singleton;
 
 protected:
   Create_func_json_keys() = default;
-  virtual ~Create_func_json_keys() = default;
+  ~Create_func_json_keys() override = default;
 };
 
 
 class Create_func_json_contains: public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_contains s_singleton;
 
 protected:
   Create_func_json_contains() = default;
-  virtual ~Create_func_json_contains() = default;
+  ~Create_func_json_contains() override = default;
 };
 
 
 class Create_func_json_contains_path : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_contains_path s_singleton;
 
 protected:
   Create_func_json_contains_path() = default;
-  virtual ~Create_func_json_contains_path() = default;
+  ~Create_func_json_contains_path() override = default;
 };
 
 
 class Create_func_json_extract : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_extract s_singleton;
 
 protected:
   Create_func_json_extract() = default;
-  virtual ~Create_func_json_extract() = default;
+  ~Create_func_json_extract() override = default;
 };
 
 
 class Create_func_json_search : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_search s_singleton;
 
 protected:
   Create_func_json_search() = default;
-  virtual ~Create_func_json_search() = default;
+  ~Create_func_json_search() override = default;
 };
 
 
 class Create_func_json_array : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_array s_singleton;
 
 protected:
   Create_func_json_array() = default;
-  virtual ~Create_func_json_array() = default;
+  ~Create_func_json_array() override = default;
 };
 
 
 class Create_func_json_array_append : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_array_append s_singleton;
 
 protected:
   Create_func_json_array_append() = default;
-  virtual ~Create_func_json_array_append() = default;
+  ~Create_func_json_array_append() override = default;
 };
 
 
 class Create_func_json_array_insert : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_array_insert s_singleton;
 
 protected:
   Create_func_json_array_insert() = default;
-  virtual ~Create_func_json_array_insert() = default;
+  ~Create_func_json_array_insert() override = default;
 };
 
 
 class Create_func_json_insert : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_insert s_singleton;
 
 protected:
   Create_func_json_insert() = default;
-  virtual ~Create_func_json_insert() = default;
+  ~Create_func_json_insert() override = default;
 };
 
 
 class Create_func_json_set : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_set s_singleton;
 
 protected:
   Create_func_json_set() = default;
-  virtual ~Create_func_json_set() = default;
+  ~Create_func_json_set() override = default;
 };
 
 
 class Create_func_json_replace : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_replace s_singleton;
 
 protected:
   Create_func_json_replace() = default;
-  virtual ~Create_func_json_replace() = default;
+  ~Create_func_json_replace() override = default;
 };
 
 
 class Create_func_json_remove : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_remove s_singleton;
 
 protected:
   Create_func_json_remove() = default;
-  virtual ~Create_func_json_remove() = default;
+  ~Create_func_json_remove() override = default;
 };
 
 
 class Create_func_json_object : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_object s_singleton;
 
 protected:
   Create_func_json_object() = default;
-  virtual ~Create_func_json_object() = default;
+  ~Create_func_json_object() override = default;
 };
 
 
 class Create_func_json_length : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_length s_singleton;
 
 protected:
   Create_func_json_length() = default;
-  virtual ~Create_func_json_length() = default;
+  ~Create_func_json_length() override = default;
 };
 
 
 class Create_func_json_merge : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_merge s_singleton;
 
 protected:
   Create_func_json_merge() = default;
-  virtual ~Create_func_json_merge() = default;
+  ~Create_func_json_merge() override = default;
 };
 
 
 class Create_func_json_merge_patch : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_json_merge_patch s_singleton;
 
 protected:
   Create_func_json_merge_patch() = default;
-  virtual ~Create_func_json_merge_patch() = default;
+  ~Create_func_json_merge_patch() override = default;
 };
 
 
 class Create_func_json_quote : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_quote s_singleton;
 
 protected:
   Create_func_json_quote() = default;
-  virtual ~Create_func_json_quote() = default;
+  ~Create_func_json_quote() override = default;
 };
 
 
 class Create_func_json_unquote : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_json_unquote s_singleton;
 
 protected:
   Create_func_json_unquote() = default;
-  virtual ~Create_func_json_unquote() = default;
+  ~Create_func_json_unquote() override = default;
 };
 
 
 class Create_func_json_overlaps: public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_overlaps s_singleton;
 
@@ -1470,7 +1470,7 @@ protected:
 class Create_func_json_schema_valid: public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_schema_valid s_singleton;
 
@@ -1482,7 +1482,7 @@ protected:
 class Create_func_json_key_value : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_key_value s_singleton;
 
@@ -1495,7 +1495,7 @@ protected:
 class Create_func_json_array_intersect : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_array_intersect s_singleton;
 
@@ -1508,7 +1508,7 @@ protected:
 class Create_func_json_object_filter_keys : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_json_object_filter_keys s_singleton;
 
@@ -1521,85 +1521,85 @@ protected:
 class Create_func_last_day : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_last_day s_singleton;
 
 protected:
   Create_func_last_day() = default;
-  virtual ~Create_func_last_day() = default;
+  ~Create_func_last_day() override = default;
 };
 
 
 class Create_func_last_insert_id : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_last_insert_id s_singleton;
 
 protected:
   Create_func_last_insert_id() = default;
-  virtual ~Create_func_last_insert_id() = default;
+  ~Create_func_last_insert_id() override = default;
 };
 
 
 class Create_func_lcase : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_lcase s_singleton;
 
 protected:
   Create_func_lcase() = default;
-  virtual ~Create_func_lcase() = default;
+  ~Create_func_lcase() override = default;
 };
 
 
 class Create_func_least : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_least s_singleton;
 
 protected:
   Create_func_least() = default;
-  virtual ~Create_func_least() = default;
+  ~Create_func_least() override = default;
 };
 
 
 class Create_func_length : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_length s_singleton;
 
 protected:
   Create_func_length() = default;
-  virtual ~Create_func_length() = default;
+  ~Create_func_length() override = default;
 };
 
 class Create_func_octet_length : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_octet_length s_singleton;
 
 protected:
   Create_func_octet_length() = default;
-  virtual ~Create_func_octet_length() = default;
+  ~Create_func_octet_length() override = default;
 };
 
 class Create_func_old_password : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_old_password s_singleton;
 
@@ -1612,7 +1612,7 @@ protected:
 class Create_func_password : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_password s_singleton;
 
@@ -1626,26 +1626,26 @@ protected:
 class Create_func_like_range_min : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_like_range_min s_singleton;
 
 protected:
   Create_func_like_range_min() = default;
-  virtual ~Create_func_like_range_min() = default;
+  ~Create_func_like_range_min() override = default;
 };
 
 
 class Create_func_like_range_max : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_like_range_max s_singleton;
 
 protected:
   Create_func_like_range_max() = default;
-  virtual ~Create_func_like_range_max() = default;
+  ~Create_func_like_range_max() override = default;
 };
 #endif
 
@@ -1653,88 +1653,88 @@ protected:
 class Create_func_ln : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_ln s_singleton;
 
 protected:
   Create_func_ln() = default;
-  virtual ~Create_func_ln() = default;
+  ~Create_func_ln() override = default;
 };
 
 
 class Create_func_load_file : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_load_file s_singleton;
 
 protected:
   Create_func_load_file() = default;
-  virtual ~Create_func_load_file() = default;
+  ~Create_func_load_file() override = default;
 };
 
 
 class Create_func_locate : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_locate s_singleton;
 
 protected:
   Create_func_locate() = default;
-  virtual ~Create_func_locate() = default;
+  ~Create_func_locate() override = default;
 };
 
 
 class Create_func_log : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_log s_singleton;
 
 protected:
   Create_func_log() = default;
-  virtual ~Create_func_log() = default;
+  ~Create_func_log() override = default;
 };
 
 
 class Create_func_log10 : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_log10 s_singleton;
 
 protected:
   Create_func_log10() = default;
-  virtual ~Create_func_log10() = default;
+  ~Create_func_log10() override = default;
 };
 
 
 class Create_func_log2 : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_log2 s_singleton;
 
 protected:
   Create_func_log2() = default;
-  virtual ~Create_func_log2() = default;
+  ~Create_func_log2() override = default;
 };
 
 
 class Create_func_lpad : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list)
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override
   {
     return create_native_std(thd, name, item_list);
   }
@@ -1742,7 +1742,7 @@ public:
 
 protected:
   Create_func_lpad() = default;
-  virtual ~Create_func_lpad() = default;
+  ~Create_func_lpad() override = default;
   Item *create_native_std(THD *thd, const LEX_CSTRING *name,
                           List<Item> *items);
   Item *create_native_oracle(THD *thd, const LEX_CSTRING *name,
@@ -1754,7 +1754,7 @@ class Create_func_lpad_oracle : public Create_func_lpad
 {
 public:
   Item *create_native(THD *thd, const LEX_CSTRING *name,
-                      List<Item> *item_list)
+                      List<Item> *item_list) override
   {
     return create_native_oracle(thd, name, item_list);
   }
@@ -1765,114 +1765,114 @@ public:
 class Create_func_ltrim : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_ltrim s_singleton;
 
 protected:
   Create_func_ltrim() = default;
-  virtual ~Create_func_ltrim() = default;
+  ~Create_func_ltrim() override = default;
 };
 
 
 class Create_func_ltrim_oracle : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_ltrim_oracle s_singleton;
 
 protected:
   Create_func_ltrim_oracle() = default;
-  virtual ~Create_func_ltrim_oracle() = default;
+  ~Create_func_ltrim_oracle() override = default;
 };
 
 
 class Create_func_makedate : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_makedate s_singleton;
 
 protected:
   Create_func_makedate() = default;
-  virtual ~Create_func_makedate() = default;
+  ~Create_func_makedate() override = default;
 };
 
 
 class Create_func_maketime : public Create_func_arg3
 {
 public:
-  virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3);
+  Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) override;
 
   static Create_func_maketime s_singleton;
 
 protected:
   Create_func_maketime() = default;
-  virtual ~Create_func_maketime() = default;
+  ~Create_func_maketime() override = default;
 };
 
 
 class Create_func_make_set : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_make_set s_singleton;
 
 protected:
   Create_func_make_set() = default;
-  virtual ~Create_func_make_set() = default;
+  ~Create_func_make_set() override = default;
 };
 
 
 class Create_func_master_pos_wait : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_master_pos_wait s_singleton;
 
 protected:
   Create_func_master_pos_wait() = default;
-  virtual ~Create_func_master_pos_wait() = default;
+  ~Create_func_master_pos_wait() override = default;
 };
 
 
 class Create_func_master_gtid_wait : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_master_gtid_wait s_singleton;
 
 protected:
   Create_func_master_gtid_wait() = default;
-  virtual ~Create_func_master_gtid_wait() = default;
+  ~Create_func_master_gtid_wait() override = default;
 };
 
 
 class Create_func_md5 : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_md5 s_singleton;
 
 protected:
   Create_func_md5() = default;
-  virtual ~Create_func_md5() = default;
+  ~Create_func_md5() override = default;
 };
 
 
 class Create_func_microsecond : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_microsecond s_singleton;
 
@@ -1885,7 +1885,7 @@ protected:
 class Create_func_mod : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_mod s_singleton;
 
@@ -1898,32 +1898,32 @@ protected:
 class Create_func_monthname : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_monthname s_singleton;
 
 protected:
   Create_func_monthname() = default;
-  virtual ~Create_func_monthname() = default;
+  ~Create_func_monthname() override = default;
 };
 
 
 class Create_func_name_const : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_name_const s_singleton;
 
 protected:
   Create_func_name_const() = default;
-  virtual ~Create_func_name_const() = default;
+  ~Create_func_name_const() override = default;
 };
 
 class Create_func_natural_sort_key : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1) override;
+  Item *create_1_arg(THD *thd, Item *arg1) override;
   static Create_func_natural_sort_key s_singleton;
 protected:
   Create_func_natural_sort_key() = default;
@@ -1933,98 +1933,98 @@ protected:
 class Create_func_nullif : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_nullif s_singleton;
 
 protected:
   Create_func_nullif() = default;
-  virtual ~Create_func_nullif() = default;
+  ~Create_func_nullif() override = default;
 };
 
 
 class Create_func_oct : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_oct s_singleton;
 
 protected:
   Create_func_oct() = default;
-  virtual ~Create_func_oct() = default;
+  ~Create_func_oct() override = default;
 };
 
 
 class Create_func_ord : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_ord s_singleton;
 
 protected:
   Create_func_ord() = default;
-  virtual ~Create_func_ord() = default;
+  ~Create_func_ord() override = default;
 };
 
 
 class Create_func_period_add : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_period_add s_singleton;
 
 protected:
   Create_func_period_add() = default;
-  virtual ~Create_func_period_add() = default;
+  ~Create_func_period_add() override = default;
 };
 
 
 class Create_func_period_diff : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_period_diff s_singleton;
 
 protected:
   Create_func_period_diff() = default;
-  virtual ~Create_func_period_diff() = default;
+  ~Create_func_period_diff() override = default;
 };
 
 
 class Create_func_pi : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_pi s_singleton;
 
 protected:
   Create_func_pi() = default;
-  virtual ~Create_func_pi() = default;
+  ~Create_func_pi() override = default;
 };
 
 
 class Create_func_pow : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_pow s_singleton;
 
 protected:
   Create_func_pow() = default;
-  virtual ~Create_func_pow() = default;
+  ~Create_func_pow() override = default;
 };
 
 
 class Create_func_quarter : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_quarter s_singleton;
 
@@ -2037,26 +2037,26 @@ protected:
 class Create_func_quote : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_quote s_singleton;
 
 protected:
   Create_func_quote() = default;
-  virtual ~Create_func_quote() = default;
+  ~Create_func_quote() override = default;
 };
 
 
 class Create_func_regexp_instr : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_regexp_instr s_singleton;
 
 protected:
   Create_func_regexp_instr() = default;
-  virtual ~Create_func_regexp_instr() = default;
+  ~Create_func_regexp_instr() override = default;
 };
 
 
@@ -2072,7 +2072,7 @@ public:
 
 protected:
   Create_func_regexp_replace() = default;
-  virtual ~Create_func_regexp_replace() = default;
+  ~Create_func_regexp_replace() override = default;
 };
 
 Create_func_regexp_replace Create_func_regexp_replace::s_singleton;
@@ -2091,7 +2091,7 @@ public:
 
 protected:
   Create_func_regexp_replace_oracle() = default;
-  virtual ~Create_func_regexp_replace_oracle() = default;
+  ~Create_func_regexp_replace_oracle() override = default;
 };
 
 Create_func_regexp_replace_oracle
@@ -2101,47 +2101,47 @@ Create_func_regexp_replace_oracle
 class Create_func_regexp_substr : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_regexp_substr s_singleton;
 
 protected:
   Create_func_regexp_substr() = default;
-  virtual ~Create_func_regexp_substr() = default;
+  ~Create_func_regexp_substr() override = default;
 };
 
 
 class Create_func_radians : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_radians s_singleton;
 
 protected:
   Create_func_radians() = default;
-  virtual ~Create_func_radians() = default;
+  ~Create_func_radians() override = default;
 };
 
 
 class Create_func_rand : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_rand s_singleton;
 
 protected:
   Create_func_rand() = default;
-  virtual ~Create_func_rand() = default;
+  ~Create_func_rand() override = default;
 };
 
 
 class Create_func_random_bytes : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_random_bytes s_singleton;
 
@@ -2154,7 +2154,7 @@ protected:
 class Create_func_release_all_locks : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_release_all_locks s_singleton;
 };
@@ -2163,60 +2163,60 @@ public:
 class Create_func_release_lock : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_release_lock s_singleton;
 
 protected:
   Create_func_release_lock() = default;
-  virtual ~Create_func_release_lock() = default;
+  ~Create_func_release_lock() override = default;
 };
 
 
 class Create_func_replace_oracle : public Create_func_arg3
 {
 public:
-  virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3);
+  Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) override;
 
   static Create_func_replace_oracle s_singleton;
 
 protected:
   Create_func_replace_oracle() = default;
-  virtual ~Create_func_replace_oracle() = default;
+  ~Create_func_replace_oracle() override = default;
 };
 
 
 class Create_func_reverse : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_reverse s_singleton;
 
 protected:
   Create_func_reverse() = default;
-  virtual ~Create_func_reverse() = default;
+  ~Create_func_reverse() override = default;
 };
 
 
 class Create_func_round : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_round s_singleton;
 
 protected:
   Create_func_round() = default;
-  virtual ~Create_func_round() = default;
+  ~Create_func_round() override = default;
 };
 
 
 class Create_func_row_count : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_row_count s_singleton;
 
@@ -2229,8 +2229,8 @@ protected:
 class Create_func_rpad : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list)
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override
   {
     return create_native_std(thd, name, item_list);
   }
@@ -2238,7 +2238,7 @@ public:
 
 protected:
   Create_func_rpad() = default;
-  virtual ~Create_func_rpad() = default;
+  ~Create_func_rpad() override = default;
   Item *create_native_std(THD *thd, const LEX_CSTRING *name,
                           List<Item> *items);
   Item *create_native_oracle(THD *thd, const LEX_CSTRING *name,
@@ -2250,7 +2250,7 @@ class Create_func_rpad_oracle : public Create_func_rpad
 {
 public:
   Item *create_native(THD *thd, const LEX_CSTRING *name,
-                      List<Item> *item_list)
+                      List<Item> *item_list) override
   {
     return create_native_oracle(thd, name, item_list);
   }
@@ -2261,39 +2261,39 @@ public:
 class Create_func_rtrim : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_rtrim s_singleton;
 
 protected:
   Create_func_rtrim() = default;
-  virtual ~Create_func_rtrim() = default;
+  ~Create_func_rtrim() override = default;
 };
 
 
 class Create_func_rtrim_oracle : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_rtrim_oracle s_singleton;
 
 protected:
   Create_func_rtrim_oracle() = default;
-  virtual ~Create_func_rtrim_oracle() = default;
+  ~Create_func_rtrim_oracle() override = default;
 };
 
 
 class Create_func_sec_to_time : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_sec_to_time s_singleton;
 
 protected:
   Create_func_sec_to_time() = default;
-  virtual ~Create_func_sec_to_time() = default;
+  ~Create_func_sec_to_time() override = default;
 };
 
 class Create_func_sformat : public Create_native_func
@@ -2310,235 +2310,235 @@ protected:
 class Create_func_sha : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_sha s_singleton;
 
 protected:
   Create_func_sha() = default;
-  virtual ~Create_func_sha() = default;
+  ~Create_func_sha() override = default;
 };
 
 
 class Create_func_sha2 : public Create_func_arg2
 {
 public:
-  virtual Item* create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item* create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_sha2 s_singleton;
 
 protected:
   Create_func_sha2() = default;
-  virtual ~Create_func_sha2() = default;
+  ~Create_func_sha2() override = default;
 };
 
 
 class Create_func_sign : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_sign s_singleton;
 
 protected:
   Create_func_sign() = default;
-  virtual ~Create_func_sign() = default;
+  ~Create_func_sign() override = default;
 };
 
 
 class Create_func_sin : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_sin s_singleton;
 
 protected:
   Create_func_sin() = default;
-  virtual ~Create_func_sin() = default;
+  ~Create_func_sin() override = default;
 };
 
 
 class Create_func_sleep : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_sleep s_singleton;
 
 protected:
   Create_func_sleep() = default;
-  virtual ~Create_func_sleep() = default;
+  ~Create_func_sleep() override = default;
 };
 
 
 class Create_func_soundex : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_soundex s_singleton;
 
 protected:
   Create_func_soundex() = default;
-  virtual ~Create_func_soundex() = default;
+  ~Create_func_soundex() override = default;
 };
 
 
 class Create_func_space : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_space s_singleton;
 
 protected:
   Create_func_space() = default;
-  virtual ~Create_func_space() = default;
+  ~Create_func_space() override = default;
 };
 
 
 class Create_func_sqrt : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_sqrt s_singleton;
 
 protected:
   Create_func_sqrt() = default;
-  virtual ~Create_func_sqrt() = default;
+  ~Create_func_sqrt() override = default;
 };
 
 
 class Create_func_str_to_date : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_str_to_date s_singleton;
 
 protected:
   Create_func_str_to_date() = default;
-  virtual ~Create_func_str_to_date() = default;
+  ~Create_func_str_to_date() override = default;
 };
 
 
 class Create_func_strcmp : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_strcmp s_singleton;
 
 protected:
   Create_func_strcmp() = default;
-  virtual ~Create_func_strcmp() = default;
+  ~Create_func_strcmp() override = default;
 };
 
 
 class Create_func_substr_index : public Create_func_arg3
 {
 public:
-  virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3);
+  Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) override;
 
   static Create_func_substr_index s_singleton;
 
 protected:
   Create_func_substr_index() = default;
-  virtual ~Create_func_substr_index() = default;
+  ~Create_func_substr_index() override = default;
 };
 
 
 class Create_func_substr_oracle : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_substr_oracle s_singleton;
 
 protected:
   Create_func_substr_oracle() = default;
-  virtual ~Create_func_substr_oracle() = default;
+  ~Create_func_substr_oracle() override = default;
 };
 
 
 class Create_func_subtime : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_subtime s_singleton;
 
 protected:
   Create_func_subtime() = default;
-  virtual ~Create_func_subtime() = default;
+  ~Create_func_subtime() override = default;
 };
 
 
 class Create_func_tan : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_tan s_singleton;
 
 protected:
   Create_func_tan() = default;
-  virtual ~Create_func_tan() = default;
+  ~Create_func_tan() override = default;
 };
 
 
 class Create_func_time_format : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_time_format s_singleton;
 
 protected:
   Create_func_time_format() = default;
-  virtual ~Create_func_time_format() = default;
+  ~Create_func_time_format() override = default;
 };
 
 
 class Create_func_time_to_sec : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_time_to_sec s_singleton;
 
 protected:
   Create_func_time_to_sec() = default;
-  virtual ~Create_func_time_to_sec() = default;
+  ~Create_func_time_to_sec() override = default;
 };
 
 
 class Create_func_timediff : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_timediff s_singleton;
 
 protected:
   Create_func_timediff() = default;
-  virtual ~Create_func_timediff() = default;
+  ~Create_func_timediff() override = default;
 };
 
 
 class Create_func_to_base64 : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_to_base64 s_singleton;
 
 protected:
   Create_func_to_base64() = default;
-  virtual ~Create_func_to_base64() = default;
+  ~Create_func_to_base64() override = default;
 };
 
 
@@ -2559,125 +2559,125 @@ protected:
 class Create_func_to_days : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_to_days s_singleton;
 
 protected:
   Create_func_to_days() = default;
-  virtual ~Create_func_to_days() = default;
+  ~Create_func_to_days() override = default;
 };
 
 class Create_func_to_seconds : public Create_func_arg1
 {
 public:
-  virtual Item* create_1_arg(THD *thd, Item *arg1);
+  Item* create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_to_seconds s_singleton;
 
 protected:
   Create_func_to_seconds() = default;
-  virtual ~Create_func_to_seconds() = default;
+  ~Create_func_to_seconds() override = default;
 };
 
 
 class Create_func_ucase : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_ucase s_singleton;
 
 protected:
   Create_func_ucase() = default;
-  virtual ~Create_func_ucase() = default;
+  ~Create_func_ucase() override = default;
 };
 
 
 class Create_func_uncompress : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_uncompress s_singleton;
 
 protected:
   Create_func_uncompress() = default;
-  virtual ~Create_func_uncompress() = default;
+  ~Create_func_uncompress() override = default;
 };
 
 
 class Create_func_uncompressed_length : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_uncompressed_length s_singleton;
 
 protected:
   Create_func_uncompressed_length() = default;
-  virtual ~Create_func_uncompressed_length() = default;
+  ~Create_func_uncompressed_length() override = default;
 };
 
 
 class Create_func_unhex : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_unhex s_singleton;
 
 protected:
   Create_func_unhex() = default;
-  virtual ~Create_func_unhex() = default;
+  ~Create_func_unhex() override = default;
 };
 
 
 class Create_func_unix_timestamp : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_unix_timestamp s_singleton;
 
 protected:
   Create_func_unix_timestamp() = default;
-  virtual ~Create_func_unix_timestamp() = default;
+  ~Create_func_unix_timestamp() override = default;
 };
 
 
 class Create_func_uuid_short : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_uuid_short s_singleton;
 
 protected:
   Create_func_uuid_short() = default;
-  virtual ~Create_func_uuid_short() = default;
+  ~Create_func_uuid_short() override = default;
 };
 
 
 class Create_func_version : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_version s_singleton;
 
 protected:
   Create_func_version() = default;
-  virtual ~Create_func_version() = default;
+  ~Create_func_version() override = default;
 };
 
 
 class Create_func_week : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                      List<Item> *item_list) override;
 
   static Create_func_week s_singleton;
 
@@ -2690,26 +2690,26 @@ protected:
 class Create_func_weekday : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_weekday s_singleton;
 
 protected:
   Create_func_weekday() = default;
-  virtual ~Create_func_weekday() = default;
+  ~Create_func_weekday() override = default;
 };
 
 
 class Create_func_weekofyear : public Create_func_arg1
 {
 public:
-  virtual Item *create_1_arg(THD *thd, Item *arg1);
+  Item *create_1_arg(THD *thd, Item *arg1) override;
 
   static Create_func_weekofyear s_singleton;
 
 protected:
   Create_func_weekofyear() = default;
-  virtual ~Create_func_weekofyear() = default;
+  ~Create_func_weekofyear() override = default;
 };
 
 
@@ -2717,26 +2717,26 @@ protected:
 class Create_func_wsrep_last_written_gtid : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_wsrep_last_written_gtid s_singleton;
 
 protected:
   Create_func_wsrep_last_written_gtid() = default;
-  virtual ~Create_func_wsrep_last_written_gtid() = default;
+  ~Create_func_wsrep_last_written_gtid() override = default;
 };
 
 
 class Create_func_wsrep_last_seen_gtid : public Create_func_arg0
 {
 public:
-  virtual Item *create_builder(THD *thd);
+  Item *create_builder(THD *thd) override;
 
   static Create_func_wsrep_last_seen_gtid s_singleton;
 
 protected:
   Create_func_wsrep_last_seen_gtid() = default;
-  virtual ~Create_func_wsrep_last_seen_gtid() = default;
+  ~Create_func_wsrep_last_seen_gtid() override = default;
 };
 
 
@@ -2750,7 +2750,7 @@ public:
 
 protected:
   Create_func_wsrep_sync_wait_upto() = default;
-  virtual ~Create_func_wsrep_sync_wait_upto() = default;
+  ~Create_func_wsrep_sync_wait_upto() override = default;
 };
 #endif /* WITH_WSREP */
 
@@ -2758,40 +2758,40 @@ protected:
 class Create_func_xml_extractvalue : public Create_func_arg2
 {
 public:
-  virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2);
+  Item *create_2_arg(THD *thd, Item *arg1, Item *arg2) override;
 
   static Create_func_xml_extractvalue s_singleton;
 
 protected:
   Create_func_xml_extractvalue() = default;
-  virtual ~Create_func_xml_extractvalue() = default;
+  ~Create_func_xml_extractvalue() override = default;
 };
 
 
 class Create_func_xml_update : public Create_func_arg3
 {
 public:
-  virtual Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3);
+  Item *create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) override;
 
   static Create_func_xml_update s_singleton;
 
 protected:
   Create_func_xml_update() = default;
-  virtual ~Create_func_xml_update() = default;
+  ~Create_func_xml_update() override = default;
 };
 
 
 class Create_func_year_week : public Create_native_func
 {
 public:
-  virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
-                              List<Item> *item_list);
+  Item *create_native(THD *thd, const LEX_CSTRING *name,
+                              List<Item> *item_list) override;
 
   static Create_func_year_week s_singleton;
 
 protected:
   Create_func_year_week() = default;
-  virtual ~Create_func_year_week() = default;
+  ~Create_func_year_week() override = default;
 };
 
 
@@ -6047,7 +6047,7 @@ Create_func_uuid_short::create_builder(THD *thd)
 {
   DBUG_ENTER("Create_func_uuid_short::create");
   thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-  thd->lex->safe_to_cache_query= 0;
+  thd->lex->uncacheable(UNCACHEABLE_RAND);  // disallow cache and query merges
   DBUG_RETURN(new (thd->mem_root) Item_func_uuid_short(thd));
 }
 
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 92fe615a8dd..64dd55d12f4 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2143,7 +2143,7 @@ class Func_handler_shift_left_int_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return item->arguments()[0]->to_longlong_null() <<
@@ -2156,7 +2156,7 @@ class Func_handler_shift_left_decimal_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return VDec(item->arguments()[0]).to_xlonglong_null() <<
@@ -2177,7 +2177,7 @@ class Func_handler_shift_right_int_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return item->arguments()[0]->to_longlong_null() >>
@@ -2190,7 +2190,7 @@ class Func_handler_shift_right_decimal_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return VDec(item->arguments()[0]).to_xlonglong_null() >>
@@ -2211,7 +2211,7 @@ class Func_handler_bit_neg_int_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return ~ item->arguments()[0]->to_longlong_null();
@@ -2223,7 +2223,7 @@ class Func_handler_bit_neg_decimal_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return ~ VDec(item->arguments()[0]).to_xlonglong_null();
@@ -3423,7 +3423,7 @@ class Func_handler_bit_count_int_to_slong:
         public Item_handled_func::Handler_slong2
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return item->arguments()[0]->to_longlong_null().bit_count();
@@ -3435,7 +3435,7 @@ class Func_handler_bit_count_decimal_to_slong:
         public Item_handled_func::Handler_slong2
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return VDec(item->arguments()[0]).to_xlonglong_null().bit_count();
@@ -4171,7 +4171,7 @@ public:
                         const char * /* sqlstate */,
                         Sql_condition::enum_warning_level* /* level */,
                         const char *message,
-                        Sql_condition ** /* cond_hdl */);
+                        Sql_condition ** /* cond_hdl */) override;
 };
 
 bool
@@ -6466,7 +6466,7 @@ class Func_handler_bit_xor_int_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return item->arguments()[0]->to_longlong_null() ^
@@ -6479,7 +6479,7 @@ class Func_handler_bit_xor_dec_to_ulonglong:
         public Item_handled_func::Handler_ulonglong
 {
 public:
-  Longlong_null to_longlong_null(Item_handled_func *item) const
+  Longlong_null to_longlong_null(Item_handled_func *item) const override
   {
     DBUG_ASSERT(item->fixed());
     return VDec(item->arguments()[0]).to_xlonglong_null() ^
diff --git a/sql/item_func.h b/sql/item_func.h
index 03dd6414ade..492235b7304 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -243,7 +243,7 @@ public:
   bool is_null() override
   {
     update_null_value();
-    return null_value; 
+    return null_value;
   }
   String *val_str_from_val_str_ascii(String *str, String *str2);
 
@@ -458,7 +458,7 @@ public:
   }
   void convert_const_compared_to_int_field(THD *thd);
   Item_func *get_item_func() override { return this; }
-  bool is_simplified_cond_processor(void *arg) override
+  bool is_simplified_cond_processor(void *) override
   { return const_item() && !val_int(); }
 };
 
@@ -575,30 +575,30 @@ public:
   class Handler_str: public Handler
   {
   public:
-    String *val_str_ascii(Item_handled_func *item, String *str) const
+    String *val_str_ascii(Item_handled_func *item, String *str) const override
     {
       return item->Item::val_str_ascii(str);
     }
-    double val_real(Item_handled_func *item) const
+    double val_real(Item_handled_func *item) const override
     {
       DBUG_ASSERT(item->fixed());
       StringBuffer<64> tmp;
       String *res= item->val_str(&tmp);
       return res ? item->double_from_string_with_check(res) : 0.0;
     }
-    longlong val_int(Item_handled_func *item) const
+    longlong val_int(Item_handled_func *item) const override
     {
       DBUG_ASSERT(item->fixed());
       StringBuffer<22> tmp;
       String *res= item->val_str(&tmp);
       return res ? item->longlong_from_string_with_check(res) : 0;
     }
-    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const
+    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const override
     {
       return item->val_decimal_from_string(to);
     }
     bool get_date(THD *thd, Item_handled_func *item, MYSQL_TIME *to,
-                  date_mode_t fuzzydate) const
+                  date_mode_t fuzzydate) const override
     {
       return item->get_date_from_string(thd, to, fuzzydate);
     }
@@ -611,7 +611,7 @@ public:
   class Handler_temporal: public Handler
   {
   public:
-    String *val_str(Item_handled_func *item, String *to) const
+    String *val_str(Item_handled_func *item, String *to) const override
     {
       StringBuffer<MAX_FIELD_WIDTH> ascii_buf;
       return item->val_str_from_val_str_ascii(to, &ascii_buf);
@@ -626,28 +626,28 @@ public:
   class Handler_temporal_string: public Handler_temporal
   {
   public:
-    const Type_handler *return_type_handler(const Item_handled_func *) const
+    const Type_handler *return_type_handler(const Item_handled_func *) const override
     {
       return &type_handler_string;
     }
     const Type_handler *
-      type_handler_for_create_select(const Item_handled_func *item) const
+      type_handler_for_create_select(const Item_handled_func *item) const override
     {
       return return_type_handler(item)->type_handler_for_tmp_table(item);
     }
-    double val_real(Item_handled_func *item) const
+    double val_real(Item_handled_func *item) const override
     {
       return Temporal_hybrid(item).to_double();
     }
-    longlong val_int(Item_handled_func *item) const
+    longlong val_int(Item_handled_func *item) const override
     {
       return Temporal_hybrid(item).to_longlong();
     }
-    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const
+    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const override
     {
       return Temporal_hybrid(item).to_decimal(to);
     }
-    String *val_str_ascii(Item_handled_func *item, String *to) const
+    String *val_str_ascii(Item_handled_func *item, String *to) const override
     {
       return Temporal_hybrid(item).to_string(to, item->decimals);
     }
@@ -657,28 +657,28 @@ public:
   class Handler_date: public Handler_temporal
   {
   public:
-    const Type_handler *return_type_handler(const Item_handled_func *) const
+    const Type_handler *return_type_handler(const Item_handled_func *) const override
     {
       return &type_handler_newdate;
     }
-    bool fix_length_and_dec(Item_handled_func *item) const
+    bool fix_length_and_dec(Item_handled_func *item) const override
     {
       item->fix_attributes_date();
       return false;
     }
-    double val_real(Item_handled_func *item) const
+    double val_real(Item_handled_func *item) const override
     {
       return Date(item).to_double();
     }
-    longlong val_int(Item_handled_func *item) const
+    longlong val_int(Item_handled_func *item) const override
     {
       return Date(item).to_longlong();
     }
-    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const
+    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const override
     {
       return Date(item).to_decimal(to);
     }
-    String *val_str_ascii(Item_handled_func *item, String *to) const
+    String *val_str_ascii(Item_handled_func *item, String *to) const override
     {
       return Date(item).to_string(to);
     }
@@ -688,27 +688,27 @@ public:
   class Handler_time: public Handler_temporal
   {
   public:
-    const Type_handler *return_type_handler(const Item_handled_func *) const
+    const Type_handler *return_type_handler(const Item_handled_func *) const override
     {
       return &type_handler_time2;
     }
-    double val_real(Item_handled_func *item) const
+    double val_real(Item_handled_func *item) const override
     {
       return Time(item).to_double();
     }
-    longlong val_int(Item_handled_func *item) const
+    longlong val_int(Item_handled_func *item) const override
     {
       return Time(item).to_longlong();
     }
-    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const
+    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const override
     {
       return Time(item).to_decimal(to);
     }
-    String *val_str_ascii(Item_handled_func *item, String *to) const
+    String *val_str_ascii(Item_handled_func *item, String *to) const override
     {
       return Time(item).to_string(to, item->decimals);
     }
-    bool val_native(THD *thd, Item_handled_func *item, Native *to) const
+    bool val_native(THD *thd, Item_handled_func *item, Native *to) const override
     {
       return Time(thd, item).to_native(to, item->decimals);
     }
@@ -718,23 +718,23 @@ public:
   class Handler_datetime: public Handler_temporal
   {
   public:
-    const Type_handler *return_type_handler(const Item_handled_func *) const
+    const Type_handler *return_type_handler(const Item_handled_func *) const override
     {
       return &type_handler_datetime2;
     }
-    double val_real(Item_handled_func *item) const
+    double val_real(Item_handled_func *item) const override
     {
       return Datetime(item).to_double();
     }
-    longlong val_int(Item_handled_func *item) const
+    longlong val_int(Item_handled_func *item) const override
     {
       return Datetime(item).to_longlong();
     }
-    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const
+    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const override
     {
       return Datetime(item).to_decimal(to);
     }
-    String *val_str_ascii(Item_handled_func *item, String *to) const
+    String *val_str_ascii(Item_handled_func *item, String *to) const override
     {
       return Datetime(item).to_string(to, item->decimals);
     }
@@ -744,7 +744,7 @@ public:
   class Handler_int: public Handler
   {
   public:
-    String *val_str(Item_handled_func *item, String *to) const
+    String *val_str(Item_handled_func *item, String *to) const override
     {
       longlong nr= val_int(item);
       if (item->null_value)
@@ -752,25 +752,25 @@ public:
       to->set_int(nr, item->unsigned_flag, item->collation.collation);
       return to;
     }
-    String *val_str_ascii(Item_handled_func *item, String *to) const
+    String *val_str_ascii(Item_handled_func *item, String *to) const override
     {
       return item->Item::val_str_ascii(to);
     }
-    double val_real(Item_handled_func *item) const
+    double val_real(Item_handled_func *item) const override
     {
       return item->unsigned_flag ? (double) ((ulonglong) val_int(item)) :
                                    (double) val_int(item);
     }
-    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const
+    my_decimal *val_decimal(Item_handled_func *item, my_decimal *to) const override
     {
       return item->val_decimal_from_int(to);
     }
     bool get_date(THD *thd, Item_handled_func *item,
-                  MYSQL_TIME *to, date_mode_t fuzzydate) const
+                  MYSQL_TIME *to, date_mode_t fuzzydate) const override
     {
       return item->get_date_from_int(thd, to, fuzzydate);
     }
-    longlong val_int(Item_handled_func *item) const
+    longlong val_int(Item_handled_func *item) const override
     {
       Longlong_null tmp= to_longlong_null(item);
       item->null_value= tmp.is_null();
@@ -782,11 +782,11 @@ public:
   class Handler_slong: public Handler_int
   {
   public:
-    const Type_handler *return_type_handler(const Item_handled_func *item) const
+    const Type_handler *return_type_handler(const Item_handled_func *item) const override
     {
       return &type_handler_slong;
     }
-    bool fix_length_and_dec(Item_handled_func *item) const
+    bool fix_length_and_dec(Item_handled_func *item) const override
     {
       item->unsigned_flag= false;
       item->collation= DTCollation_numeric();
@@ -798,7 +798,7 @@ public:
   class Handler_slong2: public Handler_slong
   {
   public:
-    bool fix_length_and_dec(Item_handled_func *func) const
+    bool fix_length_and_dec(Item_handled_func *func) const override
     {
       bool rc= Handler_slong::fix_length_and_dec(func);
       func->max_length= 2;
@@ -809,11 +809,11 @@ public:
   class Handler_ulonglong: public Handler_int
   {
   public:
-    const Type_handler *return_type_handler(const Item_handled_func *item) const
+    const Type_handler *return_type_handler(const Item_handled_func *item) const override
     {
       return &type_handler_ulonglong;
     }
-    bool fix_length_and_dec(Item_handled_func *item) const
+    bool fix_length_and_dec(Item_handled_func *item) const override
     {
       item->unsigned_flag= true;
       item->collation= DTCollation_numeric();
@@ -1110,7 +1110,7 @@ public:
   Item_func_case_expression(THD *thd, List<Item> &list):
     Item_func_hybrid_field_type(thd, list)
   { }
-  bool find_not_null_fields(table_map allowed) { return false; }
+  bool find_not_null_fields(table_map allowed) override { return false; }
 };
 
 
@@ -1139,18 +1139,18 @@ public:
   Item_func_numhybrid(THD *thd, List<Item> &list):
     Item_func_hybrid_field_type(thd, list)
   { }
-  String *str_op(String *str) { DBUG_ASSERT(0); return 0; }
-  bool date_op(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
+  String *str_op(String *str) override { DBUG_ASSERT(0); return 0; }
+  bool date_op(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
   {
     DBUG_ASSERT(0);
     return true;
   }
-  bool time_op(THD *thd, MYSQL_TIME *ltime)
+  bool time_op(THD *thd, MYSQL_TIME *ltime) override
   {
     DBUG_ASSERT(0);
     return true;
   }
-  bool native_op(THD *thd, Native *to)
+  bool native_op(THD *thd, Native *to) override
   {
     DBUG_ASSERT(0);
     return true;
@@ -1164,8 +1164,8 @@ class Item_func_num1: public Item_func_numhybrid
 public:
   Item_func_num1(THD *thd, Item *a): Item_func_numhybrid(thd, a) {}
   Item_func_num1(THD *thd, Item *a, Item *b): Item_func_numhybrid(thd, a, b) {}
-  bool check_partition_func_processor(void *int_arg) { return FALSE; }
-  bool check_vcol_func_processor(void *arg) { return FALSE; }
+  bool check_partition_func_processor(void *int_arg) override { return FALSE; }
+  bool check_vcol_func_processor(void *arg) override { return FALSE; }
 };
 
 
@@ -1313,10 +1313,14 @@ public:
   Item_func_hash_mariadb_100403(THD *thd, List<Item> &item)
    :Item_func_hash(thd, item)
   {}
-  longlong val_int();
-  Item *get_copy(THD *thd)
+  longlong val_int() override;
+  Item *get_copy(THD *thd) override
   { return get_item_copy<Item_func_hash_mariadb_100403>(thd, this); }
-  const char *func_name() const { return "<hash_mariadb_100403>"; }
+  LEX_CSTRING func_name_cstring() const override
+  {
+    static LEX_CSTRING name= {STRING_WITH_LEN("<hash_mariadb_100403>") };
+    return name;
+  }
 };
 
 class Item_longlong_func: public Item_int_func
@@ -1565,8 +1569,8 @@ public:
     decimals=   (uint8)  dec;
     max_length= (uint32) len;
   }
-  bool need_parentheses_in_default() { return true; }
-  void print(String *str, enum_query_type query_type);
+  bool need_parentheses_in_default() override { return true; }
+  void print(String *str, enum_query_type query_type) override;
   void fix_length_and_dec_generic()
   {
     set_maybe_null();
@@ -1635,9 +1639,9 @@ class Item_func_additive_op :public Item_num_op
 {
 public:
   Item_func_additive_op(THD *thd, Item *a, Item *b): Item_num_op(thd, a, b) {}
-  void result_precision();
-  bool check_partition_func_processor(void *int_arg) {return FALSE;}
-  bool check_vcol_func_processor(void *arg) { return FALSE;}
+  void result_precision() override;
+  bool check_partition_func_processor(void *int_arg) override {return FALSE;}
+  bool check_vcol_func_processor(void *arg) override { return FALSE;}
 };
 
 
@@ -3270,7 +3274,7 @@ class Item_func_get_lock final :public Item_func_lock
   String value;
  public:
   Item_func_get_lock(THD *thd, Item *a, Item *b) :Item_func_lock(thd, a, b) {}
-  longlong val_int() final;
+  longlong val_int() override final;
   LEX_CSTRING func_name_cstring() const override final
   {
     static LEX_CSTRING name= {STRING_WITH_LEN("get_lock") };
@@ -3282,7 +3286,7 @@ class Item_func_get_lock final :public Item_func_lock
     set_maybe_null();
     return FALSE;
   }
-  Item *get_copy(THD *thd) final
+  Item *get_copy(THD *thd) override final
   { return get_item_copy<Item_func_get_lock>(thd, this); }
 };
 
@@ -3292,13 +3296,13 @@ class Item_func_release_all_locks final :public Item_func_lock
 public:
   Item_func_release_all_locks(THD *thd): Item_func_lock(thd)
   { unsigned_flag= 1; }
-  longlong val_int() final;
+  longlong val_int() override final;
   LEX_CSTRING func_name_cstring() const override
   {
     static LEX_CSTRING name= {STRING_WITH_LEN("release_all_locks") };
     return name;
   }
-  Item *get_copy(THD *thd) final
+  Item *get_copy(THD *thd) override final
   { return get_item_copy<Item_func_release_all_locks>(thd, this); }
 };
 
@@ -3310,7 +3314,7 @@ class Item_func_release_lock final :public Item_func_lock
   String value;
 public:
   Item_func_release_lock(THD *thd, Item *a): Item_func_lock(thd, a) {}
-  longlong val_int() final;
+  longlong val_int() override final;
   LEX_CSTRING func_name_cstring() const override
   {
     static LEX_CSTRING name= {STRING_WITH_LEN("release_lock") };
@@ -3322,7 +3326,7 @@ public:
     set_maybe_null();
     return FALSE;
   }
-  Item *get_copy(THD *thd) final
+  Item *get_copy(THD *thd) override final
   { return get_item_copy<Item_func_release_lock>(thd, this); }
 };
 
@@ -3419,16 +3423,16 @@ public:
     :Item_hybrid_func(thd, item),
     m_var_entry(item->m_var_entry), name(item->name) { }
   Field *create_tmp_field_ex(MEM_ROOT *root, TABLE *table, Tmp_field_src *src,
-                             const Tmp_field_param *param)
+                             const Tmp_field_param *param) override
   {
     DBUG_ASSERT(fixed());
     return create_tmp_field_ex_from_handler(root, table, src, param,
                                             type_handler());
   }
-  Field *create_field_for_create_select(MEM_ROOT *root, TABLE *table)
+  Field *create_field_for_create_select(MEM_ROOT *root, TABLE *table) override
   { return create_table_field_from_handler(root, table); }
-  bool check_vcol_func_processor(void *arg);
-  bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
+  bool check_vcol_func_processor(void *arg) override;
+  bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
   {
     return type_handler()->Item_get_date_with_warn(thd, this, ltime, fuzzydate);
   }
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 8714417a77d..217a95f90aa 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -2787,7 +2787,7 @@ public:
 
 protected:
   Create_func_area() = default;
-  virtual ~Create_func_area() = default;
+  ~Create_func_area() override = default;
 };
 
 
@@ -2803,7 +2803,7 @@ public:
 
 protected:
   Create_func_as_wkb() = default;
-  virtual ~Create_func_as_wkb() = default;
+  ~Create_func_as_wkb() override = default;
 };
 
 
@@ -2819,7 +2819,7 @@ public:
 
 protected:
   Create_func_as_wkt() = default;
-  virtual ~Create_func_as_wkt() = default;
+  ~Create_func_as_wkt() override = default;
 };
 
 
@@ -2836,7 +2836,7 @@ public:
 
 protected:
   Create_func_centroid() = default;
-  virtual ~Create_func_centroid() = default;
+  ~Create_func_centroid() override = default;
 };
 
 
@@ -2852,7 +2852,7 @@ public:
 
 protected:
   Create_func_convexhull() = default;
-  virtual ~Create_func_convexhull() = default;
+  ~Create_func_convexhull() override = default;
 };
 
 
@@ -2868,7 +2868,7 @@ public:
 
 protected:
   Create_func_pointonsurface() = default;
-  virtual ~Create_func_pointonsurface() = default;
+  ~Create_func_pointonsurface() override = default;
 };
 
 
@@ -2885,7 +2885,7 @@ public:
 
 protected:
   Create_func_mbr_contains() = default;
-  virtual ~Create_func_mbr_contains() = default;
+  ~Create_func_mbr_contains() override = default;
 };
 
 
@@ -2901,7 +2901,7 @@ public:
 
 protected:
   Create_func_contains() = default;
-  virtual ~Create_func_contains() = default;
+  ~Create_func_contains() override = default;
 };
 
 
@@ -2917,7 +2917,7 @@ public:
 
 protected:
   Create_func_crosses() = default;
-  virtual ~Create_func_crosses() = default;
+  ~Create_func_crosses() override = default;
 };
 
 
@@ -2933,7 +2933,7 @@ public:
 
 protected:
   Create_func_dimension() = default;
-  virtual ~Create_func_dimension() = default;
+  ~Create_func_dimension() override = default;
 };
 
 
@@ -2950,7 +2950,7 @@ public:
 
 protected:
   Create_func_mbr_disjoint() = default;
-  virtual ~Create_func_mbr_disjoint() = default;
+  ~Create_func_mbr_disjoint() override = default;
 };
 
 
@@ -2966,7 +2966,7 @@ public:
 
 protected:
   Create_func_disjoint() = default;
-  virtual ~Create_func_disjoint() = default;
+  ~Create_func_disjoint() override = default;
 };
 
 
@@ -2982,7 +2982,7 @@ public:
 
 protected:
   Create_func_distance() = default;
-  virtual ~Create_func_distance() = default;
+  ~Create_func_distance() override = default;
 };
 
 
@@ -2995,7 +2995,7 @@ public:
 
 protected:
   Create_func_distance_sphere() = default;
-  virtual ~Create_func_distance_sphere() = default;
+  ~Create_func_distance_sphere() override = default;
 };
 
 
@@ -3030,7 +3030,7 @@ public:
 
 protected:
   Create_func_endpoint() = default;
-  virtual ~Create_func_endpoint() = default;
+  ~Create_func_endpoint() override = default;
 };
 
 
@@ -3046,7 +3046,7 @@ public:
 
 protected:
   Create_func_envelope() = default;
-  virtual ~Create_func_envelope() = default;
+  ~Create_func_envelope() override = default;
 };
 
 class Create_func_boundary : public Create_func_arg1
@@ -3061,7 +3061,7 @@ public:
 
 protected:
   Create_func_boundary() = default;
-  virtual ~Create_func_boundary() = default;
+  ~Create_func_boundary() override = default;
 };
 
 
@@ -3078,7 +3078,7 @@ public:
 
 protected:
   Create_func_mbr_equals() = default;
-  virtual ~Create_func_mbr_equals() = default;
+  ~Create_func_mbr_equals() override = default;
 };
 
 
@@ -3095,7 +3095,7 @@ public:
 
 protected:
   Create_func_equals() = default;
-  virtual ~Create_func_equals() = default;
+  ~Create_func_equals() override = default;
 };
 
 
@@ -3112,7 +3112,7 @@ public:
 
 protected:
   Create_func_exteriorring() = default;
-  virtual ~Create_func_exteriorring() = default;
+  ~Create_func_exteriorring() override = default;
 };
 
 
@@ -3127,7 +3127,7 @@ public:
 
 protected:
   Create_func_geometry_from_text() = default;
-  virtual ~Create_func_geometry_from_text() = default;
+  ~Create_func_geometry_from_text() override = default;
 };
 
 
@@ -3178,7 +3178,7 @@ public:
 
 protected:
   Create_func_geometry_from_wkb() = default;
-  virtual ~Create_func_geometry_from_wkb() = default;
+  ~Create_func_geometry_from_wkb() override = default;
 };
 
 
@@ -3228,7 +3228,7 @@ public:
 
 protected:
   Create_func_geometry_from_json() = default;
-  virtual ~Create_func_geometry_from_json() = default;
+  ~Create_func_geometry_from_json() override = default;
 };
 
 
@@ -3288,7 +3288,7 @@ public:
 
 protected:
   Create_func_as_geojson() = default;
-  virtual ~Create_func_as_geojson() = default;
+  ~Create_func_as_geojson() override = default;
 };
 
 
@@ -3348,7 +3348,7 @@ public:
 
 protected:
   Create_func_geometry_type() = default;
-  virtual ~Create_func_geometry_type() = default;
+  ~Create_func_geometry_type() override = default;
 };
 
 
@@ -3365,7 +3365,7 @@ public:
 
 protected:
   Create_func_geometryn() = default;
-  virtual ~Create_func_geometryn() = default;
+  ~Create_func_geometryn() override = default;
 };
 
 
@@ -3382,7 +3382,7 @@ public:
 
 protected:
   Create_func_gis_debug() = default;
-  virtual ~Create_func_gis_debug() = default;
+  ~Create_func_gis_debug() override = default;
 };
 #endif
 
@@ -3399,7 +3399,7 @@ public:
 
 protected:
   Create_func_glength() = default;
-  virtual ~Create_func_glength() = default;
+  ~Create_func_glength() override = default;
 };
 
 
@@ -3416,7 +3416,7 @@ public:
 
 protected:
   Create_func_interiorringn() = default;
-  virtual ~Create_func_interiorringn() = default;
+  ~Create_func_interiorringn() override = default;
 };
 
 
@@ -3432,7 +3432,7 @@ public:
 
 protected:
   Create_func_relate() = default;
-  virtual ~Create_func_relate() = default;
+  ~Create_func_relate() override = default;
 };
 
 
@@ -3449,7 +3449,7 @@ public:
 
 protected:
   Create_func_mbr_intersects() = default;
-  virtual ~Create_func_mbr_intersects() = default;
+  ~Create_func_mbr_intersects() override = default;
 };
 
 
@@ -3466,7 +3466,7 @@ public:
 
 protected:
   Create_func_intersects() = default;
-  virtual ~Create_func_intersects() = default;
+  ~Create_func_intersects() override = default;
 };
 
 
@@ -3483,7 +3483,7 @@ public:
 
 protected:
   Create_func_intersection() = default;
-  virtual ~Create_func_intersection() = default;
+  ~Create_func_intersection() override = default;
 };
 
 
@@ -3500,7 +3500,7 @@ public:
 
 protected:
   Create_func_difference() = default;
-  virtual ~Create_func_difference() = default;
+  ~Create_func_difference() override = default;
 };
 
 
@@ -3517,7 +3517,7 @@ public:
 
 protected:
   Create_func_union() = default;
-  virtual ~Create_func_union() = default;
+  ~Create_func_union() override = default;
 };
 
 
@@ -3534,7 +3534,7 @@ public:
 
 protected:
   Create_func_symdifference() = default;
-  virtual ~Create_func_symdifference() = default;
+  ~Create_func_symdifference() override = default;
 };
 
 
@@ -3550,7 +3550,7 @@ public:
 
 protected:
   Create_func_buffer() = default;
-  virtual ~Create_func_buffer() = default;
+  ~Create_func_buffer() override = default;
 };
 
 
@@ -3566,7 +3566,7 @@ public:
 
 protected:
   Create_func_isclosed() = default;
-  virtual ~Create_func_isclosed() = default;
+  ~Create_func_isclosed() override = default;
 };
 
 
@@ -3582,7 +3582,7 @@ public:
 
 protected:
   Create_func_isring() = default;
-  virtual ~Create_func_isring() = default;
+  ~Create_func_isring() override = default;
 };
 
 
@@ -3598,7 +3598,7 @@ public:
 
 protected:
   Create_func_isempty() = default;
-  virtual ~Create_func_isempty() = default;
+  ~Create_func_isempty() override = default;
 };
 
 
@@ -3614,7 +3614,7 @@ public:
 
 protected:
   Create_func_issimple() = default;
-  virtual ~Create_func_issimple() = default;
+  ~Create_func_issimple() override = default;
 };
 
 
@@ -3631,7 +3631,7 @@ public:
 
 protected:
   Create_func_numgeometries() = default;
-  virtual ~Create_func_numgeometries() = default;
+  ~Create_func_numgeometries() override = default;
 };
 
 
@@ -3647,7 +3647,7 @@ public:
 
 protected:
   Create_func_numinteriorring() = default;
-  virtual ~Create_func_numinteriorring() = default;
+  ~Create_func_numinteriorring() override = default;
 };
 
 
@@ -3663,7 +3663,7 @@ public:
 
 protected:
   Create_func_numpoints() = default;
-  virtual ~Create_func_numpoints() = default;
+  ~Create_func_numpoints() override = default;
 };
 
 
@@ -3680,7 +3680,7 @@ public:
 
 protected:
   Create_func_mbr_overlaps() = default;
-  virtual ~Create_func_mbr_overlaps() = default;
+  ~Create_func_mbr_overlaps() override = default;
 };
 
 
@@ -3697,7 +3697,7 @@ public:
 
 protected:
   Create_func_overlaps() = default;
-  virtual ~Create_func_overlaps() = default;
+  ~Create_func_overlaps() override = default;
 };
 
 
@@ -3716,7 +3716,7 @@ public:
 
 protected:
   Create_func_pointn() = default;
-  virtual ~Create_func_pointn() = default;
+  ~Create_func_pointn() override = default;
 };
 
 
@@ -3734,7 +3734,7 @@ public:
 
 protected:
   Create_func_srid() = default;
-  virtual ~Create_func_srid() = default;
+  ~Create_func_srid() override = default;
 };
 
 
@@ -3751,7 +3751,7 @@ public:
 
 protected:
   Create_func_startpoint() = default;
-  virtual ~Create_func_startpoint() = default;
+  ~Create_func_startpoint() override = default;
 };
 
 
@@ -3769,7 +3769,7 @@ public:
 
 protected:
   Create_func_touches() = default;
-  virtual ~Create_func_touches() = default;
+  ~Create_func_touches() override = default;
 };
 
 
@@ -3786,7 +3786,7 @@ public:
 
 protected:
   Create_func_mbr_within() = default;
-  virtual ~Create_func_mbr_within() = default;
+  ~Create_func_mbr_within() override = default;
 };
 
 
@@ -3803,7 +3803,7 @@ public:
 
 protected:
   Create_func_within() = default;
-  virtual ~Create_func_within() = default;
+  ~Create_func_within() override = default;
 };
 
 
@@ -3819,7 +3819,7 @@ public:
 
 protected:
   Create_func_x() = default;
-  virtual ~Create_func_x() = default;
+  ~Create_func_x() override = default;
 };
 
 
@@ -3835,7 +3835,7 @@ public:
 
 protected:
   Create_func_y() = default;
-  virtual ~Create_func_y() = default;
+  ~Create_func_y() override = default;
 };
 
 
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index 40f4b924d09..5e7fe2acecd 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -454,16 +454,16 @@ class Item_func_boundary: public Item_geometry_func_args_geometry
     Transporter(Gcalc_result_receiver *receiver) :
       Gcalc_shape_transporter(NULL), m_receiver(receiver)
     {}
-    int single_point(double x, double y);
-    int start_line();
-    int complete_line();
-    int start_poly();
-    int complete_poly();
-    int start_ring();
-    int complete_ring();
-    int add_point(double x, double y);
+    int single_point(double x, double y) override;
+    int start_line() override;
+    int complete_line() override;
+    int start_poly() override;
+    int complete_poly() override;
+    int start_ring() override;
+    int complete_ring() override;
+    int add_point(double x, double y) override;
 
-    int start_collection(int n_objects);
+    int start_collection(int n_objects) override;
   };
   Gcalc_result_receiver res_receiver;
 public:
@@ -909,16 +909,16 @@ protected:
                                           Gcalc_function::op_difference),
       skip_line(FALSE)
     {}
-    int single_point(double x, double y);
-    int start_line();
-    int complete_line();
-    int start_poly();
-    int complete_poly();
-    int start_ring();
-    int complete_ring();
-    int add_point(double x, double y);
+    int single_point(double x, double y) override;
+    int start_line() override;
+    int complete_line() override;
+    int start_poly() override;
+    int complete_poly() override;
+    int start_ring() override;
+    int complete_ring() override;
+    int add_point(double x, double y) override;
 
-    int start_collection(int n_objects);
+    int start_collection(int n_objects) override;
   };
   Gcalc_heap collector;
   Gcalc_function func;
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
index 8e5702ec6ec..f119ea638cb 100644
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -5418,7 +5418,7 @@ static bool filter_keys(json_engine_t *je1, String *str, HASH items)
         str.append('"');
         str.append('\0');
 
-        char *curr_key= (char*)malloc((size_t)(key_end-key_start+3));
+        char *curr_key= (char*)malloc((size_t)(str.length()+3));
         strncpy(curr_key, str.ptr(), str.length());
 
         if (my_hash_search(&items, (const uchar*)curr_key, strlen(curr_key)))
diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h
index eb8b723e843..5c86e747bf6 100644
--- a/sql/item_jsonfunc.h
+++ b/sql/item_jsonfunc.h
@@ -285,7 +285,7 @@ public:
     Item_json_func(thd, list), paths(NULL), tmp_paths(0), n_paths(0) {}
   virtual ~Item_json_str_multipath();
 
-  bool fix_fields(THD *thd, Item **ref);
+  bool fix_fields(THD *thd, Item **ref) override;
   virtual uint get_n_paths() const = 0;
 };
 
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 2ebe107a447..8b73f1b2f4c 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -4045,23 +4045,44 @@ String *Item_func_set_collation::val_str(String *str)
   str=args[0]->val_str(str);
   if ((null_value=args[0]->null_value))
     return 0;
+  /*
+    Let SCS be the character set of the source - args[0].
+    Let TCS be the character set of the target - i.e. the character set
+    of the collation specified in the COLLATE clause.
+
+    It's OK to return SQL NULL if SCS is not equal to TCS.
+    This is possible on the explicit NULL or expressions derived from
+    the explicit NULL:
+      SELECT NULL COLLATE utf8mb4_general_ci;
+      SELECT COALESCE(NULL) COLLATE utf8mb4_general_ci;
+
+    But for a non-NULL result SCS and TCS must be compatible:
+    1. Either SCS==TCS
+    2. Or SCS can be can be reinterpeted to TCS.
+       This scenario is possible when args[0] is numeric and TCS->mbmaxlen==1.
+
+    If SCS and TCS are not compatible here, then something went wrong during
+    fix_fields(), e.g. an Item_func_conv_charset was not added two wrap args[0].
+  */
+  DBUG_ASSERT(my_charset_same(args[0]->collation.collation,
+                              collation.collation) ||
+              (args[0]->collation.repertoire == MY_REPERTOIRE_ASCII &&
+               !(collation.collation->state & MY_CS_NONASCII)));
   str->set_charset(collation.collation);
   return str;
 }
 
 bool Item_func_set_collation::fix_length_and_dec(THD *thd)
 {
-  if (agg_arg_charsets_for_string_result(collation, args, 1))
+  if (agg_arg_charsets_for_string_result(collation, args, 1) ||
+      collation.merge_collation(thd, thd->variables.character_set_collations,
+                                m_set_collation,
+                                args[0]->collation.repertoire,
+                                with_param() &&
+                                thd->lex->is_ps_or_view_context_analysis()))
     return true;
-  Lex_exact_charset_opt_extended_collate cl(collation.collation, true);
-  if (cl.merge_collation_override(thd,
-                                  thd->variables.character_set_collations,
-                                  m_set_collation))
-    return true;
-  collation.set(cl.collation().charset_info(), DERIVATION_EXPLICIT,
-                args[0]->collation.repertoire);
   ulonglong max_char_length= (ulonglong) args[0]->max_char_length();
-  fix_char_length_ulonglong(max_char_length * collation.collation->mbmaxlen);
+  fix_char_length_ulonglong(max_char_length);
 
   return FALSE;
 }
@@ -4232,9 +4253,11 @@ String *Item_func_hex::val_str_ascii_from_val_real(String *str)
     return 0;
   if ((val <= (double) LONGLONG_MIN) ||
       (val >= (double) (ulonglong) ULONGLONG_MAX))
-    dec= ~(longlong) 0;
+    dec= ULONGLONG_MAX;
+  else if (val < 0)
+    dec= (ulonglong) (longlong) (val - 0.5);
   else
-    dec= (ulonglong) (val + (val > 0 ? 0.5 : -0.5));
+    dec= (ulonglong) (val + 0.5);
   return str->set_hex(dec) ? make_empty_result(str) : str;
 }
 
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 6392a4c99d0..dc4a1cbfb99 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -109,7 +109,7 @@ public:
    :Item_str_ascii_func(thd, a) { }
   Item_str_ascii_checksum_func(THD *thd, Item *a, Item *b)
    :Item_str_ascii_func(thd, a, b) { }
-  bool eq(const Item *item, bool binary_cmp) const
+  bool eq(const Item *item, bool binary_cmp) const override
   {
     // Always use binary argument comparison: MD5('x') != MD5('X')
     return Item_func::eq(item, true);
@@ -135,7 +135,7 @@ public:
    :Item_str_func(thd, a, b, c, d) { }
   Item_str_binary_checksum_func(THD *thd, Item *a, Item *b, Item *c, Item *d, Item *e)
    :Item_str_func(thd, a, b, c, d, e) { }
-  bool eq(const Item *item, bool binary_cmp) const
+  bool eq(const Item *item, bool binary_cmp) const override
   {
     /*
       Always use binary argument comparison:
@@ -590,14 +590,14 @@ public:
   Item_func_regexp_replace_oracle(THD *thd, Item *a, Item *b, Item *c)
    :Item_func_regexp_replace(thd, a, b, c)
   {}
-  const Schema *schema() const { return &oracle_schema_ref; }
-  bool fix_length_and_dec(THD *thd)
+  const Schema *schema() const override { return &oracle_schema_ref; }
+  bool fix_length_and_dec(THD *thd) override
   {
     bool rc= Item_func_regexp_replace::fix_length_and_dec(thd);
     set_maybe_null(); // Empty result is converted to NULL
     return rc;
   }
-  String *val_str(String *str)
+  String *val_str(String *str) override
   {
     return val_str_internal(str, true);
   }
@@ -1155,19 +1155,19 @@ class Item_func_sysconst :public Item_str_func
 public:
   Item_func_sysconst(THD *thd): Item_str_func(thd)
   { collation.set(system_charset_info_for_i_s, DERIVATION_SYSCONST); }
-  Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs);
+  Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs) override;
   /*
     Used to create correct Item name in new converted item in
     safe_charset_converter, return string representation of this function
     call
   */
   virtual const Lex_ident_routine fully_qualified_func_name() const = 0;
-  bool check_vcol_func_processor(void *arg)
+  bool check_vcol_func_processor(void *arg) override
   {
     return mark_unsupported_function(fully_qualified_func_name().str, arg,
                                      VCOL_SESSION_FUNC);
   }
-  bool const_item() const;
+  bool const_item() const override;
 };
 
 
@@ -1687,10 +1687,20 @@ public:
   }
   bool fix_length_and_dec(THD *thd) override
   {
+    m_arg0_type_handler= args[0]->type_handler();
     collation.set(default_charset(), DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII);
     decimals=0;
-    fix_char_length(args[0]->max_length * 2);
-    m_arg0_type_handler= args[0]->type_handler();
+    /*
+      Reserve space for 16 characters for signed numeric data types:
+        hex(-1) -> 'FFFFFFFFFFFFFFFF'.
+      For unsigned numeric types, HEX() can create too large columns.
+      This should be eventually fixed to create minimum possible columns.
+    */
+    const Type_handler_numeric *tn=
+      dynamic_cast<const Type_handler_numeric*>(m_arg0_type_handler);
+    size_t char_length= (tn && !(tn->flags() & UNSIGNED_FLAG)) ?
+                        (size_t) 16 : (size_t) args[0]->max_length * 2;
+    fix_char_length(char_length);
     return FALSE;
   }
   Item *get_copy(THD *thd) override
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 74e800f5069..5bc57460c57 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -473,7 +473,7 @@ class Field_fixer: public Field_enumerator
 public:
   table_map used_tables; /* Collect used_tables here */
   st_select_lex *new_parent; /* Select we're in */
-  virtual void visit_field(Item_field *item)
+  void visit_field(Item_field *item) override
   {
     //for (TABLE_LIST *tbl= new_parent->leaf_tables; tbl; tbl= tbl->next_local)
     //{
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 68ecc01d49b..00c17701f8d 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -803,16 +803,16 @@ public:
                         chooser_compare_func_creator fc,
                         st_select_lex *select_lex, bool all);
 
-  void cleanup();
+  void cleanup() override;
   // only ALL subquery has upper not
-  subs_type substype() { return all?ALL_SUBS:ANY_SUBS; }
-  bool select_transformer(JOIN *join);
+  subs_type substype() override { return all?ALL_SUBS:ANY_SUBS; }
+  bool select_transformer(JOIN *join) override;
   void create_comp_func(bool invert) { func= func_creator(invert); }
-  void print(String *str, enum_query_type query_type);
-  enum precedence precedence() const { return CMP_PRECEDENCE; }
+  void print(String *str, enum_query_type query_type) override;
+  enum precedence precedence() const override { return CMP_PRECEDENCE; }
   bool is_maxmin_applicable(JOIN *join);
   bool transform_into_max_min(JOIN *join);
-  void no_rows_in_result();
+  void no_rows_in_result() override;
 };
 
 
@@ -1072,9 +1072,9 @@ public:
      check_null(chk_null),
      having(having_arg)
   { DBUG_ASSERT(subs); }
-  int exec();
-  void print (String *str, enum_query_type query_type);
-  virtual enum_engine_type engine_type() { return INDEXSUBQUERY_ENGINE; }
+  int exec() override;
+  void print (String *str, enum_query_type query_type) override;
+  enum_engine_type engine_type() override { return INDEXSUBQUERY_ENGINE; }
 };
 
 /*
@@ -1516,7 +1516,7 @@ protected:
 
   bool test_null_row(rownum_t row_num);
   bool exists_complementing_null_row(MY_BITMAP *keys_to_complement);
-  bool partial_match();
+  bool partial_match() override;
 public:
   subselect_rowid_merge_engine(THD *thd,
                                subselect_uniquesubquery_engine *engine_arg,
@@ -1536,15 +1536,15 @@ public:
   {}
   ~subselect_rowid_merge_engine();
   bool init(MY_BITMAP *non_null_key_parts, MY_BITMAP *partial_match_key_parts);
-  void cleanup();
-  virtual enum_engine_type engine_type() { return ROWID_MERGE_ENGINE; }
+  void cleanup() override;
+  enum_engine_type engine_type() override { return ROWID_MERGE_ENGINE; }
 };
 
 
 class subselect_table_scan_engine: public subselect_partial_match_engine
 {
 protected:
-  bool partial_match();
+  bool partial_match() override;
 public:
   subselect_table_scan_engine(THD *thd,
                               subselect_uniquesubquery_engine *engine_arg,
@@ -1554,7 +1554,7 @@ public:
                               bool has_covering_null_row_arg,
                               bool has_covering_null_columns_arg,
                               uint count_columns_with_nulls_arg);
-  void cleanup();
-  virtual enum_engine_type engine_type() { return TABLE_SCAN_ENGINE; }
+  void cleanup() override;
+  enum_engine_type engine_type() override { return TABLE_SCAN_ENGINE; }
 };
 #endif /* ITEM_SUBSELECT_INCLUDED */
diff --git a/sql/item_sum.h b/sql/item_sum.h
index fa38161a425..656e048fd4f 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -704,15 +704,15 @@ public:
     Aggregator(sum), table(NULL), tmp_table_param(NULL), tree(NULL),
     always_null(false), use_distinct_values(false) {}
   virtual ~Aggregator_distinct ();
-  Aggregator_type Aggrtype() { return DISTINCT_AGGREGATOR; }
+  Aggregator_type Aggrtype() override { return DISTINCT_AGGREGATOR; }
 
-  bool setup(THD *);
-  void clear(); 
-  bool add();
-  void endup();
-  virtual my_decimal *arg_val_decimal(my_decimal * value);
-  virtual double arg_val_real();
-  virtual bool arg_is_null(bool use_null_value);
+  bool setup(THD *) override;
+  void clear() override;
+  bool add() override;
+  void endup() override;
+  my_decimal *arg_val_decimal(my_decimal * value) override;
+  double arg_val_real() override;
+  bool arg_is_null(bool use_null_value) override;
 
   bool unique_walk_function(void *element);
   bool unique_walk_function_for_count(void *element);
@@ -731,15 +731,15 @@ public:
 
   Aggregator_simple (Item_sum *sum) :
     Aggregator(sum) {}
-  Aggregator_type Aggrtype() { return Aggregator::SIMPLE_AGGREGATOR; }
+  Aggregator_type Aggrtype() override { return Aggregator::SIMPLE_AGGREGATOR; }
 
-  bool setup(THD * thd) { return item_sum->setup(thd); }
-  void clear() { item_sum->clear(); }
-  bool add() { return item_sum->add(); }
-  void endup() {};
-  virtual my_decimal *arg_val_decimal(my_decimal * value);
-  virtual double arg_val_real();
-  virtual bool arg_is_null(bool use_null_value);
+  bool setup(THD * thd) override { return item_sum->setup(thd); }
+  void clear() override { item_sum->clear(); }
+  bool add() override { return item_sum->add(); }
+  void endup() override {};
+  my_decimal *arg_val_decimal(my_decimal * value) override;
+  double arg_val_real() override;
+  bool arg_is_null(bool use_null_value) override;
 };
 
 
@@ -755,7 +755,7 @@ public:
     Item_sum(thd, list) {}
   Item_sum_num(THD *thd, Item_sum_num *item):
     Item_sum(thd, item) {}
-  bool fix_fields(THD *, Item **);
+  bool fix_fields(THD *, Item **) override;
 };
 
 
@@ -807,7 +807,8 @@ public:
     max_length=21;
     base_flags&= ~item_base_t::MAYBE_NULL;
     null_value=0;
-    return FALSE; }
+    return false;
+  }
 };
 
 
@@ -834,8 +835,8 @@ public:
   }
   Item_sum_sum(THD *thd, Item_sum_sum *item);
   enum Sumfunctype sum_func() const override
-  { 
-    return has_with_distinct() ? SUM_DISTINCT_FUNC : SUM_FUNC; 
+  {
+    return has_with_distinct() ? SUM_DISTINCT_FUNC : SUM_FUNC;
   }
   void cleanup() override;
   void direct_add(my_decimal *add_sum_decimal);
@@ -1228,7 +1229,7 @@ class Item_sum_max final :public Item_sum_min_max
 public:
   Item_sum_max(THD *thd, Item *item_par): Item_sum_min_max(thd, item_par, -1) {}
   Item_sum_max(THD *thd, Item_sum_max *item) :Item_sum_min_max(thd, item) {}
-  enum Sumfunctype sum_func () const  override {return MAX_FUNC;}
+  enum Sumfunctype sum_func() const override {return MAX_FUNC;}
 
   bool add() override;
   LEX_CSTRING func_name_cstring() const override
@@ -1279,9 +1280,7 @@ public:
       clear_as_window();
     Item_sum_int::cleanup();
   }
-  void setup_window_func(THD *thd __attribute__((unused)),
-                         Window_spec *window_spec __attribute__((unused)))
-    override
+  void setup_window_func(THD *, Window_spec *) override
   {
     as_window_function= TRUE;
     clear_as_window();
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index d99caf08c0b..924824e0f93 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -3292,21 +3292,21 @@ String *Item_char_typecast::val_str_binary_from_native(String *str)
 class Item_char_typecast_func_handler: public Item_handled_func::Handler_str
 {
 public:
-  const Type_handler *return_type_handler(const Item_handled_func *item) const
+  const Type_handler *return_type_handler(const Item_handled_func *item) const override
   {
     return Type_handler::string_type_handler(item->max_length);
   }
   const Type_handler *
-    type_handler_for_create_select(const Item_handled_func *item) const
+    type_handler_for_create_select(const Item_handled_func *item) const override
   {
     return return_type_handler(item)->type_handler_for_tmp_table(item);
   }
 
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     return false;
   }
-  String *val_str(Item_handled_func *item, String *to) const
+  String *val_str(Item_handled_func *item, String *to) const override
   {
     DBUG_ASSERT(dynamic_cast<const Item_char_typecast*>(item));
     return static_cast<Item_char_typecast*>(item)->val_str_generic(to);
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 084fee85ddb..9884ede1591 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -561,9 +561,9 @@ public:
     else
       set_handler(type_handler_long_or_longlong());
   }
-  double real_op() { DBUG_ASSERT(0); return 0; }
-  String *str_op(String *str) { DBUG_ASSERT(0); return 0; }
-  bool date_op(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
+  double real_op() override { DBUG_ASSERT(0); return 0; }
+  String *str_op(String *str) override { DBUG_ASSERT(0); return 0; }
+  bool date_op(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate) override
   {
     DBUG_ASSERT(0);
     return true;
@@ -1321,7 +1321,7 @@ public:
                        &my_charset_latin1),
     m_fsp(fsp)
   { }
-  String *val_str(String *to)
+  String *val_str(String *to) override
   {
     Interval_DDhhmmssff it(current_thd, args[0], m_fsp);
     null_value= !it.is_valid_interval_DDhhmmssff();
@@ -1718,7 +1718,7 @@ class Func_handler_date_add_interval_datetime:
         public Func_handler_date_add_interval
 {
 public:
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     uint dec= MY_MAX(item->arguments()[0]->datetime_precision(current_thd),
                      interval_dec(item->arguments()[1], int_type(item)));
@@ -1726,7 +1726,7 @@ public:
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     Datetime::Options opt(TIME_CONV_NONE, thd);
     Datetime dt(thd, item->arguments()[0], opt);
@@ -1745,7 +1745,7 @@ class Func_handler_date_add_interval_datetime_arg0_time:
 {
 public:
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const;
+                MYSQL_TIME *to, date_mode_t fuzzy) const override;
 };
 
 
@@ -1755,7 +1755,7 @@ class Func_handler_date_add_interval_date:
 {
 public:
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     /*
       The first argument is known to be of the DATE data type (not DATETIME).
@@ -1777,7 +1777,7 @@ class Func_handler_date_add_interval_time:
         public Func_handler_date_add_interval
 {
 public:
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     uint dec= MY_MAX(item->arguments()[0]->time_precision(current_thd),
                      interval_dec(item->arguments()[1], int_type(item)));
@@ -1785,7 +1785,7 @@ public:
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     Time t(thd, item->arguments()[0]);
     if (!t.is_valid_time())
@@ -1802,7 +1802,7 @@ class Func_handler_date_add_interval_string:
         public Func_handler_date_add_interval
 {
 public:
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     uint dec= MY_MAX(item->arguments()[0]->datetime_precision(current_thd),
                      interval_dec(item->arguments()[1], int_type(item)));
@@ -1814,7 +1814,7 @@ public:
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     if (item->arguments()[0]->
           get_date(thd, to, Datetime::Options(TIME_CONV_NONE, thd)) ||
@@ -1843,7 +1843,7 @@ public:
   Func_handler_add_time_datetime(int sign)
    :Func_handler_sign(sign)
   { }
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     THD *thd= current_thd;
     uint dec0= item->arguments()[0]->datetime_precision(thd);
@@ -1852,7 +1852,7 @@ public:
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     DBUG_ASSERT(item->fixed());
     Datetime::Options opt(TIME_CONV_NONE, thd);
@@ -1877,7 +1877,7 @@ public:
   Func_handler_add_time_time(int sign)
    :Func_handler_sign(sign)
   { }
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     THD *thd= current_thd;
     uint dec0= item->arguments()[0]->time_precision(thd);
@@ -1886,7 +1886,7 @@ public:
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     DBUG_ASSERT(item->fixed());
     Time t(thd, item->arguments()[0]);
@@ -1910,7 +1910,7 @@ public:
   Func_handler_add_time_string(int sign)
    :Func_handler_sign(sign)
   { }
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     uint dec0= item->arguments()[0]->decimals;
     uint dec1= Interval_DDhhmmssff::fsp(current_thd, item->arguments()[1]);
@@ -1923,7 +1923,7 @@ public:
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     DBUG_ASSERT(item->fixed());
     // Detect a proper timestamp type based on the argument values
@@ -1947,13 +1947,13 @@ class Func_handler_str_to_date_datetime_sec:
         public Item_handled_func::Handler_datetime
 {
 public:
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     item->fix_attributes_datetime(0);
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     return static_cast<Item_func_str_to_date*>(item)->
              get_date_common(thd, to, fuzzy, MYSQL_TIMESTAMP_DATETIME);
@@ -1965,13 +1965,13 @@ class Func_handler_str_to_date_datetime_usec:
         public Item_handled_func::Handler_datetime
 {
 public:
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     item->fix_attributes_datetime(TIME_SECOND_PART_DIGITS);
     return false;
   }
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     return static_cast<Item_func_str_to_date*>(item)->
              get_date_common(thd, to, fuzzy, MYSQL_TIMESTAMP_DATETIME);
@@ -1983,7 +1983,7 @@ class Func_handler_str_to_date_date: public Item_handled_func::Handler_date
 {
 public:
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     return static_cast<Item_func_str_to_date*>(item)->
              get_date_common(thd, to, fuzzy, MYSQL_TIMESTAMP_DATE);
@@ -1995,7 +1995,7 @@ class Func_handler_str_to_date_time: public Item_handled_func::Handler_time
 {
 public:
   bool get_date(THD *thd, Item_handled_func *item,
-                MYSQL_TIME *to, date_mode_t fuzzy) const
+                MYSQL_TIME *to, date_mode_t fuzzy) const override
   {
     if (static_cast<Item_func_str_to_date*>(item)->
          get_date_common(thd, to, fuzzy, MYSQL_TIMESTAMP_TIME))
@@ -2018,7 +2018,7 @@ public:
 class Func_handler_str_to_date_time_sec: public Func_handler_str_to_date_time
 {
 public:
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     item->fix_attributes_time(0);
     return false;
@@ -2029,7 +2029,7 @@ public:
 class Func_handler_str_to_date_time_usec: public Func_handler_str_to_date_time
 {
 public:
-  bool fix_length_and_dec(Item_handled_func *item) const
+  bool fix_length_and_dec(Item_handled_func *item) const override
   {
     item->fix_attributes_time(TIME_SECOND_PART_DIGITS);
     return false;
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index 85ec05168e6..09bf52203d6 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -584,13 +584,13 @@ public:
                             CHARSET_INFO *cs):
     Item_string(thd, str, length, cs)
   { }
-  bool const_item() const { return false ; }
-  bool basic_const_item() const { return false; }
+  bool const_item() const override { return false ; }
+  bool basic_const_item() const override { return false; }
   void set_value(const char *str, uint length, CHARSET_INFO *cs)
   {
     str_value.set(str, length, cs);
   }
-  Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs)
+  Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs) override
   {
     /*
       Item_string::safe_charset_converter() does not accept non-constants.
diff --git a/sql/key.cc b/sql/key.cc
index 93b172c3e22..e0a89e5db08 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -758,13 +758,11 @@ ulong key_hashnr(KEY *key_info, uint used_key_parts, const uchar *key)
 
     if (is_string)
     {
-      if (cs->mbmaxlen > 1)
-      {
-        size_t char_length= cs->charpos(pos + pack_length,
-                                        pos + pack_length + length,
-                                        length / cs->mbmaxlen);
-        set_if_smaller(length, char_length);
-      }
+      /*
+        Prefix keys are not possible in BNLH joins.
+        Use the whole string to calculate the hash.
+      */
+      DBUG_ASSERT((key_part->key_part_flag & HA_PART_KEY_SEG) == 0);
       cs->hash_sort(pos+pack_length, length, &nr, &nr2);
       key+= pack_length;
     }
@@ -868,25 +866,13 @@ bool key_buf_cmp(KEY *key_info, uint used_key_parts,
     if (is_string)
     {
       /*
-        Compare the strings taking into account length in characters
-        and collation
+        Prefix keys are not possible in BNLH joins.
+        Compare whole strings.
       */
-      size_t byte_len1= length1, byte_len2= length2;
-      if (cs->mbmaxlen > 1)
-      {
-        size_t char_length1= cs->charpos(pos1 + pack_length,
-                                         pos1 + pack_length + length1,
-                                         length1 / cs->mbmaxlen);
-        size_t char_length2= cs->charpos(pos2 + pack_length,
-                                         pos2 + pack_length + length2,
-                                         length2 / cs->mbmaxlen);
-        set_if_smaller(length1, char_length1);
-        set_if_smaller(length2, char_length2);
-      }
-      if (length1 != length2 ||
-          cs->strnncollsp(pos1 + pack_length, byte_len1,
-                          pos2 + pack_length, byte_len2))
-        return TRUE;
+      DBUG_ASSERT((key_part->key_part_flag & HA_PART_KEY_SEG) == 0);
+      if (cs->strnncollsp(pos1 + pack_length, length1,
+                          pos2 + pack_length, length2))
+        return true;
       key1+= pack_length; key2+= pack_length;
     }
     else
diff --git a/sql/keycaches.cc b/sql/keycaches.cc
index 250a287e229..b325f1558c5 100644
--- a/sql/keycaches.cc
+++ b/sql/keycaches.cc
@@ -55,7 +55,7 @@ public:
   {
     return !system_charset_info->strnncoll(name, name_length, name_cmp, length);
   }
-  ~NAMED_ILINK()
+  ~NAMED_ILINK() override
   {
     my_free((void *) name);
   }
diff --git a/sql/log.cc b/sql/log.cc
index 830c0934fe7..4e8c1f9fd3c 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -42,6 +42,7 @@
 #include "ddl_log.h"
 #include "gtid_index.h"
 #include "mysys_err.h"          // EE_LOCAL_TMP_SPACE_FULL
+#include "repl_failsafe.h"
 
 #include <my_dir.h>
 #include <m_ctype.h>				// For test_if_number
@@ -258,14 +259,14 @@ public:
     m_message[0]= '\0';
   }
 
-  virtual ~Silence_log_table_errors() = default;
+  ~Silence_log_table_errors() override = default;
 
-  virtual bool handle_condition(THD *thd,
+  bool handle_condition(THD *thd,
                                 uint sql_errno,
                                 const char* sql_state,
                                 Sql_condition::enum_warning_level *level,
                                 const char* msg,
-                                Sql_condition ** cond_hdl);
+                                Sql_condition ** cond_hdl) override;
   const char *message() const { return m_message; }
 };
 
@@ -3278,10 +3279,12 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
 
       if (my_b_printf(&log_file,
                       "# Pages_accessed: %lu  Pages_read: %lu  "
+                      "Pages_prefetched: %lu  "
                       "Pages_updated: %lu  Old_rows_read: %lu\n"
                       "# Pages_read_time: %s  Engine_time: %s\n",
                       (ulong) stats->pages_accessed,
                       (ulong) stats->pages_read_count,
+                      (ulong) stats->pages_prefetched,
                       (ulong) stats->pages_updated,
                       (ulong) stats->undo_records_read,
                       query_time_buff, lock_time_buff))
@@ -11714,7 +11717,7 @@ Recovery_context::Recovery_context() :
   prev_event_pos(0),
   last_gtid_standalone(false), last_gtid_valid(false), last_gtid_no2pc(false),
   last_gtid_engines(0),
-  do_truncate(global_rpl_semi_sync_slave_enabled),
+  do_truncate(rpl_status == RPL_IDLE_SLAVE),
   truncate_validated(false), truncate_reset_done(false),
   truncate_set_in_1st(false), id_binlog(MAX_binlog_id),
   checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF), gtid_maybe_to_truncate(NULL)
diff --git a/sql/log.h b/sql/log.h
index 23513c75ac5..9b9cec8ed00 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -103,25 +103,25 @@ class TC_LOG_DUMMY: public TC_LOG // use it to disable the logging
 {
 public:
   TC_LOG_DUMMY() = default;
-  int open(const char *opt_name)        { return 0; }
-  void close()                          { }
+  int open(const char *opt_name) override        { return 0; }
+  void close() override                          { }
   /*
     TC_LOG_DUMMY is only used when there are <= 1 XA-capable engines, and we
     only use internal XA during commit when >= 2 XA-capable engines
     participate.
   */
   int log_and_order(THD *thd, my_xid xid, bool all,
-                    bool need_prepare_ordered, bool need_commit_ordered)
+                    bool need_prepare_ordered, bool need_commit_ordered) override
   {
     DBUG_ASSERT(0);
     return 1;
   }
-  int unlog(ulong cookie, my_xid xid)  { return 0; }
-  int unlog_xa_prepare(THD *thd, bool all)
+  int unlog(ulong cookie, my_xid xid) override  { return 0; }
+  int unlog_xa_prepare(THD *thd, bool all) override
   {
     return 0;
   }
-  void commit_checkpoint_notify(void *cookie) { DBUG_ASSERT(0); };
+  void commit_checkpoint_notify(void *cookie) override { DBUG_ASSERT(0); };
 };
 
 #define TC_LOG_PAGE_SIZE   8192
@@ -199,16 +199,16 @@ class TC_LOG_MMAP: public TC_LOG
 
   public:
   TC_LOG_MMAP(): inited(0), pending_checkpoint(0) {}
-  int open(const char *opt_name);
-  void close();
+  int open(const char *opt_name) override;
+  void close() override;
   int log_and_order(THD *thd, my_xid xid, bool all,
-                    bool need_prepare_ordered, bool need_commit_ordered);
-  int unlog(ulong cookie, my_xid xid);
-  int unlog_xa_prepare(THD *thd, bool all)
+                    bool need_prepare_ordered, bool need_commit_ordered) override;
+  int unlog(ulong cookie, my_xid xid) override;
+  int unlog_xa_prepare(THD *thd, bool all) override
   {
     return 0;
   }
-  void commit_checkpoint_notify(void *cookie);
+  void commit_checkpoint_notify(void *cookie) override;
   int recover();
 
   private:
@@ -905,15 +905,15 @@ public:
     return this;
   }
 
-  int open(const char *opt_name);
-  void close();
-  virtual int generate_new_name(char *new_name, const char *log_name,
-                                ulong next_log_number);
+  int open(const char *opt_name) override;
+  void close() override;
+  int generate_new_name(char *new_name, const char *log_name,
+                        ulong next_log_number) override;
   int log_and_order(THD *thd, my_xid xid, bool all,
-                    bool need_prepare_ordered, bool need_commit_ordered);
-  int unlog(ulong cookie, my_xid xid);
-  int unlog_xa_prepare(THD *thd, bool all);
-  void commit_checkpoint_notify(void *cookie);
+                    bool need_prepare_ordered, bool need_commit_ordered) override;
+  int unlog(ulong cookie, my_xid xid) override;
+  int unlog_xa_prepare(THD *thd, bool all) override;
+  void commit_checkpoint_notify(void *cookie) override;
   int recover(LOG_INFO *linfo, const char *last_log_name, IO_CACHE *first_log,
               Format_description_log_event *fdle, bool do_xa);
   int do_binlog_recovery(const char *opt_name, bool do_xa_recovery);
@@ -1106,7 +1106,7 @@ public:
   inline char* get_log_fname() { return log_file_name; }
   using MYSQL_LOG::get_log_lock;
   inline mysql_cond_t* get_bin_log_cond() { return &COND_bin_log_updated; }
-  inline IO_CACHE* get_log_file() { return &log_file; }
+  inline IO_CACHE* get_log_file() override { return &log_file; }
   inline uint64 get_reset_master_count() { return reset_master_count; }
 
   inline void lock_index() { mysql_mutex_lock(&LOCK_index);}
@@ -1221,19 +1221,19 @@ class Log_to_csv_event_handler: public Log_event_handler
 public:
   Log_to_csv_event_handler();
   ~Log_to_csv_event_handler();
-  virtual bool init();
-  virtual void cleanup();
+  bool init() override;
+  void cleanup() override;
 
-  virtual bool log_slow(THD *thd, my_hrtime_t current_time,
+  bool log_slow(THD *thd, my_hrtime_t current_time,
                         const char *user_host, size_t user_host_len, ulonglong query_utime,
                         ulonglong lock_utime, bool is_command,
-                        const char *sql_text, size_t sql_text_len);
-  virtual bool log_error(enum loglevel level, const char *format,
-                         va_list args);
-  virtual bool log_general(THD *thd, my_hrtime_t event_time, const char *user_host, size_t user_host_len, my_thread_id thread_id,
+                        const char *sql_text, size_t sql_text_len) override;
+  bool log_error(enum loglevel level, const char *format,
+                         va_list args) override;
+  bool log_general(THD *thd, my_hrtime_t event_time, const char *user_host, size_t user_host_len, my_thread_id thread_id,
                            const char *command_type, size_t command_type_len,
                            const char *sql_text, size_t sql_text_len,
-                           CHARSET_INFO *client_cs);
+                           CHARSET_INFO *client_cs) override;
 
   int activate_log(THD *thd, uint log_type);
 };
@@ -1251,19 +1251,19 @@ class Log_to_file_event_handler: public Log_event_handler
 public:
   Log_to_file_event_handler(): is_initialized(FALSE)
   {}
-  virtual bool init();
-  virtual void cleanup();
+  bool init() override;
+  void cleanup() override;
 
-  virtual bool log_slow(THD *thd, my_hrtime_t current_time,
+  bool log_slow(THD *thd, my_hrtime_t current_time,
                         const char *user_host, size_t user_host_len, ulonglong query_utime,
                         ulonglong lock_utime, bool is_command,
-                        const char *sql_text, size_t sql_text_len);
-  virtual bool log_error(enum loglevel level, const char *format,
-                         va_list args);
-  virtual bool log_general(THD *thd, my_hrtime_t event_time, const char *user_host, size_t user_host_len, my_thread_id thread_id,
+                        const char *sql_text, size_t sql_text_len) override;
+  bool log_error(enum loglevel level, const char *format,
+                         va_list args) override;
+  bool log_general(THD *thd, my_hrtime_t event_time, const char *user_host, size_t user_host_len, my_thread_id thread_id,
                            const char *command_type, size_t command_type_len,
                            const char *sql_text, size_t sql_text_len,
-                           CHARSET_INFO *client_cs);
+                           CHARSET_INFO *client_cs) override;
   void flush();
   void init_pthread_objects();
   MYSQL_QUERY_LOG *get_mysql_slow_log() { return &mysql_slow_log; }
diff --git a/sql/log_event.h b/sql/log_event.h
index 3f707ee25c0..fd03110afe8 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -996,7 +996,7 @@ typedef struct st_print_event_info
     m_is_event_group_filtering_enabled= TRUE;
   }
 } PRINT_EVENT_INFO;
-#endif
+#endif  // MYSQL_CLIENT
 
 /**
   This class encapsulates writing of Log_event objects to IO_CACHE.
@@ -2229,14 +2229,14 @@ public:
 
   Query_log_event(THD* thd_arg, const char* query_arg, size_t query_length,
                   bool using_trans, bool direct, bool suppress_use, int error);
-  const char* get_db() { return db; }
+  const char* get_db() override { return db; }
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
   bool print_query_header(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info);
   bool print_verbose(IO_CACHE* cache, PRINT_EVENT_INFO* print_event_info);
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Query_log_event();
@@ -2248,16 +2248,16 @@ public:
     if (data_buf)
       my_free(data_buf);
   }
-  Log_event_type get_type_code() { return QUERY_EVENT; }
+  Log_event_type get_type_code() override { return QUERY_EVENT; }
   static int dummy_event(String *packet, ulong ev_offset,
                          enum_binlog_checksum_alg checksum_alg);
   static int begin_event(String *packet, ulong ev_offset,
                          enum_binlog_checksum_alg checksum_alg);
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
   virtual bool write_post_header_for_derived(Log_event_writer *writer) { return FALSE; }
 #endif
-  bool is_valid() const { return query != 0; }
+  bool is_valid() const override { return query != 0; }
 
   /*
     Returns number of bytes additionally written to post header by derived
@@ -2268,8 +2268,8 @@ public:
 
 public:        /* !!! Public in this patch to allow old usage */
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
-  virtual int do_apply_event(rpl_group_info *rgi);
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
+  int do_apply_event(rpl_group_info *rgi) override;
 
   int do_apply_event(rpl_group_info *rgi,
                        const char *query_arg,
@@ -2321,21 +2321,21 @@ public:
     if (query_buf)
       my_free(query_buf);
   }
-  Log_event_type get_type_code() { return QUERY_COMPRESSED_EVENT; }
+  Log_event_type get_type_code() override { return QUERY_COMPRESSED_EVENT; }
 
   /*
     the min length of log_bin_compress_min_len is 10,
     means that Begin/Commit/Rollback would never be compressed!  
   */
-  virtual bool is_begin()    { return false; }
-  virtual bool is_commit()   { return false; }
-  virtual bool is_rollback() { return false; }
+  bool is_begin() override    { return false; }
+  bool is_commit() override   { return false; }
+  bool is_rollback() override { return false; }
 #ifdef MYSQL_SERVER
   Query_compressed_log_event(THD* thd_arg, const char* query_arg,
                              ulong query_length,
                              bool using_trans, bool direct, bool suppress_use,
                              int error);
-  virtual bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #endif
 };
 
@@ -2400,7 +2400,7 @@ public:
     memcpy(nonce, nonce_arg, BINLOG_NONCE_LENGTH);
   }
 
-  bool write_data_body(Log_event_writer *writer)
+  bool write_data_body(Log_event_writer *writer) override
   {
     uchar scheme_buf= crypto_scheme;
     uchar key_version_buf[BINLOG_KEY_VERSION_LENGTH];
@@ -2410,18 +2410,18 @@ public:
            write_data(writer, nonce, BINLOG_NONCE_LENGTH);
   }
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Start_encryption_log_event(const uchar *buf, uint event_len,
                              const Format_description_log_event
                              *description_event);
 
-  bool is_valid() const { return crypto_scheme == 1; }
+  bool is_valid() const override { return crypto_scheme == 1; }
 
-  Log_event_type get_type_code() { return START_ENCRYPTION_EVENT; }
+  Log_event_type get_type_code() override { return START_ENCRYPTION_EVENT; }
 
-  int get_data_size()
+  int get_data_size() override
   {
     return BINLOG_CRYPTO_SCHEME_LENGTH + BINLOG_KEY_VERSION_LENGTH +
            BINLOG_NONCE_LENGTH;
@@ -2433,9 +2433,9 @@ public:
 
 protected:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info* rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info* rgi)
+  int do_apply_event(rpl_group_info* rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info* rgi) override
   {
      return Log_event::EVENT_SKIP_NOT;
   }
@@ -2564,27 +2564,28 @@ public:
   {
     my_free(post_header_len);
   }
-  Log_event_type get_type_code() { return FORMAT_DESCRIPTION_EVENT;}
-  my_off_t get_header_len(my_off_t) { return LOG_EVENT_MINIMAL_HEADER_LEN; }
+  Log_event_type get_type_code() override { return FORMAT_DESCRIPTION_EVENT;}
+  my_off_t get_header_len(my_off_t) override
+    { return LOG_EVENT_MINIMAL_HEADER_LEN; }
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
   bool header_is_valid() const
   {
     return common_header_len >= LOG_EVENT_MINIMAL_HEADER_LEN && post_header_len;
   }
 
-  bool is_valid() const
+  bool is_valid() const override
   {
     return header_is_valid() && server_version_split.version_is_valid();
   }
 
-  int get_data_size()
+  int get_data_size() override
   {
     /*
       The vector of post-header lengths is considered as part of the
@@ -2610,9 +2611,9 @@ public:
   static bool is_version_before_checksum(const master_version_split *version_split);
 protected:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -2670,29 +2671,31 @@ Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg,
       cache_type= Log_event::EVENT_NO_CACHE;
   }
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Intvar_log_event(const uchar *buf,
                    const Format_description_log_event *description_event);
   ~Intvar_log_event() = default;
-  Log_event_type get_type_code() { return INTVAR_EVENT;}
+  Log_event_type get_type_code() override { return INTVAR_EVENT;}
   const char* get_var_type_name();
-  int get_data_size() { return  9; /* sizeof(type) + sizeof(val) */;}
+  int get_data_size() override { return  9; /* sizeof(type) + sizeof(val) */;}
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
+#ifdef HAVE_REPLICATION
+   bool is_part_of_group() override { return 1; }
 #endif
-  bool is_valid() const { return 1; }
-  bool is_part_of_group() { return 1; }
+#endif
+  bool is_valid() const override { return 1; }
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -2751,28 +2754,30 @@ class Rand_log_event: public Log_event
       cache_type= Log_event::EVENT_NO_CACHE;
   }
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Rand_log_event(const uchar *buf,
                  const Format_description_log_event *description_event);
   ~Rand_log_event() = default;
-  Log_event_type get_type_code() { return RAND_EVENT;}
-  int get_data_size() { return 16; /* sizeof(ulonglong) * 2*/ }
+  Log_event_type get_type_code() override { return RAND_EVENT;}
+  int get_data_size() override { return 16; /* sizeof(ulonglong) * 2*/ }
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
+#ifdef HAVE_REPLICATION
+   bool is_part_of_group() override { return 1; }
 #endif
-  bool is_valid() const { return 1; }
-  bool is_part_of_group() { return 1; }
+#endif
+  bool is_valid() const override { return 1; }
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -2789,14 +2794,14 @@ public:
    Log_event(buf, description_event) {}
 
   ~Xid_apply_log_event() = default;
-  bool is_valid() const { return 1; }
+  bool is_valid() const override { return 1; }
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
   virtual int do_commit()= 0;
-  virtual int do_apply_event(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
   int do_record_gtid(THD *thd, rpl_group_info *rgi, bool in_trans,
                      void **out_hton, bool force_err= false);
-  enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
   virtual const char* get_query()= 0;
 #endif
 };
@@ -2826,29 +2831,29 @@ public:
      if (direct)
        cache_type= Log_event::EVENT_NO_CACHE;
    }
-  const char* get_query()
+#ifdef HAVE_REPLICATION
+  const char* get_query() override
   {
     return "COMMIT /* implicit, from Xid_log_event */";
   }
-#ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Xid_log_event(const uchar *buf,
                 const Format_description_log_event *description_event);
   ~Xid_log_event() = default;
-  Log_event_type get_type_code() { return XID_EVENT;}
-  int get_data_size() { return sizeof(xid); }
+  Log_event_type get_type_code() override { return XID_EVENT;}
+  int get_data_size() override { return sizeof(xid); }
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #endif
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  int do_commit();
+  int do_commit() override;
 #endif
 };
 
@@ -2977,30 +2982,30 @@ public:
     cache_type= Log_event::EVENT_NO_CACHE;
   }
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
   XA_prepare_log_event(const uchar *buf,
                        const Format_description_log_event *description_event);
   ~XA_prepare_log_event() = default;
-  Log_event_type get_type_code() { return XA_PREPARE_LOG_EVENT; }
-  bool is_valid() const { return m_xid.formatID != -1; }
-  int get_data_size()
+  Log_event_type get_type_code() override { return XA_PREPARE_LOG_EVENT; }
+  bool is_valid() const override { return m_xid.formatID != -1; }
+  int get_data_size() override
   {
     return xid_subheader_no_data + m_xid.gtrid_length + m_xid.bqual_length;
   }
 
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #endif
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
   char query[sizeof("XA COMMIT ONE PHASE") + 1 + ser_buf_size];
-  int do_commit();
-  const char* get_query()
+  int do_commit() override;
+  const char* get_query() override
   {
     sprintf(query,
             (one_phase ? "XA COMMIT %s ONE PHASE" : "XA PREPARE %s"),
@@ -3046,17 +3051,19 @@ public:
       if (direct)
         cache_type= Log_event::EVENT_NO_CACHE;
     }
-  void pack_info(Protocol* protocol);
+#ifdef HAVE_REPLICATION
+  void pack_info(Protocol* protocol) override;
+#endif
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   User_var_log_event(const uchar *buf, uint event_len,
                      const Format_description_log_event *description_event);
   ~User_var_log_event() = default;
-  Log_event_type get_type_code() { return USER_VAR_EVENT;}
+  Log_event_type get_type_code() override { return USER_VAR_EVENT;}
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
   /* 
      Getter and setter for deferred User-event. 
      Returns true if the event is not applied directly 
@@ -3068,15 +3075,17 @@ public:
     and the parsing time query id is stored to be used at applying time.
   */
   void set_deferred(query_id_t qid) { deferred= true; query_id= qid; }
+#ifdef HAVE_REPLICATION
+   bool is_part_of_group() override { return 1; }
 #endif
-  bool is_valid() const { return name != 0; }
-  bool is_part_of_group() { return 1; }
+#endif
+  bool is_valid() const override { return name != 0; }
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -3096,7 +3105,7 @@ public:
   Stop_log_event() :Log_event()
   {}
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Stop_log_event(const uchar *buf,
@@ -3104,13 +3113,13 @@ public:
     Log_event(buf, description_event)
   {}
   ~Stop_log_event() = default;
-  Log_event_type get_type_code() { return STOP_EVENT;}
-  bool is_valid() const { return 1; }
+  Log_event_type get_type_code() override { return STOP_EVENT;}
+  bool is_valid() const override { return 1; }
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi)
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override
   {
     /*
       Events from ourself should be skipped, but they should not
@@ -3189,10 +3198,10 @@ public:
 		   uint ident_len_arg,
 		   ulonglong pos_arg, uint flags);
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Rotate_log_event(const uchar *buf, uint event_len,
@@ -3202,19 +3211,19 @@ public:
     if (flags & DUP_NAME)
       my_free((void*) new_log_ident);
   }
-  Log_event_type get_type_code() { return ROTATE_EVENT;}
-  my_off_t get_header_len(my_off_t l __attribute__((unused)))
+  Log_event_type get_type_code() override { return ROTATE_EVENT;}
+  my_off_t get_header_len(my_off_t l __attribute__((unused))) override
   { return LOG_EVENT_MINIMAL_HEADER_LEN; }
-  int get_data_size() { return  ident_len + ROTATE_HEADER_LEN;}
-  bool is_valid() const { return new_log_ident != 0; }
+  int get_data_size() override { return  ident_len + ROTATE_HEADER_LEN;}
+  bool is_valid() const override { return new_log_ident != 0; }
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #endif
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -3229,21 +3238,24 @@ public:
   Binlog_checkpoint_log_event(const char *binlog_file_name_arg,
                               uint binlog_file_len_arg);
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol *protocol);
+  void pack_info(Protocol *protocol) override;
 #endif
 #else
-  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info);
+  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info) override;
 #endif
   Binlog_checkpoint_log_event(const uchar *buf, uint event_len,
                               const Format_description_log_event
                               *description_event);
   ~Binlog_checkpoint_log_event() { my_free(binlog_file_name); }
-  Log_event_type get_type_code() { return BINLOG_CHECKPOINT_EVENT;}
-  int get_data_size() { return binlog_file_len + BINLOG_CHECKPOINT_HEADER_LEN;}
-  bool is_valid() const { return binlog_file_name != 0; }
+  Log_event_type get_type_code() override { return BINLOG_CHECKPOINT_EVENT;}
+  int get_data_size() override
+  { return binlog_file_len + BINLOG_CHECKPOINT_HEADER_LEN;}
+  bool is_valid() const override { return binlog_file_name != 0; }
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
-  enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  bool write(Log_event_writer *writer) override;
+#ifdef HAVE_REPLICATION
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
+#endif
 #endif
 };
 
@@ -3390,25 +3402,25 @@ public:
                  uint16 flags, bool is_transactional, uint64 commit_id,
                  bool has_xid= false, bool is_ro_1pc= false);
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol *protocol);
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  void pack_info(Protocol *protocol) override;
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 #else
-  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info);
+  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info) override;
 #endif
   Gtid_log_event(const uchar *buf, uint event_len,
                  const Format_description_log_event *description_event);
   ~Gtid_log_event() = default;
-  Log_event_type get_type_code() { return GTID_EVENT; }
-  enum_logged_status logged_status() { return LOGGED_NO_DATA; }
-  int get_data_size()
+  Log_event_type get_type_code() override { return GTID_EVENT; }
+  enum_logged_status logged_status() override { return LOGGED_NO_DATA; }
+  int get_data_size() override
   {
     return GTID_HEADER_LEN + ((flags2 & FL_GROUP_COMMIT_ID) ? 2 : 0);
   }
 
-  bool is_valid() const
+  bool is_valid() const override
   {
     /*
       seq_no is set to 0 if the structure of a serialized GTID event does not
@@ -3418,7 +3430,7 @@ public:
   }
 
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
   static int make_compatible_event(String *packet, bool *need_dummy_event,
                                     ulong ev_offset, enum_binlog_checksum_alg checksum_alg);
   static bool peek(const uchar *event_start, size_t event_len,
@@ -3516,16 +3528,16 @@ public:
   Gtid_list_log_event(rpl_binlog_state *gtid_set, uint32 gl_flags);
   Gtid_list_log_event(slave_connection_state *gtid_set, uint32 gl_flags);
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol *protocol);
+  void pack_info(Protocol *protocol) override;
 #endif
 #else
-  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info);
+  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info) override;
 #endif
   Gtid_list_log_event(const uchar *buf, uint event_len,
                       const Format_description_log_event *description_event);
   ~Gtid_list_log_event() { my_free(list); my_free(sub_id_list); }
-  Log_event_type get_type_code() { return GTID_LIST_EVENT; }
-  int get_data_size() {
+  Log_event_type get_type_code() override { return GTID_LIST_EVENT; }
+  int get_data_size() override {
     /*
       Replacing with dummy event, needed for older slaves, requires a minimum
       of 6 bytes in the body.
@@ -3533,12 +3545,12 @@ public:
     return (count==0 ?
             GTID_LIST_HEADER_LEN+2 : GTID_LIST_HEADER_LEN+count*element_size);
   }
-  bool is_valid() const { return list != NULL; }
+  bool is_valid() const override { return list != NULL; }
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
   bool to_packet(String *packet);
-  bool write(Log_event_writer *writer);
-  virtual int do_apply_event(rpl_group_info *rgi);
-  enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  bool write(Log_event_writer *writer) override;
+  int do_apply_event(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
   static bool peek(const char *event_start, size_t event_len,
                    enum_binlog_checksum_alg checksum_alg,
@@ -3574,28 +3586,28 @@ public:
   Append_block_log_event(THD* thd, const char* db_arg, uchar* block_arg,
 			 uint block_len_arg, bool using_trans);
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
   virtual int get_create_or_append() const;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
 #endif
 
   Append_block_log_event(const uchar *buf, uint event_len,
                          const Format_description_log_event
                          *description_event);
   ~Append_block_log_event() = default;
-  Log_event_type get_type_code() { return APPEND_BLOCK_EVENT;}
-  int get_data_size() { return  block_len + APPEND_BLOCK_HEADER_LEN ;}
-  bool is_valid() const { return block != 0; }
+  Log_event_type get_type_code() override { return APPEND_BLOCK_EVENT;}
+  int get_data_size() override { return  block_len + APPEND_BLOCK_HEADER_LEN ;}
+  bool is_valid() const override { return block != 0; }
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
-  const char* get_db() { return db; }
+  bool write(Log_event_writer *writer) override;
+  const char* get_db() override { return db; }
 #endif
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -3615,10 +3627,10 @@ public:
 #ifdef MYSQL_SERVER
   Delete_file_log_event(THD* thd, const char* db_arg, bool using_trans);
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
   bool print(FILE* file, PRINT_EVENT_INFO* print_event_info,
              bool enable_local);
 #endif
@@ -3626,17 +3638,17 @@ public:
   Delete_file_log_event(const uchar *buf, uint event_len,
                         const Format_description_log_event* description_event);
   ~Delete_file_log_event() = default;
-  Log_event_type get_type_code() { return DELETE_FILE_EVENT;}
-  int get_data_size() { return DELETE_FILE_HEADER_LEN ;}
-  bool is_valid() const { return file_id != 0; }
+  Log_event_type get_type_code() override { return DELETE_FILE_EVENT;}
+  int get_data_size() override { return DELETE_FILE_HEADER_LEN ;}
+  bool is_valid() const override { return file_id != 0; }
 #ifdef MYSQL_SERVER
-  bool write(Log_event_writer *writer);
-  const char* get_db() { return db; }
+  bool write(Log_event_writer *writer) override;
+  const char* get_db() override { return db; }
 #endif
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -3659,17 +3671,17 @@ public:
                              bool using_trans);
 #ifdef HAVE_REPLICATION
   Begin_load_query_log_event(THD* thd);
-  int get_create_or_append() const;
+  int get_create_or_append() const override;
 #endif /* HAVE_REPLICATION */
 #endif
   Begin_load_query_log_event(const uchar *buf, uint event_len,
                              const Format_description_log_event
                              *description_event);
   ~Begin_load_query_log_event() = default;
-  Log_event_type get_type_code() { return BEGIN_LOAD_QUERY_EVENT; }
+  Log_event_type get_type_code() override { return BEGIN_LOAD_QUERY_EVENT; }
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -3712,10 +3724,10 @@ public:
                                bool using_trans, bool direct,
                                bool suppress_use, int errcode);
 #ifdef HAVE_REPLICATION
-  void pack_info(Protocol* protocol);
+  void pack_info(Protocol* protocol) override;
 #endif /* HAVE_REPLICATION */
 #else
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
   /* Prints the query as LOAD DATA LOCAL and with rewritten filename */
   bool print(FILE* file, PRINT_EVENT_INFO* print_event_info,
 	     const char *local_fname);
@@ -3725,17 +3737,17 @@ public:
                                *description_event);
   ~Execute_load_query_log_event() = default;
 
-  Log_event_type get_type_code() { return EXECUTE_LOAD_QUERY_EVENT; }
-  bool is_valid() const { return Query_log_event::is_valid() && file_id != 0; }
+  Log_event_type get_type_code() override { return EXECUTE_LOAD_QUERY_EVENT; }
+  bool is_valid() const override { return Query_log_event::is_valid() && file_id != 0; }
 
-  ulong get_post_header_size_for_derived();
+  ulong get_post_header_size_for_derived() override;
 #ifdef MYSQL_SERVER
-  bool write_post_header_for_derived(Log_event_writer *writer);
+  bool write_post_header_for_derived(Log_event_writer *writer) override;
 #endif
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
 #endif
 };
 
@@ -3762,9 +3774,9 @@ public:
   /* constructor for hopelessly corrupted events */
   Unknown_log_event(): Log_event(), what(ENCRYPTED) {}
   ~Unknown_log_event() = default;
-  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info);
-  Log_event_type get_type_code() { return UNKNOWN_EVENT;}
-  bool is_valid() const { return 1; }
+  bool print(FILE* file, PRINT_EVENT_INFO* print_event_info) override;
+  Log_event_type get_type_code() override { return UNKNOWN_EVENT;}
+  bool is_valid() const override { return 1; }
 };
 #endif
 char *str_to_hex(char *to, const uchar *from, size_t len);
@@ -3791,30 +3803,32 @@ public:
                           const Format_description_log_event*);
   ~Annotate_rows_log_event();
 
-  virtual int get_data_size();
-  virtual Log_event_type get_type_code();
-  enum_logged_status logged_status() { return LOGGED_NO_DATA; }
-  virtual bool is_valid() const;
-  virtual bool is_part_of_group() { return 1; }
+  int get_data_size() override;
+  Log_event_type get_type_code() override;
+  enum_logged_status logged_status() override { return LOGGED_NO_DATA; }
+  bool is_valid() const override;
 
 #ifndef MYSQL_CLIENT
-  virtual bool write_data_header(Log_event_writer *writer);
-  virtual bool write_data_body(Log_event_writer *writer);
+  bool write_data_header(Log_event_writer *writer) override;
+  bool write_data_body(Log_event_writer *writer) override;
+#ifdef HAVE_REPLICATION
+   bool is_part_of_group() override { return 1; }
+#endif
 #endif
 
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
-  virtual void pack_info(Protocol*);
+  void pack_info(Protocol*) override;
 #endif
 
 #ifdef MYSQL_CLIENT
-  virtual bool print(FILE*, PRINT_EVENT_INFO*);
+  bool print(FILE*, PRINT_EVENT_INFO*) override;
 #endif
 
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
 private:
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info*);
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info*) override;
 #endif
 
 private:
@@ -4459,34 +4473,36 @@ public:
   const char *get_table_name() const { return m_tblnam; }
   const char *get_db_name() const    { return m_dbnam; }
 
-  virtual Log_event_type get_type_code() { return TABLE_MAP_EVENT; }
-  virtual enum_logged_status logged_status() { return LOGGED_TABLE_MAP; }
-  virtual bool is_valid() const { return m_memory != NULL; /* we check malloc */ }
-  virtual bool is_part_of_group() { return 1; }
+  Log_event_type get_type_code() override { return TABLE_MAP_EVENT; }
+  enum_logged_status logged_status() override { return LOGGED_TABLE_MAP; }
+  bool is_valid() const override { return m_memory != NULL; /* we check malloc */ }
 
-  virtual int get_data_size() { return (uint) m_data_size; } 
+  int get_data_size() override { return (uint) m_data_size; } 
 #ifdef MYSQL_SERVER
+#ifdef HAVE_REPLICATION
+   bool is_part_of_group() override { return 1; }
+#endif
   virtual int save_field_metadata();
-  virtual bool write_data_header(Log_event_writer *writer);
-  virtual bool write_data_body(Log_event_writer *writer);
-  virtual const char *get_db() { return m_dbnam; }
+  bool write_data_header(Log_event_writer *writer) override;
+  bool write_data_body(Log_event_writer *writer) override;
+  const char *get_db() override { return m_dbnam; }
 #endif
 
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual void pack_info(Protocol *protocol);
+  void pack_info(Protocol *protocol) override;
 #endif
 
 #ifdef MYSQL_CLIENT
-  virtual bool print(FILE *file, PRINT_EVENT_INFO *print_event_info);
+  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info) override;
 #endif
 
   table_def get_table_def();
 
 private:
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 #endif
 
 #ifdef MYSQL_SERVER
@@ -4636,12 +4652,12 @@ public:
   flag_set get_flags(flag_set flags_arg) const { return m_flags & flags_arg; }
   void update_flags() { int2store(temp_buf + m_flags_pos, m_flags); }
 
-  Log_event_type get_type_code() { return m_type; } /* Specific type (_V1 etc) */
-  enum_logged_status logged_status() { return LOGGED_ROW_EVENT; }
+  Log_event_type get_type_code() override { return m_type; } /* Specific type (_V1 etc) */
+  enum_logged_status logged_status() override { return LOGGED_ROW_EVENT; }
   virtual Log_event_type get_general_type_code() const = 0; /* General rows op type, no version */
 
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual void pack_info(Protocol *protocol);
+  void pack_info(Protocol *protocol) override;
 #endif
 
 #ifdef MYSQL_CLIENT
@@ -4652,7 +4668,7 @@ public:
   };
 
   /* not for direct call, each derived has its own ::print() */
-  virtual bool print(FILE *file, PRINT_EVENT_INFO *print_event_info)= 0;
+  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info) override= 0;
   void change_to_flashback_event(PRINT_EVENT_INFO *print_event_info, uchar *rows_buff, Log_event_type ev_type);
   bool print_verbose(IO_CACHE *file,
                      PRINT_EVENT_INFO *print_event_info);
@@ -4676,7 +4692,7 @@ public:
 #endif
 
   /* Member functions to implement superclass interface */
-  virtual int get_data_size();
+  int get_data_size() override;
 
   MY_BITMAP const *get_cols() const { return &m_cols; }
   MY_BITMAP const *get_cols_ai() const { return &m_cols_ai; }
@@ -4732,10 +4748,13 @@ public:
 #endif
 
 #ifdef MYSQL_SERVER
-  virtual bool write_data_header(Log_event_writer *writer);
-  virtual bool write_data_body(Log_event_writer *writer);
+  bool write_data_header(Log_event_writer *writer) override;
+  bool write_data_body(Log_event_writer *writer) override;
   virtual bool write_compressed(Log_event_writer *writer);
-  virtual const char *get_db() { return m_table->s->db.str; }
+  const char *get_db() override { return m_table->s->db.str; }
+#ifdef HAVE_REPLICATION
+   bool is_part_of_group() override { return get_flags(STMT_END_F) != 0; }
+#endif
 #endif
   /*
     Check that malloc() succeeded in allocating memory for the rows
@@ -4743,11 +4762,10 @@ public:
     is valid is done in the Update_rows_log_event::is_valid()
     function.
   */
-  virtual bool is_valid() const
+  bool is_valid() const override
   {
     return m_rows_buf && m_cols.bitmap;
   }
-  bool is_part_of_group() { return get_flags(STMT_END_F) != 0; }
 
   uint     m_row_count;         /* The number of rows added to the event */
 
@@ -4928,9 +4946,9 @@ protected:
 private:
 
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
-  virtual int do_update_pos(rpl_group_info *rgi);
-  virtual enum_skip_reason do_shall_skip(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
+  int do_update_pos(rpl_group_info *rgi) override;
+  enum_skip_reason do_shall_skip(rpl_group_info *rgi) override;
 
   /**
     @brief Primitive to prepare for a sequence of row executions.
@@ -5050,7 +5068,7 @@ public:
 #if defined(MYSQL_SERVER)
   Write_rows_compressed_log_event(THD*, TABLE*, ulonglong table_id,
                        bool is_transactional);
-  virtual bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #endif
 #ifdef HAVE_REPLICATION
   Write_rows_compressed_log_event(const uchar *buf, uint event_len,
@@ -5139,7 +5157,7 @@ public:
 #if defined(MYSQL_SERVER)
   Update_rows_compressed_log_event(THD*, TABLE*, ulonglong table_id,
                         bool is_transactional);
-  virtual bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #endif
 #ifdef HAVE_REPLICATION
   Update_rows_compressed_log_event(const uchar *buf, uint event_len,
@@ -5230,7 +5248,7 @@ public:
 #if defined(MYSQL_SERVER)
   Delete_rows_compressed_log_event(THD*, TABLE*, ulonglong,
                                    bool is_transactional);
-  virtual bool write(Log_event_writer *writer);
+  bool write(Log_event_writer *writer) override;
 #endif
 #ifdef HAVE_REPLICATION
   Delete_rows_compressed_log_event(const uchar *buf, uint event_len,
@@ -5318,10 +5336,12 @@ public:
 #endif
 
 #ifdef MYSQL_SERVER
-  void pack_info(Protocol*);
+#ifdef HAVE_REPLICATION
+  void pack_info(Protocol*) override;
+#endif
 
-  virtual bool write_data_header(Log_event_writer *writer);
-  virtual bool write_data_body(Log_event_writer *writer);
+  bool write_data_header(Log_event_writer *writer) override;
+  bool write_data_body(Log_event_writer *writer) override;
 #endif
 
   Incident_log_event(const uchar *buf, uint event_len,
@@ -5330,20 +5350,20 @@ public:
   virtual ~Incident_log_event();
 
 #ifdef MYSQL_CLIENT
-  virtual bool print(FILE *file, PRINT_EVENT_INFO *print_event_info);
+  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info) override;
 #endif
 
 #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
-  virtual int do_apply_event(rpl_group_info *rgi);
+  int do_apply_event(rpl_group_info *rgi) override;
 #endif
 
-  virtual Log_event_type get_type_code() { return INCIDENT_EVENT; }
+  Log_event_type get_type_code() override { return INCIDENT_EVENT; }
 
-  virtual bool is_valid() const
+  bool is_valid() const override
   {
     return m_incident > INCIDENT_NONE && m_incident < INCIDENT_COUNT;
   }
-  virtual int get_data_size() {
+  int get_data_size() override {
     return INCIDENT_HEADER_LEN + 1 + (uint) m_message.length;
   }
 
@@ -5393,18 +5413,18 @@ public:
   virtual ~Ignorable_log_event();
 
 #ifndef MYSQL_CLIENT
-  void pack_info(Protocol*);
+#ifdef HAVE_REPLICATION
+   void pack_info(Protocol*) override;
+#endif
+#else
+  bool print(FILE *file, PRINT_EVENT_INFO *print_event_info) override;
 #endif
 
-#ifdef MYSQL_CLIENT
-  virtual bool print(FILE *file, PRINT_EVENT_INFO *print_event_info);
-#endif
+  Log_event_type get_type_code() override { return IGNORABLE_LOG_EVENT; }
 
-  virtual Log_event_type get_type_code() { return IGNORABLE_LOG_EVENT; }
+  bool is_valid() const override { return 1; }
 
-  virtual bool is_valid() const { return 1; }
-
-  virtual int get_data_size() { return IGNORABLE_HEADER_LEN; }
+  int get_data_size() override { return IGNORABLE_HEADER_LEN; }
 };
 
 #ifdef MYSQL_CLIENT
@@ -5442,8 +5462,8 @@ public:
   uint8 hb_flags;
   Heartbeat_log_event(const uchar *buf, uint event_len,
                       const Format_description_log_event* description_event);
-  Log_event_type get_type_code() { return HEARTBEAT_LOG_EVENT; }
-  bool is_valid() const
+  Log_event_type get_type_code() override { return HEARTBEAT_LOG_EVENT; }
+  bool is_valid() const override
     {
       return (log_ident != NULL && ident_len <= FN_REFLEN-1 &&
               log_pos >= BIN_LOG_HEADER_SIZE);
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc
index 4111e5fb293..ff5eb1c8c1a 100644
--- a/sql/log_event_server.cc
+++ b/sql/log_event_server.cc
@@ -8135,6 +8135,7 @@ uint8 Update_rows_log_event::get_trg_event_map() const
 #endif
 
 
+#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
 void Incident_log_event::pack_info(Protocol *protocol)
 {
   char buf[256];
@@ -8147,7 +8148,7 @@ void Incident_log_event::pack_info(Protocol *protocol)
                        m_incident, description(), m_message.str);
   protocol->store(buf, bytes, &my_charset_bin);
 }
-
+#endif
 
 #if defined(WITH_WSREP)
 /*
@@ -8233,6 +8234,7 @@ Incident_log_event::write_data_body(Log_event_writer *writer)
 }
 
 
+#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
 /* Pack info for its unrecognized ignorable event */
 void Ignorable_log_event::pack_info(Protocol *protocol)
 {
@@ -8242,7 +8244,7 @@ void Ignorable_log_event::pack_info(Protocol *protocol)
                      number, description);
   protocol->store(buf, bytes, &my_charset_bin);
 }
-
+#endif
 
 #if defined(HAVE_REPLICATION)
 Heartbeat_log_event::Heartbeat_log_event(const uchar *buf, uint event_len,
diff --git a/sql/mdl.cc b/sql/mdl.cc
index 69367f6024a..faccd1c9476 100644
--- a/sql/mdl.cc
+++ b/sql/mdl.cc
@@ -199,10 +199,10 @@ public:
       m_current_search_depth(0),
       m_found_deadlock(FALSE)
   {}
-  virtual bool enter_node(MDL_context *node);
-  virtual void leave_node(MDL_context *node);
+  bool enter_node(MDL_context *node) override;
+  void leave_node(MDL_context *node) override;
 
-  virtual bool inspect_edge(MDL_context *dest);
+  bool inspect_edge(MDL_context *dest) override;
 
   MDL_context *get_victim() const { return m_victim; }
 private:
@@ -434,11 +434,11 @@ public:
   struct MDL_scoped_lock : public MDL_lock_strategy
   {
     MDL_scoped_lock() = default;
-    virtual const bitmap_t *incompatible_granted_types_bitmap() const
+    const bitmap_t *incompatible_granted_types_bitmap() const override
     { return m_granted_incompatible; }
-    virtual const bitmap_t *incompatible_waiting_types_bitmap() const
+    const bitmap_t *incompatible_waiting_types_bitmap() const override
     { return m_waiting_incompatible; }
-    virtual bool needs_notification(const MDL_ticket *ticket) const
+    bool needs_notification(const MDL_ticket *ticket) const override
     { return (ticket->get_type() == MDL_SHARED); }
 
     /**
@@ -449,14 +449,14 @@ public:
       insert delayed. We need to kill such threads in order to get
       global shared lock. We do this my calling code outside of MDL.
     */
-    virtual bool conflicting_locks(const MDL_ticket *ticket) const
+    bool conflicting_locks(const MDL_ticket *ticket) const override
     { return ticket->get_type() == MDL_INTENTION_EXCLUSIVE; }
 
     /*
       In scoped locks, only IX lock request would starve because of X/S. But that
       is practically very rare case. So just return 0 from this function.
     */
-    virtual bitmap_t hog_lock_types_bitmap() const
+    bitmap_t hog_lock_types_bitmap() const override
     { return 0; }
   private:
     static const bitmap_t m_granted_incompatible[MDL_TYPE_END];
@@ -471,11 +471,11 @@ public:
   struct MDL_object_lock : public MDL_lock_strategy
   {
     MDL_object_lock() = default;
-    virtual const bitmap_t *incompatible_granted_types_bitmap() const
+    const bitmap_t *incompatible_granted_types_bitmap() const override
     { return m_granted_incompatible; }
-    virtual const bitmap_t *incompatible_waiting_types_bitmap() const
+    const bitmap_t *incompatible_waiting_types_bitmap() const override
     { return m_waiting_incompatible; }
-    virtual bool needs_notification(const MDL_ticket *ticket) const
+    bool needs_notification(const MDL_ticket *ticket) const override
     {
       return (MDL_BIT(ticket->get_type()) &
               (MDL_BIT(MDL_SHARED_NO_WRITE) |
@@ -491,7 +491,7 @@ public:
       lock or some other non-MDL resource we might need to wake it up
       by calling code outside of MDL.
     */
-    virtual bool conflicting_locks(const MDL_ticket *ticket) const
+    bool conflicting_locks(const MDL_ticket *ticket) const override
     { return ticket->get_type() < MDL_SHARED_UPGRADABLE; }
 
     /*
@@ -499,7 +499,7 @@ public:
       max_write_lock_count times in a row while other lock types are
       waiting.
     */
-    virtual bitmap_t hog_lock_types_bitmap() const
+    bitmap_t hog_lock_types_bitmap() const override
     {
       return (MDL_BIT(MDL_SHARED_NO_WRITE) |
               MDL_BIT(MDL_SHARED_NO_READ_WRITE) |
@@ -515,11 +515,11 @@ public:
   struct MDL_backup_lock: public MDL_lock_strategy
   {
     MDL_backup_lock() = default;
-    virtual const bitmap_t *incompatible_granted_types_bitmap() const
+    const bitmap_t *incompatible_granted_types_bitmap() const override
     { return m_granted_incompatible; }
-    virtual const bitmap_t *incompatible_waiting_types_bitmap() const
+    const bitmap_t *incompatible_waiting_types_bitmap() const override
     { return m_waiting_incompatible; }
-    virtual bool needs_notification(const MDL_ticket *ticket) const
+    bool needs_notification(const MDL_ticket *ticket) const override
     {
       return (MDL_BIT(ticket->get_type()) & MDL_BIT(MDL_BACKUP_FTWRL1));
     }
@@ -529,7 +529,7 @@ public:
        We need to kill such threads in order to get lock for FTWRL statements.
        We do this by calling code outside of MDL.
     */
-    virtual bool conflicting_locks(const MDL_ticket *ticket) const
+    bool conflicting_locks(const MDL_ticket *ticket) const override
     {
       return (MDL_BIT(ticket->get_type()) &
               (MDL_BIT(MDL_BACKUP_DML) |
@@ -541,7 +541,7 @@ public:
       BACKUP statements. This scenario is partically useless in real world,
       so we just return 0 here.
     */
-    virtual bitmap_t hog_lock_types_bitmap() const
+    bitmap_t hog_lock_types_bitmap() const override
     { return 0; }
   private:
     static const bitmap_t m_granted_incompatible[MDL_BACKUP_END];
@@ -2130,6 +2130,8 @@ MDL_context::try_acquire_lock_impl(MDL_request *mdl_request,
 
   if (lock->can_grant_lock(mdl_request->type, this, false))
   {
+    if (metadata_lock_info_plugin_loaded)
+      ticket->m_time= microsecond_interval_timer();
     lock->m_granted.add_ticket(ticket);
 
     mysql_prlock_unlock(&lock->m_rwlock);
@@ -2201,6 +2203,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
   DBUG_ASSERT(mdl_request->ticket->has_stronger_or_equal_type(ticket->m_type));
 
   ticket->m_lock= mdl_request->ticket->m_lock;
+  ticket->m_time= mdl_request->ticket->m_time;
   mdl_request->ticket= ticket;
 
   mysql_prlock_wrlock(&ticket->m_lock->m_rwlock);
@@ -2344,6 +2347,8 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout)
   }
 #endif /* WITH_WSREP */
 
+  if (metadata_lock_info_plugin_loaded)
+    ticket->m_time= microsecond_interval_timer();
   lock->m_waiting.add_ticket(ticket);
 
   /*
diff --git a/sql/mdl.h b/sql/mdl.h
index 384878a1bc9..68cf5d2e811 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -701,7 +701,17 @@ public:
   */
   MDL_ticket *next_in_context;
   MDL_ticket **prev_in_context;
+
+#ifndef DBUG_OFF
+  /**
+    Duration of lock represented by this ticket.
+    Context public. Debug-only.
+  */
 public:
+  enum_mdl_duration m_duration;
+#endif
+  ulonglong m_time;
+
 #ifdef WITH_WSREP
   void wsrep_report(bool debug) const;
 #endif /* WITH_WSREP */
@@ -728,8 +738,8 @@ public:
   bool is_incompatible_when_waiting(enum_mdl_type type) const;
 
   /** Implement MDL_wait_for_subgraph interface. */
-  virtual bool accept_visitor(MDL_wait_for_graph_visitor *dvisitor);
-  virtual uint get_deadlock_weight() const;
+  bool accept_visitor(MDL_wait_for_graph_visitor *dvisitor) override;
+  uint get_deadlock_weight() const override;
   /**
     Status of lock request represented by the ticket as reflected in P_S.
   */
@@ -743,10 +753,12 @@ private:
              , enum_mdl_duration duration_arg
 #endif
             )
-   : m_type(type_arg),
+   :
 #ifndef DBUG_OFF
      m_duration(duration_arg),
 #endif
+     m_time(0),
+     m_type(type_arg),
      m_ctx(ctx_arg),
      m_lock(NULL),
      m_psi(NULL)
@@ -766,13 +778,7 @@ private:
 private:
   /** Type of metadata lock. Externally accessible. */
   enum enum_mdl_type m_type;
-#ifndef DBUG_OFF
-  /**
-    Duration of lock represented by this ticket.
-    Context private. Debug-only.
-  */
-  enum_mdl_duration m_duration;
-#endif
+
   /**
     Context of the owner of the metadata lock ticket. Externally accessible.
   */
diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h
index ecb1a08051e..c66c0abcca0 100644
--- a/sql/multi_range_read.h
+++ b/sql/multi_range_read.h
@@ -247,11 +247,11 @@ public:
            void *seq_init_param, uint n_ranges,
            uint mode, Key_parameters *key_par,
            Lifo_buffer *key_buffer,
-           Buffer_manager *buf_manager_arg);
-  int get_next(range_id_t *range_info);
-  int refill_buffer(bool initial) { return initial? 0: HA_ERR_END_OF_FILE; }
-  uchar *get_rowid_ptr() { return file->ref; }
-  bool skip_record(range_id_t range_id, uchar *rowid)
+           Buffer_manager *buf_manager_arg) override;
+  int get_next(range_id_t *range_info) override;
+  int refill_buffer(bool initial) override { return initial? 0: HA_ERR_END_OF_FILE; }
+  uchar *get_rowid_ptr() override { return file->ref; }
+  bool skip_record(range_id_t range_id, uchar *rowid) override
   {
     return (file->mrr_funcs.skip_record &&
             file->mrr_funcs.skip_record(file->mrr_iter, range_id, rowid));
@@ -270,12 +270,12 @@ public:
            void *seq_init_param, uint n_ranges,
            uint mode, Key_parameters *key_par,
            Lifo_buffer *key_buffer,
-           Buffer_manager *buf_manager_arg);
-  int get_next(range_id_t *range_info);
-  int refill_buffer(bool initial);
-  uchar *get_rowid_ptr() { return file->ref; }
+           Buffer_manager *buf_manager_arg) override;
+  int get_next(range_id_t *range_info) override;
+  int refill_buffer(bool initial) override;
+  uchar *get_rowid_ptr() override { return file->ref; }
   
-  bool skip_record(range_id_t range_info, uchar *rowid)
+  bool skip_record(range_id_t range_info, uchar *rowid) override
   {
     return (mrr_funcs.skip_record &&
             mrr_funcs.skip_record(mrr_iter, range_info, rowid));
@@ -292,9 +292,9 @@ public:
                                     uchar **space_start, uchar *space_end);
   void set_no_interruption_temp_buffer();
 
-  void interrupt_read();
-  void resume_read();
-  void position();
+  void interrupt_read() override;
+  void resume_read() override;
+  void position() override;
 private:
   Key_value_records_iterator kv_it;
 
@@ -365,8 +365,8 @@ class Mrr_ordered_rndpos_reader : public Mrr_reader
 public:
   int init(handler *file, Mrr_index_reader *index_reader, uint mode,
            Lifo_buffer *buf, Rowid_filter *filter);
-  int get_next(range_id_t *range_info);
-  int refill_buffer(bool initial);
+  int get_next(range_id_t *range_info) override;
+  int refill_buffer(bool initial) override;
 private:
   handler *file; /* Handler to use */
   
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc
index 9217a231af2..e424141b151 100644
--- a/sql/mysql_install_db.cc
+++ b/sql/mysql_install_db.cc
@@ -335,6 +335,7 @@ static char *init_bootstrap_command_line(char *cmdline, size_t size)
     " %s"
     " --bootstrap"
     " --datadir=."
+    " --tmpdir=."
     " --loose-innodb-buffer-pool-size=20M"
     "\""
     , mysqld_path, opt_verbose_bootstrap ? "--console" : "");
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index dc5aeaae482..741094287fd 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -363,6 +363,8 @@ LEX_STRING opt_init_connect, opt_init_slave;
 static DYNAMIC_ARRAY all_options;
 static longlong start_memory_used;
 
+char server_uid[SERVER_UID_SIZE+1];   // server uid will be written here
+
 /* Global variables */
 
 bool opt_bin_log, opt_bin_log_used=0, opt_ignore_builtin_innodb= 0;
@@ -784,6 +786,12 @@ char *opt_logname, *opt_slow_logname, *opt_bin_logname;
 char *opt_binlog_index_name=0;
 my_bool opt_binlog_legacy_event_pos= FALSE;
 
+/*
+  Flag if the METADATA_LOCK_INFO is used. In this case we store the time
+  when we take a MDL lock.
+*/
+bool metadata_lock_info_plugin_loaded= 0;
+
 /* Static variables */
 
 my_bool opt_stack_trace;
@@ -1198,6 +1206,8 @@ PSI_file_key key_file_map;
 PSI_statement_info stmt_info_new_packet;
 #endif
 
+static int calculate_server_uid(char *dest);
+
 #ifndef EMBEDDED_LIBRARY
 void net_before_header_psi(struct st_net *net, void *thd, size_t /* unused: count */)
 {
@@ -2330,6 +2340,7 @@ static void activate_tcp_port(uint port,
   else
     real_bind_addr_str= my_bind_addr_str;
 
+  DBUG_EXECUTE_IF("sabotage_port_number", port= UINT_MAX32;);
   my_snprintf(port_buf, NI_MAXSERV, "%d", port);
 
   if (real_bind_addr_str && *real_bind_addr_str)
@@ -2373,6 +2384,13 @@ static void activate_tcp_port(uint port,
   else
   {
     error= getaddrinfo(real_bind_addr_str, port_buf, &hints, &ai);
+    if (unlikely(error != 0))
+    {
+      sql_print_error("%s: %s", ER_DEFAULT(ER_IPSOCK_ERROR),
+                      gai_strerror(error));
+      unireg_abort(1); /* purecov: tested */
+    }
+
     head= ai;
   }
 
@@ -4105,6 +4123,9 @@ static int init_common_variables()
   if (IS_SYSVAR_AUTOSIZE(&server_version_ptr))
     set_server_version(server_version, sizeof(server_version));
 
+  if (calculate_server_uid(server_uid))
+    strmov(server_uid, "unknown");
+
   mysql_real_data_home_len= uint(strlen(mysql_real_data_home));
 
   sf_leaking_memory= 0; // no memory leaks from now on
@@ -5031,8 +5052,10 @@ static int init_server_components()
     first in error log, for troubleshooting and debugging purposes
   */
   if (!opt_help)
-    sql_print_information("Starting MariaDB %s source revision %s as process %lu",
-                          server_version, SOURCE_REVISION, (ulong) getpid());
+    sql_print_information("Starting MariaDB %s source revision %s "
+                          "server_uid %s as process %lu",
+                          server_version, SOURCE_REVISION, server_uid,
+                          (ulong) getpid());
 
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
   /*
@@ -5401,7 +5424,6 @@ static int init_server_components()
       MARIADB_REMOVED_OPTION("innodb-log-compressed-pages"),
       MARIADB_REMOVED_OPTION("innodb-log-files-in-group"),
       MARIADB_REMOVED_OPTION("innodb-log-optimize-ddl"),
-      MARIADB_REMOVED_OPTION("innodb-log-write-ahead-size"),
       MARIADB_REMOVED_OPTION("innodb-page-cleaners"),
       MARIADB_REMOVED_OPTION("innodb-replication-delay"),
       MARIADB_REMOVED_OPTION("innodb-scrub-log"),
@@ -6776,7 +6798,7 @@ struct my_option my_long_options[]=
 #ifdef HAVE_REPLICATION
   {"init-rpl-role", 0, "Set the replication role",
    &rpl_status, &rpl_status, &rpl_role_typelib,
-   GET_ENUM, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   GET_ENUM, REQUIRED_ARG, RPL_AUTH_MASTER, 0, 0, 0, 0, 0},
 #endif /* HAVE_REPLICATION */
   {"memlock", 0, "Lock mariadbd process in memory", &locked_in_memory,
    &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -8434,6 +8456,14 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
     if (argument == NULL) /* no argument */
       log_error_file_ptr= const_cast<char*>("");
     break;
+  case OPT_LOG_SLOW_FILTER:
+    if (argument == NULL || *argument == 0)
+    {
+      /* By default log_slow_filter_has all values except QPLAN_NOT_USING_INDEX */
+      global_system_variables.log_slow_filter= opt->def_value | QPLAN_NOT_USING_INDEX;
+      sql_print_warning("log_slow_filter=\"\" changed to log_slow_filter=ALL");
+    }
+    break;
   case OPT_IGNORE_DB_DIRECTORY:
     opt_ignore_db_dirs= NULL; // will be set in ignore_db_dirs_process_additions
     if (*argument == 0)
@@ -10120,3 +10150,31 @@ my_thread_id next_thread_id(void)
   mysql_mutex_unlock(&LOCK_thread_id);
   return retval;
 }
+
+
+/**
+  calculates the server unique identifier
+
+  UID is a base64 encoded SHA1 hash of the MAC address of one of
+  the interfaces, and the tcp port that the server is listening on
+*/
+
+static int calculate_server_uid(char *dest)
+{
+  uchar rawbuf[2 + 6];
+  uchar shabuf[MY_SHA1_HASH_SIZE];
+
+  int2store(rawbuf, mysqld_port);
+  if (my_gethwaddr(rawbuf + 2))
+  {
+    sql_print_error("feedback plugin: failed to retrieve the MAC address");
+    return 1;
+  }
+
+  my_sha1((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf));
+
+  assert(my_base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE);
+  my_base64_encode(shabuf, sizeof(shabuf), dest);
+
+  return 0;
+}
diff --git a/sql/mysqld.h b/sql/mysqld.h
index eca68d07d35..34205b2d47a 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -147,6 +147,7 @@ extern my_bool opt_old_style_user_limits, trust_function_creators;
 extern uint opt_crash_binlog_innodb;
 extern const char *shared_memory_base_name;
 extern MYSQL_PLUGIN_IMPORT char *mysqld_unix_port;
+extern MYSQL_PLUGIN_IMPORT bool metadata_lock_info_plugin_loaded;
 extern my_bool opt_enable_shared_memory;
 extern ulong opt_replicate_events_marked_for_skip;
 extern char *default_tz_name;
@@ -842,6 +843,7 @@ enum options_mysqld
   OPT_KEY_CACHE_CHANGED_BLOCKS_HASH_SIZE,
   OPT_LOG_BASENAME,
   OPT_LOG_ERROR,
+  OPT_LOG_SLOW_FILTER,
   OPT_LOWER_CASE_TABLE_NAMES,
   OPT_PLUGIN_LOAD,
   OPT_PLUGIN_LOAD_ADD,
@@ -1002,6 +1004,8 @@ extern my_bool opt_mysql56_temporal_format, strict_password_validation;
 extern ulong binlog_checksum_options;
 extern bool max_user_connections_checking;
 extern ulong opt_binlog_dbug_fsync_sleep;
+static const int SERVER_UID_SIZE= 29;
+extern char server_uid[SERVER_UID_SIZE+1];
 
 extern uint volatile global_disable_checkpoint;
 extern my_bool opt_help;
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 90bf4ef3d7d..ed1cf61268d 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -711,13 +711,12 @@ net_real_write(NET *net,const uchar *packet, size_t len)
 #ifdef MYSQL_SERVER
       if (global_system_variables.log_warnings > 3)
       {
-        my_printf_error(net->last_errno,
-                        "Could not write packet: fd: %lld  state: %d  "
-                        "errno: %d  vio_errno: %d  length: %ld",
-                        MYF(ME_ERROR_LOG),
-                        (longlong) vio_fd(net->vio), (int) net->vio->state,
-                        vio_errno(net->vio), net->last_errno, (ulong) (end-pos));
-        break;
+        sql_print_warning("Could not write packet: fd: %lld  state: %d  "
+                          "errno: %d  vio_errno: %d  length: %ld",
+                          MYF(ME_ERROR_LOG | ME_WARNING),
+                          (longlong) vio_fd(net->vio), (int) net->vio->state,
+                          vio_errno(net->vio), net->last_errno,
+                          (ulong) (end-pos));
       }
 #endif
       MYSQL_SERVER_my_error(net->last_errno, MYF(0));
@@ -871,17 +870,16 @@ retry:
 #ifdef MYSQL_SERVER
           if (global_system_variables.log_warnings > 3)
           {
-            my_printf_error(net->last_errno,
-                            "Could not read packet: fd: %lld  state: %d  "
-                            "remain: %u  errno: %d  vio_errno: %d  "
-                            "length: %lld",
-                            MYF(ME_ERROR_LOG),
-                            (longlong) vio_fd(net->vio), (int) net->vio->state,
-                            remain, vio_errno(net->vio), net->last_errno,
-                            (longlong) length);
+            /* Log things as a warning */
+            sql_print_warning("Could not read packet: fd: %lld  state: %d  "
+                              "read_length: %u  errno: %d  vio_errno: %d  "
+                              "length: %lld",
+                              (longlong) vio_fd(net->vio),
+                              (int) net->vio->state,
+                              remain, vio_errno(net->vio), net->last_errno,
+                              (longlong) length);
           }
-          else
-            my_error(net->last_errno, MYF(0));
+          my_error(net->last_errno, MYF(0));
 #endif /* MYSQL_SERVER */
         goto end;
       }
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 5793b19f695..a32c0f67e1c 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -2296,10 +2296,10 @@ public:
   TRP_RANGE(SEL_ARG *key_arg, uint idx_arg, uint mrr_flags_arg)
    : key(key_arg), key_idx(idx_arg), mrr_flags(mrr_flags_arg)
   {}
-  virtual ~TRP_RANGE() = default;                     /* Remove gcc warning */
+  ~TRP_RANGE() override = default;                     /* Remove gcc warning */
 
   QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc)
+                             MEM_ROOT *parent_alloc) override
   {
     DBUG_ENTER("TRP_RANGE::make_quick");
     QUICK_RANGE_SELECT *quick;
@@ -2312,7 +2312,7 @@ public:
     DBUG_RETURN(quick);
   }
   void trace_basic_info(PARAM *param,
-                        Json_writer_object *trace_object) const;
+                        Json_writer_object *trace_object) const override;
 };
 
 void TRP_RANGE::trace_basic_info(PARAM *param,
@@ -2346,9 +2346,9 @@ class TRP_ROR_INTERSECT : public TABLE_READ_PLAN
 {
 public:
   TRP_ROR_INTERSECT() = default;                      /* Remove gcc warning */
-  virtual ~TRP_ROR_INTERSECT() = default;             /* Remove gcc warning */
+  ~TRP_ROR_INTERSECT() override = default;             /* Remove gcc warning */
   QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc);
+                             MEM_ROOT *parent_alloc) override;
 
   /* Array of pointers to ROR range scans used in this intersection */
   struct st_ror_scan_info **first_scan;
@@ -2358,7 +2358,7 @@ public:
   double index_scan_costs; /* SUM(cost(index_scan)) */
   double cmp_cost;         // Cost of out rows with WHERE clause
   void trace_basic_info(PARAM *param,
-                        Json_writer_object *trace_object) const;
+                        Json_writer_object *trace_object) const override;
 };
 
 
@@ -2373,13 +2373,13 @@ class TRP_ROR_UNION : public TABLE_READ_PLAN
 {
 public:
   TRP_ROR_UNION() = default;                          /* Remove gcc warning */
-  virtual ~TRP_ROR_UNION() = default;                 /* Remove gcc warning */
+  ~TRP_ROR_UNION() override = default;                 /* Remove gcc warning */
   QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc);
+                             MEM_ROOT *parent_alloc) override;
   TABLE_READ_PLAN **first_ror; /* array of ptrs to plans for merged scans */
   TABLE_READ_PLAN **last_ror;  /* end of the above array */
   void trace_basic_info(PARAM *param,
-                        Json_writer_object *trace_object) const;
+                        Json_writer_object *trace_object) const override;
 };
 
 void TRP_ROR_UNION::trace_basic_info(PARAM *param,
@@ -2406,15 +2406,15 @@ class TRP_INDEX_INTERSECT : public TABLE_READ_PLAN
 {
 public:
   TRP_INDEX_INTERSECT() = default;                     /* Remove gcc warning */
-  virtual ~TRP_INDEX_INTERSECT() = default;            /* Remove gcc warning */
+  ~TRP_INDEX_INTERSECT() override = default;            /* Remove gcc warning */
   QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc);
+                             MEM_ROOT *parent_alloc) override;
   TRP_RANGE **range_scans; /* array of ptrs to plans of intersected scans */
   TRP_RANGE **range_scans_end; /* end of the array */
   /* keys whose scans are to be filtered by cpk conditions */
   key_map filtered_scans;
   void trace_basic_info(PARAM *param,
-                        Json_writer_object *trace_object) const;
+                        Json_writer_object *trace_object) const override;
 
 };
 
@@ -2443,13 +2443,13 @@ class TRP_INDEX_MERGE : public TABLE_READ_PLAN
 {
 public:
   TRP_INDEX_MERGE() = default;                        /* Remove gcc warning */
-  virtual ~TRP_INDEX_MERGE() = default;               /* Remove gcc warning */
+  ~TRP_INDEX_MERGE() override = default;               /* Remove gcc warning */
   QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc);
+                             MEM_ROOT *parent_alloc) override;
   TRP_RANGE **range_scans; /* array of ptrs to plans of merged scans */
   TRP_RANGE **range_scans_end; /* end of the array */
   void trace_basic_info(PARAM *param,
-                        Json_writer_object *trace_object) const;
+                        Json_writer_object *trace_object) const override;
 };
 
 void TRP_INDEX_MERGE::trace_basic_info(PARAM *param,
@@ -2513,13 +2513,13 @@ public:
       if (key_infix_len)
         memcpy(this->key_infix, key_infix_arg, key_infix_len);
     }
-  virtual ~TRP_GROUP_MIN_MAX() = default;             /* Remove gcc warning */
+  ~TRP_GROUP_MIN_MAX() override = default;             /* Remove gcc warning */
 
   QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
-                             MEM_ROOT *parent_alloc);
+                             MEM_ROOT *parent_alloc) override;
   void use_index_scan() { is_index_scan= TRUE; }
   void trace_basic_info(PARAM *param,
-                        Json_writer_object *trace_object) const;
+                        Json_writer_object *trace_object) const override;
 };
 
 
@@ -2755,7 +2755,10 @@ SQL_SELECT::test_quick_select(THD *thd,
     only_single_index_range_scan= 1;
 
   if (head->force_index || force_quick_range)
+  {
+    DEBUG_SYNC(thd, "in_forced_range_optimize");
     read_time= DBL_MAX;
+  }
   else
   {
     read_time= file->cost(file->ha_scan_and_compare_time(records));
@@ -3183,6 +3186,12 @@ SQL_SELECT::test_quick_select(THD *thd,
     free_root(&alloc,MYF(0));			// Return memory & allocator
     thd->mem_root= param.old_root;
     thd->no_errors=0;
+    if (thd->killed || thd->is_error())
+    {
+      delete quick;
+      quick= NULL;
+      returnval= ERROR;
+    }
   }
 
   DBUG_EXECUTE("info", print_quick(quick, &needed_reg););
@@ -17080,6 +17089,7 @@ static
 void print_range(String *out, const KEY_PART_INFO *key_part,
                  KEY_MULTI_RANGE *range, uint n_key_parts)
 {
+  Check_level_instant_set check_field(current_thd, CHECK_FIELD_IGNORE);
   uint flag= range->range_flag;
   String key_name;
   key_name.set_charset(system_charset_info);
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 59a01e5bb8d..aa9dd72c60f 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -919,7 +919,6 @@ public:
   {
     return
       thd->killed ||
-      thd->is_fatal_error ||
       thd->is_error() ||
       alloced_sel_args > thd->variables.optimizer_max_sel_args;
   }
@@ -1352,28 +1351,28 @@ public:
     { return new QUICK_RANGE_SELECT(thd, head, index, no_alloc, parent_alloc,
                                     create_error); }
   
-  void need_sorted_output();
-  int init();
-  int reset(void);
-  int get_next();
-  void range_end();
+  void need_sorted_output() override;
+  int init() override;
+  int reset(void) override;
+  int get_next() override;
+  void range_end() override;
   int get_next_prefix(uint prefix_length, uint group_key_parts, 
                       uchar *cur_prefix);
-  bool reverse_sorted() { return 0; }
-  bool unique_key_range();
-  int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc);
-  void save_last_pos()
+  bool reverse_sorted() override { return 0; }
+  bool unique_key_range() override;
+  int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc) override;
+  void save_last_pos() override
   { file->position(record); }
-  int get_type() { return QS_TYPE_RANGE; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths);
-  Explain_quick_select *get_explain(MEM_ROOT *alloc);
+  int get_type() override { return QS_TYPE_RANGE; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  Explain_quick_select *get_explain(MEM_ROOT *alloc) override;
 #ifndef DBUG_OFF
-  void dbug_dump(int indent, bool verbose);
+  void dbug_dump(int indent, bool verbose) override;
 #endif
-  virtual void replace_handler(handler *new_file) { file= new_file; }
-  QUICK_SELECT_I *make_reverse(uint used_key_parts_arg);
+  void replace_handler(handler *new_file) override { file= new_file; }
+  QUICK_SELECT_I *make_reverse(uint used_key_parts_arg) override;
 
-  virtual void add_used_key_part_to_set();
+  void add_used_key_part_to_set() override;
 
 private:
   /* Default copy ctor used by QUICK_SELECT_DESC */
@@ -1421,13 +1420,13 @@ public:
     :QUICK_RANGE_SELECT(thd, table, index_arg, no_alloc, parent_alloc,
     create_err)
     {};
-  virtual QUICK_RANGE_SELECT *clone(bool *create_error)
+  QUICK_RANGE_SELECT *clone(bool *create_error) override
     {
       DBUG_ASSERT(0);
       return new QUICK_RANGE_SELECT_GEOM(thd, head, index, no_alloc,
                                          parent_alloc, create_error);
     }
-  virtual int get_next();
+  int get_next() override;
 };
 
 
@@ -1503,16 +1502,16 @@ public:
   QUICK_INDEX_SORT_SELECT(THD *thd, TABLE *table);
   ~QUICK_INDEX_SORT_SELECT();
 
-  int  init();
-  void need_sorted_output() { DBUG_ASSERT(0); /* Can't do it */ }
-  int  reset(void);
-  bool reverse_sorted() { return false; }
-  bool unique_key_range() { return false; }
-  bool is_keys_used(const MY_BITMAP *fields);
+  int  init() override;
+  void need_sorted_output() override { DBUG_ASSERT(0); /* Can't do it */ }
+  int  reset(void) override;
+  bool reverse_sorted() override { return false; }
+  bool unique_key_range() override { return false; }
+  bool is_keys_used(const MY_BITMAP *fields) override;
 #ifndef DBUG_OFF
-  void dbug_dump(int indent, bool verbose);
+  void dbug_dump(int indent, bool verbose) override;
 #endif
-  Explain_quick_select *get_explain(MEM_ROOT *alloc);
+  Explain_quick_select *get_explain(MEM_ROOT *alloc) override;
 
   bool push_quick_back(QUICK_RANGE_SELECT *quick_sel_range);
 
@@ -1524,7 +1523,7 @@ public:
 
   MEM_ROOT alloc;
   THD *thd;
-  virtual bool is_valid()
+  bool is_valid() override
   {
     List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects);
     QUICK_RANGE_SELECT *quick;
@@ -1543,7 +1542,7 @@ public:
   /* used to get rows collected in Unique */
   READ_RECORD read_record;
 
-  virtual void add_used_key_part_to_set();
+  void add_used_key_part_to_set() override;
 };
 
 
@@ -1554,31 +1553,31 @@ private:
   /* true if this select is currently doing a clustered PK scan */
   bool  doing_pk_scan;
 protected:
-  int read_keys_and_merge();
+  int read_keys_and_merge() override;
 
 public:
   QUICK_INDEX_MERGE_SELECT(THD *thd_arg, TABLE *table)
     :QUICK_INDEX_SORT_SELECT(thd_arg, table) {}
 
-  int get_next();
-  int get_type() { return QS_TYPE_INDEX_MERGE; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths);
+  int get_next() override;
+  int get_type() override { return QS_TYPE_INDEX_MERGE; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
 };
 
 class QUICK_INDEX_INTERSECT_SELECT : public QUICK_INDEX_SORT_SELECT
 {
 protected:
-  int read_keys_and_merge();
+  int read_keys_and_merge() override;
 
 public:
   QUICK_INDEX_INTERSECT_SELECT(THD *thd_arg, TABLE *table)
     :QUICK_INDEX_SORT_SELECT(thd_arg, table) {}
 
   key_map filtered_scans;
-  int get_next();
-  int get_type() { return QS_TYPE_INDEX_INTERSECT; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths);
-  Explain_quick_select *get_explain(MEM_ROOT *alloc);
+  int get_next() override;
+  int get_type() override { return QS_TYPE_INDEX_INTERSECT; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  Explain_quick_select *get_explain(MEM_ROOT *alloc) override;
 };
 
 
@@ -1608,21 +1607,21 @@ public:
                              MEM_ROOT *parent_alloc);
   ~QUICK_ROR_INTERSECT_SELECT();
 
-  int  init();
-  void need_sorted_output() { DBUG_ASSERT(0); /* Can't do it */ }
-  int  reset(void);
-  int  get_next();
-  bool reverse_sorted() { return false; }
-  bool unique_key_range() { return false; }
-  int get_type() { return QS_TYPE_ROR_INTERSECT; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths);
-  Explain_quick_select *get_explain(MEM_ROOT *alloc);
-  bool is_keys_used(const MY_BITMAP *fields);
-  void add_used_key_part_to_set();
+  int  init() override;
+  void need_sorted_output() override { DBUG_ASSERT(0); /* Can't do it */ }
+  int  reset(void) override;
+  int  get_next() override;
+  bool reverse_sorted() override { return false; }
+  bool unique_key_range() override { return false; }
+  int get_type() override { return QS_TYPE_ROR_INTERSECT; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  Explain_quick_select *get_explain(MEM_ROOT *alloc) override;
+  bool is_keys_used(const MY_BITMAP *fields) override;
+  void add_used_key_part_to_set() override;
 #ifndef DBUG_OFF
-  void dbug_dump(int indent, bool verbose);
+  void dbug_dump(int indent, bool verbose) override;
 #endif
-  int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc);
+  int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc) override;
   bool push_quick_back(MEM_ROOT *alloc, QUICK_RANGE_SELECT *quick_sel_range);
 
   class QUICK_SELECT_WITH_RECORD : public Sql_alloc
@@ -1639,7 +1638,7 @@ public:
   */
   List<QUICK_SELECT_WITH_RECORD> quick_selects;
 
-  virtual bool is_valid()
+  bool is_valid() override
   {
     List_iterator_fast<QUICK_SELECT_WITH_RECORD> it(quick_selects);
     QUICK_SELECT_WITH_RECORD *quick;
@@ -1688,26 +1687,26 @@ public:
   QUICK_ROR_UNION_SELECT(THD *thd, TABLE *table);
   ~QUICK_ROR_UNION_SELECT();
 
-  int  init();
-  void need_sorted_output() { DBUG_ASSERT(0); /* Can't do it */ }
-  int  reset(void);
-  int  get_next();
-  bool reverse_sorted() { return false; }
-  bool unique_key_range() { return false; }
-  int get_type() { return QS_TYPE_ROR_UNION; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths);
-  Explain_quick_select *get_explain(MEM_ROOT *alloc);
-  bool is_keys_used(const MY_BITMAP *fields);
-  void add_used_key_part_to_set();
+  int  init() override;
+  void need_sorted_output() override { DBUG_ASSERT(0); /* Can't do it */ }
+  int  reset(void) override;
+  int  get_next() override;
+  bool reverse_sorted() override { return false; }
+  bool unique_key_range() override { return false; }
+  int get_type() override { return QS_TYPE_ROR_UNION; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  Explain_quick_select *get_explain(MEM_ROOT *alloc) override;
+  bool is_keys_used(const MY_BITMAP *fields) override;
+  void add_used_key_part_to_set() override;
 #ifndef DBUG_OFF
-  void dbug_dump(int indent, bool verbose);
+  void dbug_dump(int indent, bool verbose) override;
 #endif
 
   bool push_quick_back(QUICK_SELECT_I *quick_sel_range);
 
   List<QUICK_SELECT_I> quick_selects; /* Merged quick selects */
 
-  virtual bool is_valid()
+  bool is_valid() override
   {
     List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
     QUICK_SELECT_I *quick;
@@ -1833,21 +1832,21 @@ public:
   void update_key_stat();
   void adjust_prefix_ranges();
   bool alloc_buffers();
-  int init();
-  void need_sorted_output() { /* always do it */ }
-  int reset();
-  int get_next();
-  bool reverse_sorted() { return false; }
-  bool unique_key_range() { return false; }
-  int get_type() { return QS_TYPE_GROUP_MIN_MAX; }
-  void add_keys_and_lengths(String *key_names, String *used_lengths);
-  void add_used_key_part_to_set();
+  int init() override;
+  void need_sorted_output() override { /* always do it */ }
+  int reset() override;
+  int get_next() override;
+  bool reverse_sorted() override { return false; }
+  bool unique_key_range() override { return false; }
+  int get_type() override { return QS_TYPE_GROUP_MIN_MAX; }
+  void add_keys_and_lengths(String *key_names, String *used_lengths) override;
+  void add_used_key_part_to_set() override;
 #ifndef DBUG_OFF
-  void dbug_dump(int indent, bool verbose);
+  void dbug_dump(int indent, bool verbose) override;
 #endif
   bool is_agg_distinct() { return have_agg_distinct; }
   bool loose_scan_is_scanning() { return is_index_scan; }
-  Explain_quick_select *get_explain(MEM_ROOT *alloc);
+  Explain_quick_select *get_explain(MEM_ROOT *alloc) override;
 };
 
 
@@ -1855,18 +1854,18 @@ class QUICK_SELECT_DESC: public QUICK_RANGE_SELECT
 {
 public:
   QUICK_SELECT_DESC(QUICK_RANGE_SELECT *q, uint used_key_parts);
-  virtual QUICK_RANGE_SELECT *clone(bool *create_error)
+  QUICK_RANGE_SELECT *clone(bool *create_error) override
     { DBUG_ASSERT(0); return new QUICK_SELECT_DESC(this, used_key_parts); }
-  int get_next();
-  bool reverse_sorted() { return 1; }
-  int get_type() { return QS_TYPE_RANGE_DESC; }
-  QUICK_SELECT_I *make_reverse(uint used_key_parts_arg)
+  int get_next() override;
+  bool reverse_sorted() override { return 1; }
+  int get_type() override { return QS_TYPE_RANGE_DESC; }
+  QUICK_SELECT_I *make_reverse(uint used_key_parts_arg) override
   {
     return this; // is already reverse sorted
   }
 private:
   bool range_reads_after_key(QUICK_RANGE *range);
-  int reset(void) { rev_it.rewind(); return QUICK_RANGE_SELECT::reset(); }
+  int reset(void) override { rev_it.rewind(); return QUICK_RANGE_SELECT::reset(); }
   List<QUICK_RANGE> rev_ranges;
   List_iterator<QUICK_RANGE> rev_it;
   uint used_key_parts;
@@ -1988,12 +1987,12 @@ public:
       QUICK_RANGE_SELECT (thd, table, key, 1, NULL, create_err) 
   { (void) init(); }
   ~FT_SELECT() { file->ft_end(); }
-  virtual QUICK_RANGE_SELECT *clone(bool *create_error)
+  QUICK_RANGE_SELECT *clone(bool *create_error) override
     { DBUG_ASSERT(0); return new FT_SELECT(thd, head, index, create_error); }
-  int init() { return file->ft_init(); }
-  int reset() { return 0; }
-  int get_next() { return file->ha_ft_read(record); }
-  int get_type() { return QS_TYPE_FULLTEXT; }
+  int init() override { return file->ft_init(); }
+  int reset() override { return 0; }
+  int get_next() override { return file->ha_ft_read(record); }
+  int get_type() override { return QS_TYPE_FULLTEXT; }
 };
 
 FT_SELECT *get_ft_select(THD *thd, TABLE *table, uint key);
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index 33ef4e2a2d2..dc9d2bea403 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -6039,7 +6039,7 @@ public:
   select_value_catcher(THD *thd_arg, Item_subselect *item_arg):
     select_subselect(thd_arg, item_arg)
   {}
-  int send_data(List<Item> &items);
+  int send_data(List<Item> &items) override;
   int setup(List<Item> *items);
   bool assigned;  /* TRUE <=> we've caught a value */
   uint n_elements; /* How many elements we get */
diff --git a/sql/opt_table_elimination.cc b/sql/opt_table_elimination.cc
index ae73eb75a1c..941512621ba 100644
--- a/sql/opt_table_elimination.cc
+++ b/sql/opt_table_elimination.cc
@@ -257,9 +257,9 @@ public:
   Field *field; /* Field this object is representing */
   
   /* Iteration over unbound modules that are our dependencies */
-  Iterator init_unbound_modules_iter(char *buf);
+  Iterator init_unbound_modules_iter(char *buf) override;
   Dep_module* get_next_unbound_module(Dep_analysis_context *dac, 
-                                      Iterator iter);
+                                      Iterator iter) override;
   
   void make_unbound_modules_iter_skip_keys(Iterator iter);
   
@@ -326,9 +326,9 @@ public:
   Dep_module_pseudo_key *pseudo_key;
 
   /* Iteration over unbound modules that are our dependencies */
-  Iterator init_unbound_modules_iter(char *buf);
+  Iterator init_unbound_modules_iter(char *buf) override;
   Dep_module* get_next_unbound_module(Dep_analysis_context *dac, 
-                                      Iterator iter);
+                                      Iterator iter) override;
   static const size_t iterator_size;
 private:
   class Module_iter
@@ -410,8 +410,8 @@ public:
   /* Used during condition analysis only, similar to KEYUSE::level */
   uint level;
 
-  Iterator init_unbound_values_iter(char *buf);
-  Dep_value* get_next_unbound_value(Dep_analysis_context *dac, Iterator iter);
+  Iterator init_unbound_values_iter(char *buf) override;
+  Dep_value* get_next_unbound_value(Dep_analysis_context *dac, Iterator iter) override;
   static const size_t iterator_size;
 private:
   class Value_iter
@@ -445,8 +445,8 @@ public:
   /* Unique keys form a linked list, ordered by keyno */
   Dep_module_key *next_table_key;
   
-  Iterator init_unbound_values_iter(char *buf);
-  Dep_value* get_next_unbound_value(Dep_analysis_context *dac, Iterator iter);
+  Iterator init_unbound_values_iter(char *buf) override;
+  Dep_value* get_next_unbound_value(Dep_analysis_context *dac, Iterator iter) override;
   static const size_t iterator_size;
 private:
   class Value_iter
@@ -529,18 +529,18 @@ public:
   {
     unbound_args= n_children;
   }
-  bool is_final() { return TRUE; }
+  bool is_final() override { return TRUE; }
   /* 
     This is the goal module, so the running wave algorithm should terminate
     once it sees that this module is applicable and should never try to apply
     it, hence no use for unbound value iterator implementation.
   */
-  Iterator init_unbound_values_iter(char *buf)
+  Iterator init_unbound_values_iter(char *buf) override
   { 
     DBUG_ASSERT(0); 
     return NULL;
   }
-  Dep_value* get_next_unbound_value(Dep_analysis_context *dac, Iterator iter)
+  Dep_value* get_next_unbound_value(Dep_analysis_context *dac, Iterator iter) override
   {
     DBUG_ASSERT(0); 
     return NULL;
@@ -1057,7 +1057,7 @@ public:
   Field_dependency_recorder(Dep_analysis_context *ctx_arg): ctx(ctx_arg)
   {}
   
-  void visit_field(Item_field *item)
+  void visit_field(Item_field *item) override
   {
     Field *field= item->field;
     Dep_value_table *tbl_dep;
diff --git a/sql/parse_file.h b/sql/parse_file.h
index 0589d628bfc..00132cb77a8 100644
--- a/sql/parse_file.h
+++ b/sql/parse_file.h
@@ -68,8 +68,8 @@ class File_parser_dummy_hook: public Unknown_key_hook
 {
 public:
   File_parser_dummy_hook() = default;                 /* Remove gcc warning */
-  virtual bool process_unknown_string(const char *&unknown_key, uchar* base,
-                                      MEM_ROOT *mem_root, const char *end);
+  bool process_unknown_string(const char *&unknown_key, uchar* base,
+                              MEM_ROOT *mem_root, const char *end) override;
 };
 
 extern File_parser_dummy_hook file_parser_dummy_hook;
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index d0285b54928..baff06d60ee 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -159,7 +159,7 @@ int THD::register_slave(uchar *packet, size_t packet_length)
   return 0;
 
 err:
-  delete si;
+  my_free(si);
   my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0)); /* purecov: inspected */
   return 1;
 }
diff --git a/sql/rpl_gtid.h b/sql/rpl_gtid.h
index 8b697c79515..d5af90e029d 100644
--- a/sql/rpl_gtid.h
+++ b/sql/rpl_gtid.h
@@ -608,9 +608,9 @@ class Accept_all_gtid_filter : public Gtid_event_filter
 public:
   Accept_all_gtid_filter() {}
   ~Accept_all_gtid_filter() {}
-  my_bool exclude(rpl_gtid *gtid) { return FALSE; }
-  uint32 get_filter_type() { return ACCEPT_ALL_GTID_FILTER_TYPE; }
-  my_bool has_finished() { return FALSE; }
+  my_bool exclude(rpl_gtid *) override { return FALSE; }
+  uint32 get_filter_type() override { return ACCEPT_ALL_GTID_FILTER_TYPE; }
+  my_bool has_finished() override { return FALSE; }
 };
 
 /*
@@ -621,9 +621,9 @@ class Reject_all_gtid_filter : public Gtid_event_filter
 public:
   Reject_all_gtid_filter() {}
   ~Reject_all_gtid_filter() {}
-  my_bool exclude(rpl_gtid *gtid) { return TRUE; }
-  uint32 get_filter_type() { return REJECT_ALL_GTID_FILTER_TYPE; }
-  my_bool has_finished() { return FALSE; }
+  my_bool exclude(rpl_gtid *) override { return TRUE; }
+  uint32 get_filter_type() override { return REJECT_ALL_GTID_FILTER_TYPE; }
+  my_bool has_finished() override { return FALSE; }
 };
 
 /*
@@ -641,8 +641,8 @@ public:
   Window_gtid_event_filter();
   ~Window_gtid_event_filter() {}
 
-  my_bool exclude(rpl_gtid*);
-  my_bool has_finished();
+  my_bool exclude(rpl_gtid*) override;
+  my_bool has_finished() override;
 
   /*
     Set the GTID that begins this window (exclusive)
@@ -658,7 +658,7 @@ public:
   */
   int set_stop_gtid(rpl_gtid *stop);
 
-  uint32 get_filter_type() { return WINDOW_GTID_FILTER_TYPE; }
+  uint32 get_filter_type() override { return WINDOW_GTID_FILTER_TYPE; }
 
   /*
     Validates the underlying range is correct, and writes an error if not, i.e.
@@ -761,11 +761,11 @@ public:
   Id_delegating_gtid_event_filter();
   ~Id_delegating_gtid_event_filter();
 
-  my_bool exclude(rpl_gtid *gtid);
-  my_bool has_finished();
+  my_bool exclude(rpl_gtid *gtid) override;
+  my_bool has_finished() override;
   void set_default_filter(Gtid_event_filter *default_filter);
 
-  uint32 get_filter_type() { return DELEGATING_GTID_FILTER_TYPE; }
+  uint32 get_filter_type() override { return DELEGATING_GTID_FILTER_TYPE; }
 
   virtual T get_id_from_gtid(rpl_gtid *) = 0;
   virtual const char* get_id_type_name() = 0;
@@ -834,18 +834,18 @@ public:
   /*
     Returns the domain id of from the input GTID
   */
-  decltype(rpl_gtid::domain_id) get_id_from_gtid(rpl_gtid *gtid)
+  decltype(rpl_gtid::domain_id) get_id_from_gtid(rpl_gtid *gtid) override
   {
     return gtid->domain_id;
   }
 
-  const char* get_id_type_name() { return "domain"; }
+  const char* get_id_type_name() override { return "domain"; }
 
   /*
     Override Id_delegating_gtid_event_filter to extend with domain specific
     filtering logic
   */
-  my_bool exclude(rpl_gtid*);
+  my_bool exclude(rpl_gtid*) override;
 
   /*
     Validates that window filters with both a start and stop GTID satisfy
@@ -912,12 +912,12 @@ public:
   /*
     Returns the server id of from the input GTID
   */
-  decltype(rpl_gtid::server_id) get_id_from_gtid(rpl_gtid *gtid)
+  decltype(rpl_gtid::server_id) get_id_from_gtid(rpl_gtid *gtid) override
   {
     return gtid->server_id;
   }
 
-  const char* get_id_type_name() { return "server"; }
+  const char* get_id_type_name() override { return "server"; }
 };
 
 /*
@@ -935,16 +935,16 @@ public:
     Returns TRUE if any filers exclude the gtid, returns FALSE otherwise, i.e.
     all filters must allow the GTID.
   */
-  my_bool exclude(rpl_gtid *gtid);
+  my_bool exclude(rpl_gtid *gtid) override;
 
   /*
     Returns true if any filters have finished. To elaborate, as this filter
     performs an intersection, if any filter has finished, the result would
     be excluded regardless.
   */
-  my_bool has_finished();
+  my_bool has_finished() override;
 
-  uint32 get_filter_type() { return INTERSECTING_GTID_FILTER_TYPE; }
+  uint32 get_filter_type() override { return INTERSECTING_GTID_FILTER_TYPE; }
 
   /*
     Adds a new filter to the intersection
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc
index 4f28f1f8edf..45c3a187326 100644
--- a/sql/rpl_mi.cc
+++ b/sql/rpl_mi.cc
@@ -502,7 +502,7 @@ file '%s')", fname);
     if (init_intvar_from_file(&master_log_pos, &mi->file, 4) ||
         init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file, 0) ||
         init_strvar_from_file(mi->user, sizeof(mi->user), &mi->file, "test") ||
-        init_strvar_from_file(mi->password, SCRAMBLED_PASSWORD_CHAR_LENGTH+1,
+        init_strvar_from_file(mi->password, sizeof(mi->password),
                               &mi->file, 0) ||
         init_intvar_from_file(&port, &mi->file, MYSQL_PORT) ||
         init_intvar_from_file(&connect_retry, &mi->file,
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc
index 6ec550e30a5..8cec2fb34dc 100644
--- a/sql/semisync_master.cc
+++ b/sql/semisync_master.cc
@@ -571,6 +571,7 @@ void Repl_semi_sync_master::add_slave()
 void Repl_semi_sync_master::remove_slave()
 {
   lock();
+  DBUG_ASSERT(rpl_semi_sync_master_clients > 0);
   if (!(--rpl_semi_sync_master_clients) && !rpl_semi_sync_master_wait_no_slave)
   {
     /*
diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc
index f8c6ddaa28b..22ae84aa353 100644
--- a/sql/service_wsrep.cc
+++ b/sql/service_wsrep.cc
@@ -249,18 +249,23 @@ extern "C" my_bool wsrep_thd_skip_locking(const THD *thd)
 
 extern "C" my_bool wsrep_thd_order_before(const THD *left, const THD *right)
 {
-  if (wsrep_thd_is_BF(left, false) &&
-      wsrep_thd_is_BF(right, false) &&
-      wsrep_thd_trx_seqno(left) < wsrep_thd_trx_seqno(right)) {
-    WSREP_DEBUG("BF conflict, order: %lld %lld\n",
-                (long long)wsrep_thd_trx_seqno(left),
-                (long long)wsrep_thd_trx_seqno(right));
-    return TRUE;
-  }
-  WSREP_DEBUG("waiting for BF, trx order: %lld %lld\n",
-              (long long)wsrep_thd_trx_seqno(left),
-              (long long)wsrep_thd_trx_seqno(right));
-  return FALSE;
+  my_bool before= (wsrep_thd_is_BF(left, false) &&
+                   wsrep_thd_is_BF(right, false) &&
+                   wsrep_thd_trx_seqno(left) < wsrep_thd_trx_seqno(right));
+
+  WSREP_DEBUG("wsrep_thd_order_before: %s thread=%llu seqno=%llu query=%s "
+              "%s %s thread=%llu, seqno=%llu query=%s",
+              (wsrep_thd_is_BF(left, false) ? "BF" : "def"),
+              thd_get_thread_id(left),
+              wsrep_thd_trx_seqno(left),
+              wsrep_thd_query(left),
+              (before ? " TRUE " : " FALSE "),
+              (wsrep_thd_is_BF(right, false) ? "BF" : "def"),
+              thd_get_thread_id(right),
+              wsrep_thd_trx_seqno(right),
+              wsrep_thd_query(right));
+
+  return before;
 }
 
 /** Check if wsrep transaction is aborting state.
diff --git a/sql/session_tracker.h b/sql/session_tracker.h
index 30326025974..ee6bf32cc68 100644
--- a/sql/session_tracker.h
+++ b/sql/session_tracker.h
@@ -206,9 +206,9 @@ class Session_sysvars_tracker: public State_tracker
 public:
   void init(THD *thd);
   void deinit(THD *thd);
-  bool enable(THD *thd);
-  bool update(THD *thd, set_var *var);
-  bool store(THD *thd, String *buf);
+  bool enable(THD *thd) override;
+  bool update(THD *thd, set_var *var) override;
+  bool store(THD *thd, String *buf) override;
   void mark_as_changed(THD *thd, const sys_var *var);
   void mark_all_as_changed(THD *thd);
   void deinit() { orig_list.deinit(); }
@@ -234,8 +234,8 @@ bool sysvartrack_global_update(THD *thd, char *str, size_t len);
 class Current_schema_tracker: public State_tracker
 {
 public:
-  bool update(THD *thd, set_var *var);
-  bool store(THD *thd, String *buf);
+  bool update(THD *thd, set_var *var) override;
+  bool store(THD *thd, String *buf) override;
 };
 
 
@@ -256,8 +256,8 @@ public:
 class Session_state_change_tracker: public State_tracker
 {
 public:
-  bool update(THD *thd, set_var *var);
-  bool store(THD *thd, String *buf);
+  bool update(THD *thd, set_var *var) override;
+  bool store(THD *thd, String *buf) override;
 };
 
 
@@ -326,7 +326,7 @@ class Transaction_state_tracker : public State_tracker
   enum_tx_state calc_trx_state(THD *thd, thr_lock_type l, bool has_trx);
 public:
 
-  bool enable(THD *thd)
+  bool enable(THD *thd) override
   {
     m_enabled= false;
     tx_changed= TX_CHG_NONE;
@@ -337,8 +337,8 @@ public:
     return State_tracker::enable(thd);
   }
 
-  bool update(THD *thd, set_var *var);
-  bool store(THD *thd, String *buf);
+  bool update(THD *thd, set_var *var) override;
+  bool store(THD *thd, String *buf) override;
 
   /** Change transaction characteristics */
   void set_read_flags(THD *thd, enum enum_tx_read_flags flags);
diff --git a/sql/set_var.h b/sql/set_var.h
index 562ee295be3..14383411f7e 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -327,11 +327,11 @@ public:
 
   set_var(THD *thd, enum_var_type type_arg, sys_var *var_arg,
           const LEX_CSTRING *base_name_arg, Item *value_arg);
-  virtual bool is_system() { return 1; }
-  int check(THD *thd);
-  int update(THD *thd);
-  int light_check(THD *thd);
-  virtual bool is_var_optimizer_trace() const
+  bool is_system() override { return 1; }
+  int check(THD *thd) override;
+  int update(THD *thd) override;
+  int light_check(THD *thd) override;
+  bool is_var_optimizer_trace() const override
   {
     extern sys_var *Sys_optimizer_trace_ptr;
     return var == Sys_optimizer_trace_ptr;
@@ -347,9 +347,9 @@ public:
   set_var_user(Item_func_set_user_var *item)
     :user_var_item(item)
   {}
-  int check(THD *thd);
-  int update(THD *thd);
-  int light_check(THD *thd);
+  int check(THD *thd) override;
+  int update(THD *thd) override;
+  int light_check(THD *thd) override;
 };
 
 /* For SET PASSWORD */
@@ -360,8 +360,8 @@ class set_var_password: public set_var_base
 public:
   set_var_password(LEX_USER *user_arg) :user(user_arg)
   {}
-  int check(THD *thd);
-  int update(THD *thd);
+  int check(THD *thd) override;
+  int update(THD *thd) override;
 };
 
 /* For SET ROLE */
@@ -372,8 +372,8 @@ class set_var_role: public set_var_base
   privilege_t access;
 public:
   set_var_role(LEX_CSTRING role_arg) : role(role_arg), access(NO_ACL) {}
-  int check(THD *thd);
-  int update(THD *thd);
+  int check(THD *thd) override;
+  int update(THD *thd) override;
 };
 
 /* For SET DEFAULT ROLE */
@@ -386,8 +386,8 @@ class set_var_default_role: public set_var_base
 public:
   set_var_default_role(LEX_USER *user_arg, LEX_CSTRING role_arg) :
     user(user_arg), role(role_arg) {}
-  int check(THD *thd);
-  int update(THD *thd);
+  int check(THD *thd) override;
+  int update(THD *thd) override;
 };
 
 /* For SET NAMES and SET CHARACTER SET */
@@ -405,8 +405,8 @@ public:
      character_set_results(result_coll_arg),
      collation_connection(connection_coll_arg)
   {}
-  int check(THD *thd);
-  int update(THD *thd);
+  int check(THD *thd) override;
+  int update(THD *thd) override;
 };
 
 
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 932788160d8..b937b0614cc 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -12086,10 +12086,10 @@ ER_BACKUP_UNKNOWN_STAGE
         spa "Fase de respaldo desconocida: '%s'. La fase debería de ser una de START, FLUSH, BLOCK_DDL, BLOCK_COMMIT o END"
         sw "Hatua ya kuhifadhi nakala isiyojulikana: '%s'. Hatua inapaswa kuwa moja ya START, FLUSH, BLOCK_DDL, BLOCK_COMMIT au END"
 ER_USER_IS_BLOCKED
-        chi "由于凭证错误太多，用户被阻止;用'FLUSH PRIVILEGES'解锁"
-        eng "User is blocked because of too many credential errors; unblock with 'FLUSH PRIVILEGES'"
-        spa "El usuario está bloqueado a causa de demasiados errores de credenciales; desbloquee mediante 'FLUSH PRIVILEGES'"
-        sw "Mtumiaji amezuiwa kwa sababu ya hitilafu nyingi za kitambulisho; ondoa kizuizi kwa 'FLUSH PRIVILEGES'"
+        chi "由于凭证错误太多，用户被阻止;用'ALTER USER / FLUSH PRIVILEGES'解锁"
+        eng "User is blocked because of too many credential errors; unblock with 'ALTER USER / FLUSH PRIVILEGES'"
+        spa "El usuario está bloqueado a causa de demasiados errores de credenciales; desbloquee mediante 'ALTER USER / FLUSH PRIVILEGES'"
+        sw "Mtumiaji amezuiwa kwa sababu ya hitilafu nyingi za kitambulisho; ondoa kizuizi kwa 'ALTER USER / FLUSH PRIVILEGES'"
 ER_ACCOUNT_HAS_BEEN_LOCKED
         chi "访问拒绝，此帐户已锁定"
         eng "Access denied, this account is locked"
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
index 534a9a1cfbf..656b72b933b 100644
--- a/sql/signal_handler.cc
+++ b/sql/signal_handler.cc
@@ -149,6 +149,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
     goto end;
   }
   segfaulted = 1;
+  abort_loop= 1;                                // Disable now connections
   DBUG_PRINT("error", ("handling fatal signal"));
 
   curr_time= my_time(0);
diff --git a/sql/sp.cc b/sql/sp.cc
index 4d9051448ce..be7649eca6a 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -255,7 +255,7 @@ public:
   load_from_db(THD *thd, const Database_qualified_name *name, TABLE *proc_tbl);
 
 public:
-  virtual Stored_program_creation_ctx *clone(MEM_ROOT *mem_root)
+  Stored_program_creation_ctx *clone(MEM_ROOT *mem_root) override
   {
     return new (mem_root) Stored_routine_creation_ctx(m_client_cs,
                                                       m_connection_cl,
@@ -263,7 +263,7 @@ public:
   }
 
 protected:
-  virtual Object_creation_ctx *create_backup_ctx(THD *thd) const
+  Object_creation_ctx *create_backup_ctx(THD *thd) const override
   {
     DBUG_ENTER("Stored_routine_creation_ctx::create_backup_ctx");
     DBUG_RETURN(new Stored_routine_creation_ctx(thd));
@@ -431,7 +431,7 @@ public:
   Proc_table_intact() : m_print_once(TRUE) { has_keys= TRUE; }
 
 protected:
-  void report_error(uint code, const char *fmt, ...);
+  void report_error(uint code, const char *fmt, ...) override;
 };
 
 
@@ -922,12 +922,12 @@ public:
     :m_error_caught(false)
   {}
 
-  virtual bool handle_condition(THD *thd,
+  bool handle_condition(THD *thd,
                                 uint sql_errno,
                                 const char* sqlstate,
                                 Sql_condition::enum_warning_level *level,
                                 const char* message,
-                                Sql_condition ** cond_hdl);
+                                Sql_condition ** cond_hdl) override;
 
   bool error_caught() const { return m_error_caught; }
 
@@ -1736,7 +1736,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl)
+                        Sql_condition ** cond_hdl) override
   {
     if (sql_errno == ER_NO_SUCH_TABLE ||
         sql_errno == ER_NO_SUCH_TABLE_IN_ENGINE ||
diff --git a/sql/sp.h b/sql/sp.h
index d9fdeb26c49..d8f257f3542 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -246,35 +246,41 @@ public:
 class Sp_handler_procedure: public Sp_handler
 {
 public:
-  enum_sp_type type() const { return SP_TYPE_PROCEDURE; }
-  LEX_CSTRING type_lex_cstring() const
+  enum_sp_type type() const override { return SP_TYPE_PROCEDURE; }
+  LEX_CSTRING type_lex_cstring() const override
   {
     static LEX_CSTRING m_type_str= { STRING_WITH_LEN("PROCEDURE")};
     return m_type_str;
   }
-  enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_PROCEDURE; }
-  enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_PROCEDURE; }
-  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const;
-  const char *show_create_routine_col1_caption() const
+  enum_sql_command sqlcom_create() const override
+  {
+    return SQLCOM_CREATE_PROCEDURE;
+  }
+  enum_sql_command sqlcom_drop() const override
+  {
+    return SQLCOM_DROP_PROCEDURE;
+  }
+  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const override;
+  const char *show_create_routine_col1_caption() const override
   {
     return "Procedure";
   }
-  const char *show_create_routine_col3_caption() const
+  const char *show_create_routine_col3_caption() const override
   {
     return "Create Procedure";
   }
-  MDL_key::enum_mdl_namespace get_mdl_type() const
+  MDL_key::enum_mdl_namespace get_mdl_type() const override
   {
     return MDL_key::PROCEDURE;
   }
-  const Sp_handler *package_routine_handler() const;
-  sp_cache **get_cache(THD *) const;
+  const Sp_handler *package_routine_handler() const override;
+  sp_cache **get_cache(THD *) const override;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  HASH *get_priv_hash() const;
+  HASH *get_priv_hash() const override;
 #endif
-  ulong recursion_depth(THD *thd) const;
-  void recursion_level_error(THD *thd, const sp_head *sp) const;
-  bool add_instr_preturn(THD *thd, sp_head *sp, sp_pcontext *spcont) const;
+  ulong recursion_depth(THD *thd) const override;
+  void recursion_level_error(THD *thd, const sp_head *sp) const override;
+  bool add_instr_preturn(THD *thd, sp_head *sp, sp_pcontext *spcont) const override;
 };
 
 
@@ -282,13 +288,13 @@ class Sp_handler_package_procedure: public Sp_handler_procedure
 {
 public:
   int sp_cache_routine(THD *thd, const Database_qualified_name *name,
-                       sp_head **sp) const
+                       sp_head **sp) const override
   {
     return sp_cache_package_routine(thd, name, sp);
   }
   sp_head *sp_find_routine(THD *thd,
                            const Database_qualified_name *name,
-                           bool cache_only) const
+                           bool cache_only) const override
   {
     return sp_find_package_routine(thd, name, cache_only);
   }
@@ -298,34 +304,40 @@ public:
 class Sp_handler_function: public Sp_handler
 {
 public:
-  enum_sp_type type() const { return SP_TYPE_FUNCTION; }
-  LEX_CSTRING type_lex_cstring() const
+  enum_sp_type type() const override { return SP_TYPE_FUNCTION; }
+  LEX_CSTRING type_lex_cstring() const override
   {
     static LEX_CSTRING m_type_str= { STRING_WITH_LEN("FUNCTION")};
     return m_type_str;
   }
-  enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_FUNCTION; }
-  enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_FUNCTION; }
-  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const;
-  const char *show_create_routine_col1_caption() const
+  enum_sql_command sqlcom_create() const override
+  {
+    return SQLCOM_CREATE_FUNCTION;
+  }
+  enum_sql_command sqlcom_drop() const override
+  {
+    return SQLCOM_DROP_FUNCTION;
+  }
+  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const override;
+  const char *show_create_routine_col1_caption() const override
   {
     return "Function";
   }
-  const char *show_create_routine_col3_caption() const
+  const char *show_create_routine_col3_caption() const override
   {
     return "Create Function";
   }
-  MDL_key::enum_mdl_namespace get_mdl_type() const
+  MDL_key::enum_mdl_namespace get_mdl_type() const override
   {
     return MDL_key::FUNCTION;
   }
-  const Sp_handler *package_routine_handler() const;
-  sp_cache **get_cache(THD *) const;
+  const Sp_handler *package_routine_handler() const override;
+  sp_cache **get_cache(THD *) const override;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  HASH *get_priv_hash() const;
+  HASH *get_priv_hash() const override;
 #endif
   bool add_instr_freturn(THD *thd, sp_head *sp, sp_pcontext *spcont,
-                         Item *item, sp_expr_lex *lex) const;
+                         Item *item, sp_expr_lex *lex) const override;
 };
 
 
@@ -333,13 +345,13 @@ class Sp_handler_package_function: public Sp_handler_function
 {
 public:
   int sp_cache_routine(THD *thd, const Database_qualified_name *name,
-                       sp_head **sp) const
+                       sp_head **sp) const override
   {
     return sp_cache_package_routine(thd, name, sp);
   }
   sp_head *sp_find_routine(THD *thd,
                            const Database_qualified_name *name,
-                           bool cache_only) const
+                           bool cache_only) const override
   {
     return sp_find_package_routine(thd, name, cache_only);
   }
@@ -358,7 +370,7 @@ public:
                       const st_sp_chistics &chistics,
                       const AUTHID &definer,
                       const DDL_options_st ddl_options,
-                      sql_mode_t sql_mode) const;
+                      sql_mode_t sql_mode) const override;
 };
 
 
@@ -367,36 +379,42 @@ class Sp_handler_package_spec: public Sp_handler_package
 public: // TODO: make it private or protected
   int sp_find_and_drop_routine(THD *thd, TABLE *table,
                                const Database_qualified_name *name)
-                               const;
+                               const override;
 public:
-  enum_sp_type type() const { return SP_TYPE_PACKAGE; }
-  LEX_CSTRING type_lex_cstring() const
+  enum_sp_type type() const override { return SP_TYPE_PACKAGE; }
+  LEX_CSTRING type_lex_cstring() const override
   {
     static LEX_CSTRING m_type_str= {STRING_WITH_LEN("PACKAGE")};
     return m_type_str;
   }
-  enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_PACKAGE; }
-  enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_PACKAGE; }
-  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const
+  enum_sql_command sqlcom_create() const override
+  {
+    return SQLCOM_CREATE_PACKAGE;
+  }
+  enum_sql_command sqlcom_drop() const override
+  {
+    return SQLCOM_DROP_PACKAGE;
+  }
+  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const override
   {
     static LEX_CSTRING m_empty_body= {STRING_WITH_LEN("BEGIN END")};
     return m_empty_body;
   }
-  const char *show_create_routine_col1_caption() const
+  const char *show_create_routine_col1_caption() const override
   {
     return "Package";
   }
-  const char *show_create_routine_col3_caption() const
+  const char *show_create_routine_col3_caption() const override
   {
     return "Create Package";
   }
-  MDL_key::enum_mdl_namespace get_mdl_type() const
+  MDL_key::enum_mdl_namespace get_mdl_type() const override
   {
     return MDL_key::PACKAGE_BODY;
   }
-  sp_cache **get_cache(THD *) const;
+  sp_cache **get_cache(THD *) const override;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  HASH *get_priv_hash() const;
+  HASH *get_priv_hash() const override;
 #endif
 };
 
@@ -404,34 +422,40 @@ public:
 class Sp_handler_package_body: public Sp_handler_package
 {
 public:
-  enum_sp_type type() const { return SP_TYPE_PACKAGE_BODY; }
-  LEX_CSTRING type_lex_cstring() const
+  enum_sp_type type() const override { return SP_TYPE_PACKAGE_BODY; }
+  LEX_CSTRING type_lex_cstring() const override
   {
     static LEX_CSTRING m_type_str= {STRING_WITH_LEN("PACKAGE BODY")};
     return m_type_str;
   }
-  enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_PACKAGE_BODY; }
-  enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_PACKAGE_BODY; }
-  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const
+  enum_sql_command sqlcom_create() const override
+  {
+    return SQLCOM_CREATE_PACKAGE_BODY;
+  }
+  enum_sql_command sqlcom_drop() const override
+  {
+    return SQLCOM_DROP_PACKAGE_BODY;
+  }
+  LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const override
   {
     static LEX_CSTRING m_empty_body= {STRING_WITH_LEN("BEGIN END")};
     return m_empty_body;
   }
-  const char *show_create_routine_col1_caption() const
+  const char *show_create_routine_col1_caption() const override
   {
     return "Package body";
   }
-  const char *show_create_routine_col3_caption() const
+  const char *show_create_routine_col3_caption() const override
   {
     return "Create Package Body";
   }
-  MDL_key::enum_mdl_namespace get_mdl_type() const
+  MDL_key::enum_mdl_namespace get_mdl_type() const override
   {
     return MDL_key::PACKAGE_BODY;
   }
-  sp_cache **get_cache(THD *) const;
+  sp_cache **get_cache(THD *) const override;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  HASH *get_priv_hash() const;
+  HASH *get_priv_hash() const override;
 #endif
 };
 
@@ -439,20 +463,26 @@ public:
 class Sp_handler_trigger: public Sp_handler
 {
 public:
-  enum_sp_type type() const { return SP_TYPE_TRIGGER; }
-  LEX_CSTRING type_lex_cstring() const
+  enum_sp_type type() const override { return SP_TYPE_TRIGGER; }
+  LEX_CSTRING type_lex_cstring() const override
   {
     static LEX_CSTRING m_type_str= { STRING_WITH_LEN("TRIGGER")};
     return m_type_str;
   }
-  enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_TRIGGER; }
-  enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_TRIGGER; }
-  MDL_key::enum_mdl_namespace get_mdl_type() const
+  enum_sql_command sqlcom_create() const override
+  {
+    return SQLCOM_CREATE_TRIGGER;
+  }
+  enum_sql_command sqlcom_drop() const override
+  {
+    return SQLCOM_DROP_TRIGGER;
+  }
+  MDL_key::enum_mdl_namespace get_mdl_type() const override
   {
     DBUG_ASSERT(0);
     return MDL_key::TRIGGER;
   }
-  const Sp_handler *sp_handler_mysql_proc() const { return NULL; }
+  const Sp_handler *sp_handler_mysql_proc() const override { return NULL; }
 };
 
 
diff --git a/sql/sp_head.h b/sql/sp_head.h
index 2b663f406d2..c91bedc3581 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -87,7 +87,7 @@ protected:
   { }
 
 protected:
-  virtual void change_env(THD *thd) const
+  void change_env(THD *thd) const override
   {
     thd->variables.collation_database= m_db_cl;
 
@@ -1099,9 +1099,9 @@ public:
     return m_routine_implementations.check_dup_qualified(lex->sphead) ||
            m_routine_implementations.push_back(lex, &main_mem_root);
   }
-  sp_package *get_package() { return this; }
-  void init_psi_share();
-  bool is_invoked() const
+  sp_package *get_package() override { return this; }
+  void init_psi_share() override;
+  bool is_invoked() const override
   {
     /*
       Cannot flush a package out of the SP cache when:
diff --git a/sql/spatial.h b/sql/spatial.h
index d85bdc86af4..d775e14aea4 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -397,14 +397,14 @@ class Gis_point: public Geometry
 public:
   Gis_point() = default;                              /* Remove gcc warning */
   virtual ~Gis_point() = default;                     /* Remove gcc warning */
-  uint32 get_data_size() const;
-  bool init_from_wkt(Gis_read_stream *trs, String *wkb);
-  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
-  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb);
-  bool get_data_as_wkt(String *txt, const char **end) const;
+  uint32 get_data_size() const override;
+  bool init_from_wkt(Gis_read_stream *trs, String *wkb) override;
+  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res) override;
+  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb) override;
+  bool get_data_as_wkt(String *txt, const char **end) const override;
   bool get_data_as_json(String *txt, uint max_dec_digits,
-                        const char **end) const;
-  bool get_mbr(MBR *mbr, const char **end) const;
+                        const char **end) const override;
+  bool get_mbr(MBR *mbr, const char **end) const override;
   
   int get_xy(double *x, double *y) const
   {
@@ -427,7 +427,7 @@ public:
     return 1;
   }
 
-  int get_x(double *x) const
+  int get_x(double *x) const override
   {
     if (no_data(m_data, SIZEOF_STORED_DOUBLE))
       return 1;
@@ -435,7 +435,7 @@ public:
     return 0;
   }
 
-  int get_y(double *y) const
+  int get_y(double *y) const override
   {
     const char *data= m_data;
     if (no_data(data, SIZEOF_STORED_DOUBLE * 2)) return 1;
@@ -443,16 +443,16 @@ public:
     return 0;
   }
 
-  int geom_length(double *len, const char **end) const;
-  int area(double *ar, const char **end) const;
-  bool dimension(uint32 *dim, const char **end) const
+  int geom_length(double *len, const char **end) const override;
+  int area(double *ar, const char **end) const override;
+  bool dimension(uint32 *dim, const char **end) const override
   {
     *dim= 0;
     *end= 0;					/* No default end */
     return 0;
   }
-  int store_shapes(Gcalc_shape_transporter *trn) const;
-  const Class_info *get_class_info() const;
+  int store_shapes(Gcalc_shape_transporter *trn) const override;
+  const Class_info *get_class_info() const override;
   double calculate_haversine(const Geometry *g, const double sphere_radius,
                              int *error);
   int spherical_distance_multipoints(Geometry *g, const double r, double *result,
@@ -467,29 +467,29 @@ class Gis_line_string: public Geometry
 public:
   Gis_line_string() = default;                        /* Remove gcc warning */
   virtual ~Gis_line_string() = default;               /* Remove gcc warning */
-  uint32 get_data_size() const;
-  bool init_from_wkt(Gis_read_stream *trs, String *wkb);
-  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
-  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb);
-  bool get_data_as_wkt(String *txt, const char **end) const;
+  uint32 get_data_size() const override;
+  bool init_from_wkt(Gis_read_stream *trs, String *wkb) override;
+  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res) override;
+  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb) override;
+  bool get_data_as_wkt(String *txt, const char **end) const override;
   bool get_data_as_json(String *txt, uint max_dec_digits,
-                        const char **end) const;
-  bool get_mbr(MBR *mbr, const char **end) const;
-  int geom_length(double *len, const char **end) const;
-  int area(double *ar, const char **end) const;
-  int is_closed(int *closed) const;
-  int num_points(uint32 *n_points) const;
-  int start_point(String *point) const;
-  int end_point(String *point) const;
-  int point_n(uint32 n, String *result) const;
-  bool dimension(uint32 *dim, const char **end) const
+                        const char **end) const override;
+  bool get_mbr(MBR *mbr, const char **end) const override;
+  int geom_length(double *len, const char **end) const override;
+  int area(double *ar, const char **end) const override;
+  int is_closed(int *closed) const override;
+  int num_points(uint32 *n_points) const override;
+  int start_point(String *point) const override;
+  int end_point(String *point) const override;
+  int point_n(uint32 n, String *result) const override;
+  bool dimension(uint32 *dim, const char **end) const override
   {
     *dim= 1;
     *end= 0;					/* No default end */
     return 0;
   }
-  int store_shapes(Gcalc_shape_transporter *trn) const;
-  const Class_info *get_class_info() const;
+  int store_shapes(Gcalc_shape_transporter *trn) const override;
+  const Class_info *get_class_info() const override;
 };
 
 
@@ -500,29 +500,29 @@ class Gis_polygon: public Geometry
 public:
   Gis_polygon() = default;                            /* Remove gcc warning */
   virtual ~Gis_polygon() = default;                   /* Remove gcc warning */
-  uint32 get_data_size() const;
-  bool init_from_wkt(Gis_read_stream *trs, String *wkb);
-  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
-  uint init_from_opresult(String *bin, const char *opres, uint res_len);
-  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb);
-  bool get_data_as_wkt(String *txt, const char **end) const;
+  uint32 get_data_size() const override;
+  bool init_from_wkt(Gis_read_stream *trs, String *wkb) override;
+  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res) override;
+  uint init_from_opresult(String *bin, const char *opres, uint res_len) override;
+  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb) override;
+  bool get_data_as_wkt(String *txt, const char **end) const override;
   bool get_data_as_json(String *txt, uint max_dec_digits,
-                        const char **end) const;
-  bool get_mbr(MBR *mbr, const char **end) const;
-  int area(double *ar, const char **end) const;
-  int exterior_ring(String *result) const;
-  int num_interior_ring(uint32 *n_int_rings) const;
-  int interior_ring_n(uint32 num, String *result) const;
+                        const char **end) const override;
+  bool get_mbr(MBR *mbr, const char **end) const override;
+  int area(double *ar, const char **end) const override;
+  int exterior_ring(String *result) const override;
+  int num_interior_ring(uint32 *n_int_rings) const override;
+  int interior_ring_n(uint32 num, String *result) const override;
   int centroid_xy(double *x, double *y) const;
-  int centroid(String *result) const;
-  bool dimension(uint32 *dim, const char **end) const
+  int centroid(String *result) const override;
+  bool dimension(uint32 *dim, const char **end) const override
   {
     *dim= 2;
     *end= 0;					/* No default end */
     return 0;
   }
-  int store_shapes(Gcalc_shape_transporter *trn) const;
-  const Class_info *get_class_info() const;
+  int store_shapes(Gcalc_shape_transporter *trn) const override;
+  const Class_info *get_class_info() const override;
 };
 
 
@@ -537,25 +537,25 @@ class Gis_multi_point: public Geometry
 public:
   Gis_multi_point() = default;                        /* Remove gcc warning */
   virtual ~Gis_multi_point() = default;               /* Remove gcc warning */
-  uint32 get_data_size() const;
-  bool init_from_wkt(Gis_read_stream *trs, String *wkb);
-  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
-  uint init_from_opresult(String *bin, const char *opres, uint res_len);
-  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb);
-  bool get_data_as_wkt(String *txt, const char **end) const;
+  uint32 get_data_size() const override;
+  bool init_from_wkt(Gis_read_stream *trs, String *wkb) override;
+  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res) override;
+  uint init_from_opresult(String *bin, const char *opres, uint res_len) override;
+  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb) override;
+  bool get_data_as_wkt(String *txt, const char **end) const override;
   bool get_data_as_json(String *txt, uint max_dec_digits,
-                        const char **end) const;
-  bool get_mbr(MBR *mbr, const char **end) const;
-  int num_geometries(uint32 *num) const;
-  int geometry_n(uint32 num, String *result) const;
-  bool dimension(uint32 *dim, const char **end) const
+                        const char **end) const override;
+  bool get_mbr(MBR *mbr, const char **end) const override;
+  int num_geometries(uint32 *num) const override;
+  int geometry_n(uint32 num, String *result) const override;
+  bool dimension(uint32 *dim, const char **end) const override
   {
     *dim= 0;
     *end= 0;					/* No default end */
     return 0;
   }
-  int store_shapes(Gcalc_shape_transporter *trn) const;
-  const Class_info *get_class_info() const;
+  int store_shapes(Gcalc_shape_transporter *trn) const override;
+  const Class_info *get_class_info() const override;
   int spherical_distance_multipoints(Geometry *g, const double r, double *res,
                                      int *error);
 };
@@ -568,27 +568,27 @@ class Gis_multi_line_string: public Geometry
 public:
   Gis_multi_line_string() = default;                  /* Remove gcc warning */
   virtual ~Gis_multi_line_string() = default;         /* Remove gcc warning */
-  uint32 get_data_size() const;
-  bool init_from_wkt(Gis_read_stream *trs, String *wkb);
-  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
-  uint init_from_opresult(String *bin, const char *opres, uint res_len);
-  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb);
-  bool get_data_as_wkt(String *txt, const char **end) const;
+  uint32 get_data_size() const override;
+  bool init_from_wkt(Gis_read_stream *trs, String *wkb) override;
+  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res) override;
+  uint init_from_opresult(String *bin, const char *opres, uint res_len) override;
+  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb) override;
+  bool get_data_as_wkt(String *txt, const char **end) const override;
   bool get_data_as_json(String *txt, uint max_dec_digits,
-                        const char **end) const;
-  bool get_mbr(MBR *mbr, const char **end) const;
-  int num_geometries(uint32 *num) const;
-  int geometry_n(uint32 num, String *result) const;
-  int geom_length(double *len, const char **end) const;
-  int is_closed(int *closed) const;
-  bool dimension(uint32 *dim, const char **end) const
+                        const char **end) const override;
+  bool get_mbr(MBR *mbr, const char **end) const override;
+  int num_geometries(uint32 *num) const override;
+  int geometry_n(uint32 num, String *result) const override;
+  int geom_length(double *len, const char **end) const override;
+  int is_closed(int *closed) const override;
+  bool dimension(uint32 *dim, const char **end) const override
   {
     *dim= 1;
     *end= 0;					/* No default end */
     return 0;
   }
-  int store_shapes(Gcalc_shape_transporter *trn) const;
-  const Class_info *get_class_info() const;
+  int store_shapes(Gcalc_shape_transporter *trn) const override;
+  const Class_info *get_class_info() const override;
 };
 
 
@@ -599,27 +599,27 @@ class Gis_multi_polygon: public Geometry
 public:
   Gis_multi_polygon() = default;                      /* Remove gcc warning */
   virtual ~Gis_multi_polygon() = default;             /* Remove gcc warning */
-  uint32 get_data_size() const;
-  bool init_from_wkt(Gis_read_stream *trs, String *wkb);
-  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
-  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb);
-  bool get_data_as_wkt(String *txt, const char **end) const;
+  uint32 get_data_size() const override;
+  bool init_from_wkt(Gis_read_stream *trs, String *wkb) override;
+  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res) override;
+  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb) override;
+  bool get_data_as_wkt(String *txt, const char **end) const override;
   bool get_data_as_json(String *txt, uint max_dec_digits,
-                        const char **end) const;
-  bool get_mbr(MBR *mbr, const char **end) const;
-  int num_geometries(uint32 *num) const;
-  int geometry_n(uint32 num, String *result) const;
-  int area(double *ar, const char **end) const;
-  int centroid(String *result) const;
-  bool dimension(uint32 *dim, const char **end) const
+                        const char **end) const override;
+  bool get_mbr(MBR *mbr, const char **end) const override;
+  int num_geometries(uint32 *num) const override;
+  int geometry_n(uint32 num, String *result) const override;
+  int area(double *ar, const char **end) const override;
+  int centroid(String *result) const override;
+  bool dimension(uint32 *dim, const char **end) const override
   {
     *dim= 2;
     *end= 0;					/* No default end */
     return 0;
   }
-  int store_shapes(Gcalc_shape_transporter *trn) const;
-  const Class_info *get_class_info() const;
-  uint init_from_opresult(String *bin, const char *opres, uint res_len);
+  int store_shapes(Gcalc_shape_transporter *trn) const override;
+  const Class_info *get_class_info() const override;
+  uint init_from_opresult(String *bin, const char *opres, uint res_len) override;
 };
 
 
@@ -630,22 +630,22 @@ class Gis_geometry_collection: public Geometry
 public:
   Gis_geometry_collection() = default;                /* Remove gcc warning */
   virtual ~Gis_geometry_collection() = default;       /* Remove gcc warning */
-  uint32 get_data_size() const;
-  bool init_from_wkt(Gis_read_stream *trs, String *wkb);
-  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
-  uint init_from_opresult(String *bin, const char *opres, uint res_len);
-  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb);
-  bool get_data_as_wkt(String *txt, const char **end) const;
+  uint32 get_data_size() const override;
+  bool init_from_wkt(Gis_read_stream *trs, String *wkb) override;
+  uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res) override;
+  uint init_from_opresult(String *bin, const char *opres, uint res_len) override;
+  bool init_from_json(json_engine_t *je, bool er_on_3D, String *wkb) override;
+  bool get_data_as_wkt(String *txt, const char **end) const override;
   bool get_data_as_json(String *txt, uint max_dec_digits,
-                        const char **end) const;
-  bool get_mbr(MBR *mbr, const char **end) const;
-  int area(double *ar, const char **end) const;
-  int geom_length(double *len, const char **end) const;
-  int num_geometries(uint32 *num) const;
-  int geometry_n(uint32 num, String *result) const;
-  bool dimension(uint32 *dim, const char **end) const;
-  int store_shapes(Gcalc_shape_transporter *trn) const;
-  const Class_info *get_class_info() const;
+                        const char **end) const override;
+  bool get_mbr(MBR *mbr, const char **end) const override;
+  int area(double *ar, const char **end) const override;
+  int geom_length(double *len, const char **end) const override;
+  int num_geometries(uint32 *num) const override;
+  int geometry_n(uint32 num, String *result) const override;
+  bool dimension(uint32 *dim, const char **end) const override;
+  int store_shapes(Gcalc_shape_transporter *trn) const override;
+  const Class_info *get_class_info() const override;
 };
 
 struct Geometry_buffer : public
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index c6257ce47c0..6c418c47526 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -251,6 +251,28 @@ public:
 
     return compare_hostname(&host, host2, ip2 ? ip2 : host2);
   }
+
+  enum PASSWD_ERROR_ACTION
+  {
+    PASSWD_ERROR_CLEAR,
+    PASSWD_ERROR_INCREMENT
+  };
+
+  void update_password_errors(PASSWD_ERROR_ACTION action)
+  {
+    switch (action)
+    {
+      case PASSWD_ERROR_INCREMENT:
+        password_errors++;
+        break;
+      case PASSWD_ERROR_CLEAR:
+        password_errors= 0;
+        break;
+      default:
+        DBUG_ASSERT(0);
+        break;
+    }
+  }
 };
 
 class ACL_ROLE :public ACL_USER_BASE
@@ -950,9 +972,9 @@ class User_table_tabular: public User_table
 {
  public:
 
-  LEX_CSTRING& name() const { return MYSQL_TABLE_NAME_USER; }
+  LEX_CSTRING& name() const override { return MYSQL_TABLE_NAME_USER; }
 
-  int get_auth(THD *thd, MEM_ROOT *root, ACL_USER *u) const
+  int get_auth(THD *thd, MEM_ROOT *root, ACL_USER *u) const override
   {
     mysql_mutex_assert_owner(&acl_cache->lock);
     u->alloc_auth(root, 1);
@@ -995,7 +1017,7 @@ class User_table_tabular: public User_table
     return 0;
   }
 
-  bool set_auth(const ACL_USER &u) const
+  bool set_auth(const ACL_USER &u) const override
   {
     if (u.nauth != 1)
       return 1;
@@ -1016,7 +1038,7 @@ class User_table_tabular: public User_table
     return 0;
   }
 
-  privilege_t get_access() const
+  privilege_t get_access() const override
   {
     privilege_t access(Grant_table_base::get_access());
     if ((num_fields() <= 13) && (access & CREATE_ACL))
@@ -1078,7 +1100,7 @@ class User_table_tabular: public User_table
     return access & GLOBAL_ACLS;
   }
 
-  void set_access(const privilege_t rights, bool revoke) const
+  void set_access(const privilege_t rights, bool revoke) const override
   {
     ulonglong priv(SELECT_ACL);
     for (uint i= start_priv_columns; i < end_priv_columns; i++, priv <<= 1)
@@ -1088,132 +1110,132 @@ class User_table_tabular: public User_table
     }
   }
 
-  SSL_type get_ssl_type () const
+  SSL_type get_ssl_type () const override
   {
     Field *f= get_field(end_priv_columns, MYSQL_TYPE_ENUM);
     return (SSL_type)(f ? f->val_int()-1 : 0);
   }
-  int set_ssl_type (SSL_type x) const
+  int set_ssl_type (SSL_type x) const override
   {
     if (Field *f= get_field(end_priv_columns, MYSQL_TYPE_ENUM))
       return f->store(x+1, 0);
     else
       return 1;
   }
-  const char* get_ssl_cipher (MEM_ROOT *root) const
+  const char* get_ssl_cipher (MEM_ROOT *root) const override
   {
     Field *f= get_field(end_priv_columns + 1, MYSQL_TYPE_BLOB);
     return f ? ::get_field(root,f) : 0;
   }
-  int set_ssl_cipher (const char *s, size_t l) const
+  int set_ssl_cipher (const char *s, size_t l) const override
   {
     if (Field *f= get_field(end_priv_columns + 1, MYSQL_TYPE_BLOB))
       return f->store(s, l, &my_charset_latin1);
     else
       return 1;
   }
-  const char* get_x509_issuer (MEM_ROOT *root) const
+  const char* get_x509_issuer (MEM_ROOT *root) const override
   {
     Field *f= get_field(end_priv_columns + 2, MYSQL_TYPE_BLOB);
     return f ? ::get_field(root,f) : 0;
   }
-  int set_x509_issuer (const char *s, size_t l) const
+  int set_x509_issuer (const char *s, size_t l) const override
   {
     if (Field *f= get_field(end_priv_columns + 2, MYSQL_TYPE_BLOB))
       return f->store(s, l, &my_charset_latin1);
     else
       return 1;
   }
-  const char* get_x509_subject (MEM_ROOT *root) const
+  const char* get_x509_subject (MEM_ROOT *root) const override
   {
     Field *f= get_field(end_priv_columns + 3, MYSQL_TYPE_BLOB);
     return f ? ::get_field(root,f) : 0;
   }
-  int set_x509_subject (const char *s, size_t l) const
+  int set_x509_subject (const char *s, size_t l) const override
   {
     if (Field *f= get_field(end_priv_columns + 3, MYSQL_TYPE_BLOB))
       return f->store(s, l, &my_charset_latin1);
     else
       return 1;
   }
-  longlong get_max_questions () const
+  longlong get_max_questions () const override
   {
     Field *f= get_field(end_priv_columns + 4, MYSQL_TYPE_LONG);
     return f ? f->val_int() : 0;
   }
-  int set_max_questions (longlong x) const
+  int set_max_questions (longlong x) const override
   {
     if (Field *f= get_field(end_priv_columns + 4, MYSQL_TYPE_LONG))
       return f->store(x, 0);
     else
       return 1;
   }
-  longlong get_max_updates () const
+  longlong get_max_updates () const override
   {
     Field *f= get_field(end_priv_columns + 5, MYSQL_TYPE_LONG);
     return f ? f->val_int() : 0;
   }
-  int set_max_updates (longlong x) const
+  int set_max_updates (longlong x) const override
   {
     if (Field *f= get_field(end_priv_columns + 5, MYSQL_TYPE_LONG))
       return f->store(x, 0);
     else
       return 1;
   }
-  longlong get_max_connections () const
+  longlong get_max_connections () const override
   {
     Field *f= get_field(end_priv_columns + 6, MYSQL_TYPE_LONG);
     return f ? f->val_int() : 0;
   }
-  int set_max_connections (longlong x) const
+  int set_max_connections (longlong x) const override
   {
     if (Field *f= get_field(end_priv_columns + 6, MYSQL_TYPE_LONG))
       return f->store(x, 0);
     else
       return 1;
   }
-  longlong get_max_user_connections () const
+  longlong get_max_user_connections () const override
   {
     Field *f= get_field(end_priv_columns + 7, MYSQL_TYPE_LONG);
     return f ? f->val_int() : 0;
   }
-  int set_max_user_connections (longlong x) const
+  int set_max_user_connections (longlong x) const override
   {
     if (Field *f= get_field(end_priv_columns + 7, MYSQL_TYPE_LONG))
       return f->store(x, 0);
     else
       return 1;
   }
-  double get_max_statement_time () const
+  double get_max_statement_time () const override
   {
     Field *f= get_field(end_priv_columns + 13, MYSQL_TYPE_NEWDECIMAL);
     return f ? f->val_real() : 0;
   }
-  int set_max_statement_time (double x) const
+  int set_max_statement_time (double x) const override
   {
     if (Field *f= get_field(end_priv_columns + 13, MYSQL_TYPE_NEWDECIMAL))
       return f->store(x);
     else
       return 1;
   }
-  bool get_is_role () const
+  bool get_is_role () const override
   {
     Field *f= get_field(end_priv_columns + 11, MYSQL_TYPE_ENUM);
     return f ? f->val_int()-1 : 0;
   }
-  int set_is_role (bool x) const
+  int set_is_role (bool x) const override
   {
     if (Field *f= get_field(end_priv_columns + 11, MYSQL_TYPE_ENUM))
       return f->store(x+1, 0);
     else
       return 1;
   }
-  const char* get_default_role (MEM_ROOT *root) const
+  const char* get_default_role (MEM_ROOT *root) const override
   {
     Field *f= get_field(end_priv_columns + 12, MYSQL_TYPE_STRING);
     return f ? ::get_field(root,f) : 0;
   }
-  int set_default_role (const char *s, size_t l) const
+  int set_default_role (const char *s, size_t l) const override
   {
     if (Field *f= get_field(end_priv_columns + 12, MYSQL_TYPE_STRING))
       return f->store(s, l, system_charset_info);
@@ -1223,12 +1245,12 @@ class User_table_tabular: public User_table
   /* On a MariaDB 10.3 user table, the account locking accessors will try to
      get the content of the max_statement_time column, but they will fail due
      to the typecheck in get_field. */
-  bool get_account_locked () const
+  bool get_account_locked () const override
   {
     Field *f= get_field(end_priv_columns + 13, MYSQL_TYPE_ENUM);
     return f ? f->val_int()-1 : 0;
   }
-  int set_account_locked (bool x) const
+  int set_account_locked (bool x) const override
   {
     if (Field *f= get_field(end_priv_columns + 13, MYSQL_TYPE_ENUM))
       return f->store(x+1, 0);
@@ -1236,14 +1258,14 @@ class User_table_tabular: public User_table
     return 1;
   }
 
-  bool get_password_expired () const
+  bool get_password_expired () const override
   {
     uint field_num= end_priv_columns + 10;
 
     Field *f= get_field(field_num, MYSQL_TYPE_ENUM);
     return f ? f->val_int()-1 : 0;
   }
-  int set_password_expired (bool x) const
+  int set_password_expired (bool x) const override
   {
     uint field_num= end_priv_columns + 10;
 
@@ -1251,14 +1273,14 @@ class User_table_tabular: public User_table
       return f->store(x+1, 0);
     return 1;
   }
-  my_time_t get_password_last_changed () const
+  my_time_t get_password_last_changed () const override
   {
     ulong unused_dec;
     if (Field *f= get_field(end_priv_columns + 11, MYSQL_TYPE_TIMESTAMP2))
       return f->get_timestamp(&unused_dec);
     return 0;
   }
-  int set_password_last_changed (my_time_t x) const
+  int set_password_last_changed (my_time_t x) const override
   {
     if (Field *f= get_field(end_priv_columns + 11, MYSQL_TYPE_TIMESTAMP2))
     {
@@ -1267,7 +1289,7 @@ class User_table_tabular: public User_table
     }
     return 1;
   }
-  longlong get_password_lifetime () const
+  longlong get_password_lifetime () const override
   {
     if (Field *f= get_field(end_priv_columns + 12, MYSQL_TYPE_SHORT))
     {
@@ -1277,7 +1299,7 @@ class User_table_tabular: public User_table
     }
     return 0;
   }
-  int set_password_lifetime (longlong x) const
+  int set_password_lifetime (longlong x) const override
   {
     if (Field *f= get_field(end_priv_columns + 12, MYSQL_TYPE_SHORT))
     {
@@ -1292,7 +1314,7 @@ class User_table_tabular: public User_table
     return 1;
   }
 
-  virtual ~User_table_tabular() = default;
+  ~User_table_tabular() override = default;
  private:
   friend class Grant_tables;
 
@@ -1317,7 +1339,7 @@ class User_table_tabular: public User_table
     return f->real_type() == type ? f : NULL;
   }
 
-  int setup_sysvars() const
+  int setup_sysvars() const override
   {
     username_char_length= MY_MIN(m_table->field[1]->char_length(),
                                  USERNAME_CHAR_LENGTH);
@@ -1391,9 +1413,9 @@ class User_table_tabular: public User_table
 */
 class User_table_json: public User_table
 {
-  LEX_CSTRING& name() const { return MYSQL_TABLE_NAME[USER_TABLE]; }
+  LEX_CSTRING& name() const override { return MYSQL_TABLE_NAME[USER_TABLE]; }
 
-  int get_auth(THD *thd, MEM_ROOT *root, ACL_USER *u) const
+  int get_auth(THD *thd, MEM_ROOT *root, ACL_USER *u) const override
   {
     size_t array_len;
     const char *array;
@@ -1472,7 +1494,7 @@ class User_table_json: public User_table
     return 0;
   }
 
-  bool set_auth(const ACL_USER &u) const
+  bool set_auth(const ACL_USER &u) const override
   {
     size_t array_len;
     const char *array;
@@ -1596,7 +1618,7 @@ class User_table_json: public User_table
     return access & ALL_KNOWN_ACL;
   }
 
-  privilege_t get_access() const
+  privilege_t get_access() const override
   {
     ulonglong version_id= (ulonglong) get_int_value("version_id");
     ulonglong access= (ulonglong) get_int_value("access");
@@ -1623,7 +1645,7 @@ class User_table_json: public User_table
     return adjust_access(version_id, access) & GLOBAL_ACLS;
   }
 
-  void set_access(const privilege_t rights, bool revoke) const
+  void set_access(const privilege_t rights, bool revoke) const override
   {
     privilege_t access= get_access();
     if (revoke)
@@ -1636,77 +1658,77 @@ class User_table_json: public User_table
   const char *unsafe_str(const char *s) const
   { return s[0] ? s : NULL; }
 
-  SSL_type get_ssl_type () const
+  SSL_type get_ssl_type () const override
   { return (SSL_type)get_int_value("ssl_type"); }
-  int set_ssl_type (SSL_type x) const
+  int set_ssl_type (SSL_type x) const override
   { return set_int_value("ssl_type", x); }
-  const char* get_ssl_cipher (MEM_ROOT *root) const
+  const char* get_ssl_cipher (MEM_ROOT *root) const override
   { return unsafe_str(get_str_value(root, "ssl_cipher")); }
-  int set_ssl_cipher (const char *s, size_t l) const
+  int set_ssl_cipher (const char *s, size_t l) const override
   { return set_str_value("ssl_cipher", s, l); }
-  const char* get_x509_issuer (MEM_ROOT *root) const
+  const char* get_x509_issuer (MEM_ROOT *root) const override
   { return unsafe_str(get_str_value(root, "x509_issuer")); }
-  int set_x509_issuer (const char *s, size_t l) const
+  int set_x509_issuer (const char *s, size_t l) const override
   { return set_str_value("x509_issuer", s, l); }
-  const char* get_x509_subject (MEM_ROOT *root) const
+  const char* get_x509_subject (MEM_ROOT *root) const override
   { return unsafe_str(get_str_value(root, "x509_subject")); }
-  int set_x509_subject (const char *s, size_t l) const
+  int set_x509_subject (const char *s, size_t l) const override
   { return set_str_value("x509_subject", s, l); }
-  longlong get_max_questions () const
+  longlong get_max_questions () const override
   { return get_int_value("max_questions"); }
-  int set_max_questions (longlong x) const
+  int set_max_questions (longlong x) const override
   { return set_int_value("max_questions", x); }
-  longlong get_max_updates () const
+  longlong get_max_updates () const override
   { return get_int_value("max_updates"); }
-  int set_max_updates (longlong x) const
+  int set_max_updates (longlong x) const override
   { return set_int_value("max_updates", x); }
-  longlong get_max_connections () const
+  longlong get_max_connections () const override
   { return get_int_value("max_connections"); }
-  int set_max_connections (longlong x) const
+  int set_max_connections (longlong x) const override
   { return set_int_value("max_connections", x); }
-  longlong get_max_user_connections () const
+  longlong get_max_user_connections () const override
   { return get_int_value("max_user_connections"); }
-  int set_max_user_connections (longlong x) const
+  int set_max_user_connections (longlong x) const override
   { return set_int_value("max_user_connections", x); }
-  double get_max_statement_time () const
+  double get_max_statement_time () const override
   { return get_double_value("max_statement_time"); }
-  int set_max_statement_time (double x) const
+  int set_max_statement_time (double x) const override
   { return set_double_value("max_statement_time", x); }
-  bool get_is_role () const
+  bool get_is_role () const override
   { return get_bool_value("is_role"); }
-  int set_is_role (bool x) const
+  int set_is_role (bool x) const override
   { return set_bool_value("is_role", x); }
-  const char* get_default_role (MEM_ROOT *root) const
+  const char* get_default_role (MEM_ROOT *root) const override
   { return get_str_value(root, "default_role"); }
-  int set_default_role (const char *s, size_t l) const
+  int set_default_role (const char *s, size_t l) const override
   { return set_str_value("default_role", s, l); }
-  bool get_account_locked () const
+  bool get_account_locked () const override
   { return get_bool_value("account_locked"); }
-  int set_account_locked (bool x) const
+  int set_account_locked (bool x) const override
   { return set_bool_value("account_locked", x); }
-  my_time_t get_password_last_changed () const
+  my_time_t get_password_last_changed () const override
   { return static_cast<my_time_t>(get_int_value("password_last_changed")); }
-  int set_password_last_changed (my_time_t x) const
+  int set_password_last_changed (my_time_t x) const override
   { return set_int_value("password_last_changed", static_cast<longlong>(x)); }
-  int set_password_lifetime (longlong x) const
+  int set_password_lifetime (longlong x) const override
   { return set_int_value("password_lifetime", x); }
-  longlong get_password_lifetime () const
+  longlong get_password_lifetime () const override
   { return get_int_value("password_lifetime", -1); }
   /*
      password_last_changed=0 means the password is manually expired.
      In MySQL 5.7+ this state is described using the password_expired column
      in mysql.user
   */
-  bool get_password_expired () const
+  bool get_password_expired () const override
   { return get_int_value("password_last_changed", -1) == 0; }
-  int set_password_expired (bool x) const
+  int set_password_expired (bool x) const override
   { return x ? set_password_last_changed(0) : 0; }
 
-  ~User_table_json() = default;
+  ~User_table_json() override = default;
  private:
   friend class Grant_tables;
   static const uint JSON_SIZE=1024;
-  int setup_sysvars() const
+  int setup_sysvars() const override
   {
     using_global_priv_table= true;
     username_char_length= MY_MIN(m_table->field[1]->char_length(),
@@ -3646,6 +3668,9 @@ static int acl_user_update(THD *thd, ACL_USER *acl_user, uint nauth,
     break;
   }
 
+  // Any alter user resets password_errors;
+  acl_user->update_password_errors(ACL_USER::PASSWD_ERROR_CLEAR);
+
   return 0;
 }
 
@@ -5523,8 +5548,8 @@ public:
   GRANT_TABLE(const char *h, const char *d,const char *u,
               const char *t, privilege_t p, privilege_t c);
   GRANT_TABLE (TABLE *form, TABLE *col_privs);
-  ~GRANT_TABLE();
-  bool ok() { return privs != NO_ACL || cols != NO_ACL; }
+  ~GRANT_TABLE() override;
+  bool ok() override { return privs != NO_ACL || cols != NO_ACL; }
   void init_hash()
   {
     my_hash_init2(key_memory_acl_memex, &hash_columns, 4,
@@ -11839,14 +11864,14 @@ public:
     : is_grave(FALSE)
   {}
 
-  virtual ~Silence_routine_definer_errors() = default;
+  ~Silence_routine_definer_errors() override = default;
 
-  virtual bool handle_condition(THD *thd,
+  bool handle_condition(THD *thd,
                                 uint sql_errno,
                                 const char* sqlstate,
                                 Sql_condition::enum_warning_level *level,
                                 const char* msg,
-                                Sql_condition ** cond_hdl);
+                                Sql_condition ** cond_hdl) override;
 
   bool has_errors() { return is_grave; }
 
@@ -14653,36 +14678,18 @@ static int do_auth_once(THD *thd, const LEX_CSTRING *auth_plugin_name,
   return res;
 }
 
-enum PASSWD_ERROR_ACTION
-{
-  PASSWD_ERROR_CLEAR,
-  PASSWD_ERROR_INCREMENT
-};
 
 /* Increment, or clear password errors for a user. */
 static void handle_password_errors(const LEX_CSTRING &user,
                                    const LEX_CSTRING &hostname,
-                                   PASSWD_ERROR_ACTION action)
+                                   ACL_USER::PASSWD_ERROR_ACTION action)
 {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   mysql_mutex_assert_not_owner(&acl_cache->lock);
   mysql_mutex_lock(&acl_cache->lock);
   ACL_USER *u = find_user_exact(hostname, user);
   if (u)
-  {
-    switch(action)
-    {
-      case PASSWD_ERROR_INCREMENT:
-        u->password_errors++;
-        break;
-      case PASSWD_ERROR_CLEAR:
-        u->password_errors= 0;
-        break;
-      default:
-        DBUG_ASSERT(0);
-        break;
-    }
-  }
+    u->update_password_errors(action);
   mysql_mutex_unlock(&acl_cache->lock);
 #endif
 }
@@ -14833,7 +14840,7 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len)
       errors.m_authentication= 1;
       if (thd->password && !mpvio.make_it_fail)
         handle_password_errors(acl_user->user, acl_user->hostname(),
-                               PASSWD_ERROR_INCREMENT);
+                               ACL_USER::PASSWD_ERROR_INCREMENT);
       break;
     case CR_ERROR:
     default:
@@ -14852,7 +14859,7 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len)
   {
     /* Login succeeded, clear password errors.*/
     handle_password_errors(acl_user->user, acl_user->hostname(),
-                           PASSWD_ERROR_CLEAR);
+                           ACL_USER::PASSWD_ERROR_CLEAR);
   }
 
   if (initialized) // if not --skip-grant-tables
@@ -14871,7 +14878,8 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len)
       DBUG_RETURN(1);
     }
 
-    if (acl_user->account_locked) {
+    if (acl_user->account_locked)
+    {
       status_var_increment(denied_connections);
       my_error(ER_ACCOUNT_HAS_BEEN_LOCKED, MYF(0));
       DBUG_RETURN(1);
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index cc774263c91..866c32958fb 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -327,7 +327,7 @@ public:
    :m_command(command)
   { }
   bool is_revoke() const { return m_command == SQLCOM_REVOKE; }
-  enum_sql_command sql_command_code() const { return m_command; }
+  enum_sql_command sql_command_code() const override { return m_command; }
 };
 
 
@@ -341,7 +341,7 @@ public:
   Sql_cmd_grant_proxy(enum_sql_command command, privilege_t grant_option)
    :Sql_cmd_grant(command), m_grant_option(grant_option)
   { }
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 
@@ -368,7 +368,7 @@ public:
   Sql_cmd_grant_table(enum_sql_command command, const Grant_privilege &grant)
    :Sql_cmd_grant_object(command, grant)
   { }
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 
@@ -382,7 +382,7 @@ public:
    :Sql_cmd_grant_object(command, grant),
     m_sph(sph)
   { }
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 #endif /* SQL_ACL_INCLUDED */
diff --git a/sql/sql_admin.h b/sql/sql_admin.h
index 1a237d4f616..ccccef748c1 100644
--- a/sql/sql_admin.h
+++ b/sql/sql_admin.h
@@ -38,9 +38,9 @@ public:
 
   ~Sql_cmd_analyze_table() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ANALYZE;
   }
@@ -61,9 +61,9 @@ public:
 
   ~Sql_cmd_check_table() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_CHECK;
   }
@@ -83,9 +83,9 @@ public:
 
   ~Sql_cmd_optimize_table() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_OPTIMIZE;
   }
@@ -106,9 +106,9 @@ public:
 
   ~Sql_cmd_repair_table() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_REPAIR;
   }
diff --git a/sql/sql_alter.h b/sql/sql_alter.h
index f2823c25ed9..cf4ce3b3ce4 100644
--- a/sql/sql_alter.h
+++ b/sql/sql_alter.h
@@ -467,7 +467,7 @@ protected:
 
   virtual ~Sql_cmd_common_alter_table() = default;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_TABLE;
   }
@@ -488,9 +488,9 @@ public:
 
   ~Sql_cmd_alter_table() = default;
 
-  Storage_engine_name *option_storage_engine_name() { return this; }
+  Storage_engine_name *option_storage_engine_name() override { return this; }
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 
@@ -510,11 +510,11 @@ public:
 
   ~Sql_cmd_alter_sequence() = default;
 
-  enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_SEQUENCE;
   }
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 
@@ -534,7 +534,7 @@ public:
     : m_tablespace_op(tablespace_op_arg)
   {}
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
 private:
   const enum_tablespace_op_type m_tablespace_op;
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h
index e76ff13c06e..7e3b66d024e 100644
--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@@ -123,13 +123,13 @@ public:
     { init_tree(&tree, 0, 0, sizeof(String), (qsort_cmp2) sortcmp2,
 		free_string, NULL, MYF(MY_THREAD_SPECIFIC)); };
 
-  void	 add();
-  void	 get_opt_type(String*, ha_rows);
-  String *get_min_arg(String *not_used __attribute__((unused)))
+  void	 add() override;
+  void	 get_opt_type(String*, ha_rows) override;
+  String *get_min_arg(String *not_used __attribute__((unused))) override
   { return &min_arg; }
-  String *get_max_arg(String *not_used __attribute__((unused)))
+  String *get_max_arg(String *not_used __attribute__((unused))) override
   { return &max_arg; }
-  String *avg(String *s, ha_rows rows)
+  String *avg(String *s, ha_rows rows) override
   {
     if (!(rows - nulls))
       s->set_real((double) 0.0, 1,my_thd_charset);
@@ -140,10 +140,10 @@ public:
   }
   friend int collect_string(String *element, element_count count,
 			    TREE_INFO *info);
-  tree_walk_action collect_enum()
+  tree_walk_action collect_enum() override
   { return (tree_walk_action) collect_string; }
   String *std(String *s __attribute__((unused)),
-	      ha_rows rows __attribute__((unused)))
+	      ha_rows rows __attribute__((unused))) override
   { return (String*) 0; }
 };
 
@@ -165,16 +165,16 @@ public:
               0, (void *)&bin_size, MYF(MY_THREAD_SPECIFIC));
   };
 
-  void	 add();
-  void	 get_opt_type(String*, ha_rows);
-  String *get_min_arg(String *);
-  String *get_max_arg(String *);
-  String *avg(String *s, ha_rows rows);
+  void	 add() override;
+  void	 get_opt_type(String*, ha_rows) override;
+  String *get_min_arg(String *) override;
+  String *get_max_arg(String *) override;
+  String *avg(String *s, ha_rows rows) override;
   friend int collect_decimal(uchar *element, element_count count,
                              TREE_INFO *info);
-  tree_walk_action collect_enum()
+  tree_walk_action collect_enum() override
   { return (tree_walk_action) collect_decimal; }
-  String *std(String *s, ha_rows rows);
+  String *std(String *s, ha_rows rows) override;
 };
 
 
@@ -193,19 +193,19 @@ public:
 		(qsort_cmp2) compare_double2, NULL, NULL,
                 MYF(MY_THREAD_SPECIFIC)); }
 
-  void	 add();
-  void	 get_opt_type(String*, ha_rows);
-  String *get_min_arg(String *s)
+  void	 add() override;
+  void	 get_opt_type(String*, ha_rows) override;
+  String *get_min_arg(String *s) override
   {
     s->set_real(min_arg, item->decimals, my_thd_charset);
     return s;
   }
-  String *get_max_arg(String *s)
+  String *get_max_arg(String *s) override
   {
     s->set_real(max_arg, item->decimals, my_thd_charset);
     return s;
   }
-  String *avg(String *s, ha_rows rows)
+  String *avg(String *s, ha_rows rows) override
   {
     if (!(rows - nulls))
       s->set_real((double) 0.0, 1,my_thd_charset);
@@ -213,7 +213,7 @@ public:
       s->set_real(((double)sum / (double) (rows - nulls)), item->decimals,my_thd_charset);
     return s;
   }
-  String *std(String *s, ha_rows rows)
+  String *std(String *s, ha_rows rows) override
   {
     double tmp = ulonglong2double(rows);
     if (!(tmp - nulls))
@@ -226,10 +226,10 @@ public:
     }
     return s;
   }
-  uint	 decimals() { return item->decimals; }
+  uint	 decimals() override { return item->decimals; }
   friend int collect_real(double *element, element_count count,
 			  TREE_INFO *info);
-  tree_walk_action collect_enum()
+  tree_walk_action collect_enum() override
   { return (tree_walk_action) collect_real;}
 };
 
@@ -248,11 +248,11 @@ public:
 		(qsort_cmp2) compare_longlong2, NULL, NULL,
                 MYF(MY_THREAD_SPECIFIC)); }
 
-  void	 add();
-  void	 get_opt_type(String*, ha_rows);
-  String *get_min_arg(String *s) { s->set(min_arg,my_thd_charset); return s; }
-  String *get_max_arg(String *s) { s->set(max_arg,my_thd_charset); return s; }
-  String *avg(String *s, ha_rows rows)
+  void	 add() override;
+  void	 get_opt_type(String*, ha_rows) override;
+  String *get_min_arg(String *s) override { s->set(min_arg,my_thd_charset); return s; }
+  String *get_max_arg(String *s) override { s->set(max_arg,my_thd_charset); return s; }
+  String *avg(String *s, ha_rows rows) override
   {
     if (!(rows - nulls))
       s->set_real((double) 0.0, 1,my_thd_charset);
@@ -260,7 +260,7 @@ public:
       s->set_real(((double) sum / (double) (rows - nulls)), DEC_IN_AVG,my_thd_charset);
     return s;
   }
-  String *std(String *s, ha_rows rows)
+  String *std(String *s, ha_rows rows) override
   {
     double tmp = ulonglong2double(rows);
     if (!(tmp - nulls))
@@ -275,7 +275,7 @@ public:
   }
   friend int collect_longlong(longlong *element, element_count count,
 			      TREE_INFO *info);
-  tree_walk_action collect_enum()
+  tree_walk_action collect_enum() override
   { return (tree_walk_action) collect_longlong;}
 };
 
@@ -293,11 +293,11 @@ public:
     { init_tree(&tree, 0, 0, sizeof(ulonglong),
 		(qsort_cmp2) compare_ulonglong2, NULL, NULL,
                 MYF(MY_THREAD_SPECIFIC)); }
-  void	 add();
-  void	 get_opt_type(String*, ha_rows);
-  String *get_min_arg(String *s) { s->set(min_arg,my_thd_charset); return s; }
-  String *get_max_arg(String *s) { s->set(max_arg,my_thd_charset); return s; }
-  String *avg(String *s, ha_rows rows)
+  void	 add() override;
+  void	 get_opt_type(String*, ha_rows) override;
+  String *get_min_arg(String *s) override { s->set(min_arg,my_thd_charset); return s; }
+  String *get_max_arg(String *s) override { s->set(max_arg,my_thd_charset); return s; }
+  String *avg(String *s, ha_rows rows) override
   {
     if (!(rows - nulls))
       s->set_real((double) 0.0, 1,my_thd_charset);
@@ -306,7 +306,7 @@ public:
 	     DEC_IN_AVG,my_thd_charset);
     return s;
   }
-  String *std(String *s, ha_rows rows)
+  String *std(String *s, ha_rows rows) override
   {
     double tmp = ulonglong2double(rows);
     if (!(tmp - nulls))
@@ -322,7 +322,7 @@ public:
   }
   friend int collect_ulonglong(ulonglong *element, element_count count,
 			       TREE_INFO *info);
-  tree_walk_action collect_enum()
+  tree_walk_action collect_enum() override
   { return (tree_walk_action) collect_ulonglong; }
 };
 
@@ -354,11 +354,11 @@ public:
 	delete (*f);
     }
   }
-  virtual void add() {}
-  virtual bool change_columns(THD *thd, List<Item> &fields);
-  virtual int  send_row(List<Item> &field_list);
-  virtual void end_group(void) {}
-  virtual int end_of_records(void);
+  void add() override {}
+  bool change_columns(THD *thd, List<Item> &fields) override;
+  int  send_row(List<Item> &field_list) override;
+  void end_group(void) override {}
+  int end_of_records(void) override;
   friend Procedure *proc_analyse_init(THD *thd, ORDER *param,
 				      select_result *result,
 				      List<Item> &field_list);
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index f69327ad7a2..9379ce0699a 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -118,7 +118,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl);
+                        Sql_condition ** cond_hdl) override;
 
   /**
     Returns TRUE if there were ER_NO_SUCH_/WRONG_MRG_TABLE and there
@@ -519,7 +519,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl)
+                        Sql_condition ** cond_hdl) override
   {
     *cond_hdl= NULL;
     if (sql_errno == ER_OPEN_AS_READONLY || sql_errno == ER_LOCK_WAIT_TIMEOUT)
@@ -1479,14 +1479,14 @@ public:
     : m_ot_ctx(ot_ctx_arg), m_is_active(FALSE)
   {}
 
-  virtual ~MDL_deadlock_handler() = default;
+  ~MDL_deadlock_handler() override = default;
 
-  virtual bool handle_condition(THD *thd,
+  bool handle_condition(THD *thd,
                                 uint sql_errno,
                                 const char* sqlstate,
                                 Sql_condition::enum_warning_level *level,
                                 const char* msg,
-                                Sql_condition ** cond_hdl);
+                                Sql_condition ** cond_hdl) override;
 
 private:
   /** Open table context to be used for back-off request. */
@@ -3234,7 +3234,7 @@ static bool open_table_entry_fini(THD *thd, TABLE_SHARE *share, TABLE *entry)
       String query(query_buf, sizeof(query_buf), system_charset_info);
 
       query.length(0);
-      query.append(STRING_WITH_LEN("DELETE FROM "));
+      query.append(STRING_WITH_LEN("TRUNCATE TABLE "));
       append_identifier(thd, &query, &share->db);
       query.append('.');
       append_identifier(thd, &query, &share->table_name);
@@ -3411,12 +3411,12 @@ request_backoff_action(enum_open_table_action action_arg,
 class MDL_deadlock_discovery_repair_handler : public Internal_error_handler
 {
 public:
-  virtual bool handle_condition(THD *thd,
+  bool handle_condition(THD *thd,
                                   uint sql_errno,
                                   const char* sqlstate,
                                   Sql_condition::enum_warning_level *level,
                                   const char* msg,
-                                  Sql_condition ** cond_hdl)
+                                  Sql_condition ** cond_hdl) override
   {
     if (sql_errno == ER_LOCK_DEADLOCK)
     {
@@ -4680,7 +4680,8 @@ restart:
             have failed to open since closing tables can trigger removal of
             elements from the table list (if MERGE tables are involved),
           */
-          close_tables_for_reopen(thd, start, ot_ctx.start_of_statement_svp());
+          close_tables_for_reopen(thd, start, ot_ctx.start_of_statement_svp(),
+                                  ot_ctx.remove_implicitly_used_deps());
 
           /*
             Here we rely on the fact that 'tables' still points to the valid
@@ -4748,10 +4749,10 @@ restart:
           /* F.ex. deadlock happened */
           if (ot_ctx.can_recover_from_failed_open())
           {
-            DBUG_ASSERT(ot_ctx.get_action() !=
-                        Open_table_context::OT_ADD_HISTORY_PARTITION);
+            DBUG_ASSERT(ot_ctx.remove_implicitly_used_deps());
             close_tables_for_reopen(thd, start,
-                                    ot_ctx.start_of_statement_svp());
+                                    ot_ctx.start_of_statement_svp(),
+                                    ot_ctx.remove_implicitly_used_deps());
             if (ot_ctx.recover_from_failed_open())
               goto error;
 
@@ -6063,27 +6064,34 @@ bool restart_trans_for_tables(THD *thd, TABLE_LIST *table)
                          trying to reopen tables. NULL if no metadata locks
                          were held and thus all metadata locks should be
                          released.
+  @param[in] remove_implicit_deps  True in case routines and tables implicitly
+                                   used by a statement should be removed.
 */
 
 void close_tables_for_reopen(THD *thd, TABLE_LIST **tables,
-                             const MDL_savepoint &start_of_statement_svp)
+                             const MDL_savepoint &start_of_statement_svp,
+                             bool remove_implicit_deps)
 {
   TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
   TABLE_LIST *tmp;
 
-  /*
-    If table list consists only from tables from prelocking set, table list
-    for new attempt should be empty, so we have to update list's root pointer.
-  */
-  if (first_not_own_table == *tables)
-    *tables= 0;
-  thd->lex->chop_off_not_own_tables();
-  /* Reset MDL tickets for procedures/functions */
-  for (Sroutine_hash_entry *rt=
-         (Sroutine_hash_entry*)thd->lex->sroutines_list.first;
-       rt; rt= rt->next)
-    rt->mdl_request.ticket= NULL;
-  sp_remove_not_own_routines(thd->lex);
+  if (remove_implicit_deps)
+  {
+    /*
+      If table list consists only from tables from prelocking set, table list
+      for new attempt should be empty, so we have to update list's root pointer.
+    */
+    if (first_not_own_table == *tables)
+      *tables= 0;
+    thd->lex->chop_off_not_own_tables();
+
+    /* Reset MDL tickets for procedures/functions */
+    for (Sroutine_hash_entry *rt=
+        (Sroutine_hash_entry*)thd->lex->sroutines_list.first;
+        rt; rt= rt->next)
+      rt->mdl_request.ticket= NULL;
+    sp_remove_not_own_routines(thd->lex);
+  }
   for (tmp= *tables; tmp; tmp= tmp->next_global)
   {
     tmp->table= 0;
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 82ea5fa8603..8507a457d38 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -157,7 +157,8 @@ thr_lock_type read_lock_type_for_table(THD *thd,
 
 my_bool mysql_rm_tmp_tables(void);
 void close_tables_for_reopen(THD *thd, TABLE_LIST **tables,
-                             const MDL_savepoint &start_of_statement_svp);
+                             const MDL_savepoint &start_of_statement_svp,
+                             bool remove_implicit_dependencies);
 bool table_already_fk_prelocked(TABLE_LIST *tl, LEX_CSTRING *db,
                                 LEX_CSTRING *table, thr_lock_type lock_type);
 TABLE_LIST *find_table_in_list(TABLE_LIST *table,
@@ -430,13 +431,13 @@ public:
 class DML_prelocking_strategy : public Prelocking_strategy
 {
 public:
-  virtual bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
-                              Sroutine_hash_entry *rt, sp_head *sp,
-                              bool *need_prelocking);
-  virtual bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
-                            TABLE_LIST *table_list, bool *need_prelocking);
-  virtual bool handle_view(THD *thd, Query_tables_list *prelocking_ctx,
-                           TABLE_LIST *table_list, bool *need_prelocking);
+  bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
+                      Sroutine_hash_entry *rt, sp_head *sp,
+                      bool *need_prelocking) override;
+  bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
+                    TABLE_LIST *table_list, bool *need_prelocking) override;
+  bool handle_view(THD *thd, Query_tables_list *prelocking_ctx,
+                   TABLE_LIST *table_list, bool *need_prelocking) override;
 };
 
 
@@ -446,8 +447,8 @@ class Multiupdate_prelocking_strategy : public DML_prelocking_strategy
   bool done;
   bool has_prelocking_list;
 public:
-  void reset(THD *thd);
-  bool handle_end(THD *thd);
+  void reset(THD *thd) override;
+  bool handle_end(THD *thd) override;
 };
 
 
@@ -458,8 +459,8 @@ public:
 
 class Lock_tables_prelocking_strategy : public DML_prelocking_strategy
 {
-  virtual bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
-                            TABLE_LIST *table_list, bool *need_prelocking);
+  bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
+                    TABLE_LIST *table_list, bool *need_prelocking) override;
 };
 
 
@@ -474,13 +475,13 @@ class Lock_tables_prelocking_strategy : public DML_prelocking_strategy
 class Alter_table_prelocking_strategy : public Prelocking_strategy
 {
 public:
-  virtual bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
-                              Sroutine_hash_entry *rt, sp_head *sp,
-                              bool *need_prelocking);
-  virtual bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
-                            TABLE_LIST *table_list, bool *need_prelocking);
-  virtual bool handle_view(THD *thd, Query_tables_list *prelocking_ctx,
-                           TABLE_LIST *table_list, bool *need_prelocking);
+  bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
+                      Sroutine_hash_entry *rt, sp_head *sp,
+                      bool *need_prelocking) override;
+  bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
+                    TABLE_LIST *table_list, bool *need_prelocking) override;
+  bool handle_view(THD *thd, Query_tables_list *prelocking_ctx,
+                   TABLE_LIST *table_list, bool *need_prelocking) override;
 };
 
 
@@ -582,9 +583,21 @@ public:
     return m_timeout;
   }
 
-  enum_open_table_action get_action() const
+  /**
+    Return true in case tables and routines the statement implicilty
+    dependent on should be removed, else return false.
+
+    @note The use case when routines and tables the statement implicitly
+    dependent on shouldn't be removed is the one when a new partition be
+    created on handling the INSERT statement against a versioning partitioned
+    table. For this case re-opening a versioning table would result in adding
+    implicitly dependent routines (e.g. table's triggers) that lead to
+    allocation of memory on PS mem_root and so leaking a memory until the PS
+    statement be deallocated.
+  */
+  bool remove_implicitly_used_deps() const
   {
-    return m_action;
+    return m_action != OT_ADD_HISTORY_PARTITION;
   }
 
   uint get_flags() const { return m_flags; }
@@ -679,7 +692,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl);
+                        Sql_condition ** cond_hdl) override;
 
   /**
     Returns TRUE if one or more ER_NO_SUCH_TABLE errors have been
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 1bae8c93ab7..0064d54a3db 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -5187,6 +5187,9 @@ MYSQL_THD create_background_thd()
   thd->real_id= 0;
   thd->thread_id= 0;
   thd->query_id= 0;
+#ifdef WITH_WSREP
+  thd->variables.wsrep_on= FALSE;
+#endif /* WITH_WSREP */
   return thd;
 }
 
@@ -6582,7 +6585,8 @@ int THD::decide_logging_format(TABLE_LIST *tables)
       wsrep_is_active(this) &&
       variables.wsrep_trx_fragment_size > 0)
   {
-    if (!is_current_stmt_binlog_format_row())
+    if (!is_current_stmt_binlog_disabled() &&
+        !is_current_stmt_binlog_format_row())
     {
       my_message(ER_NOT_SUPPORTED_YET,
                  "Streaming replication not supported with "
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 2d671139a6c..04b4bc93f6a 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -534,7 +534,7 @@ public:
     Used to make a clone of this object for ALTER/CREATE TABLE
     @sa comment for Key_part_spec::clone
   */
-  virtual Key *clone(MEM_ROOT *mem_root) const
+  Key *clone(MEM_ROOT *mem_root) const override
   { return new (mem_root) Foreign_key(*this, mem_root); }
   /* Used to validate foreign key options */
   bool validate(List<Create_field> &table_fields);
@@ -1687,7 +1687,7 @@ public:
   void set_n_backup_statement(Statement *stmt, Statement *backup);
   void restore_backup_statement(Statement *stmt, Statement *backup);
   /* return class type */
-  virtual Type type() const;
+  Type type() const override;
 };
 
 
@@ -2254,7 +2254,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl)
+                        Sql_condition ** cond_hdl) override
   {
     m_unhandled_errors++;
     if (!first_error)
@@ -2278,7 +2278,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl)
+                        Sql_condition ** cond_hdl) override
   {
     if (*level == Sql_condition::WARN_LEVEL_ERROR)
       errors++;
@@ -2306,7 +2306,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl);
+                        Sql_condition ** cond_hdl) override;
 
 private:
 };
@@ -2327,7 +2327,7 @@ public:
                         const char *sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition **cond_hdl);
+                        Sql_condition **cond_hdl) override;
 
   bool need_reopen() const { return m_need_reopen; };
   void init() { m_need_reopen= FALSE; };
@@ -2340,12 +2340,12 @@ class Turn_errors_to_warnings_handler : public Internal_error_handler
 {
 public:
   Turn_errors_to_warnings_handler() = default;
-  bool handle_condition(THD *thd,
-                        uint sql_errno,
-                        const char* sqlstate,
+  bool handle_condition(THD *,
+                        uint,
+                        const char*,
                         Sql_condition::enum_warning_level *level,
-                        const char* msg,
-                        Sql_condition ** cond_hdl)
+                        const char*,
+                        Sql_condition ** cond_hdl) override
   {
     *cond_hdl= NULL;
     if (*level == Sql_condition::WARN_LEVEL_ERROR)
@@ -2357,12 +2357,12 @@ public:
 
 struct Suppress_warnings_error_handler : public Internal_error_handler
 {
-  bool handle_condition(THD *thd,
-                        uint sql_errno,
-                        const char *sqlstate,
+  bool handle_condition(THD *,
+                        uint,
+                        const char *,
                         Sql_condition::enum_warning_level *level,
-                        const char *msg,
-                        Sql_condition **cond_hdl)
+                        const char *,
+                        Sql_condition **) override
   {
     return *level == Sql_condition::WARN_LEVEL_WARN;
   }
@@ -4208,7 +4208,7 @@ public:
   enter_cond(mysql_cond_t *cond, mysql_mutex_t* mutex,
              const PSI_stage_info *stage, PSI_stage_info *old_stage,
              const char *src_function, const char *src_file,
-             int src_line)
+             int src_line) override
   {
     mysql_mutex_assert_owner(mutex);
     mysys_var->current_mutex = mutex;
@@ -4220,7 +4220,7 @@ public:
   }
   inline void exit_cond(const PSI_stage_info *stage,
                         const char *src_function, const char *src_file,
-                        int src_line)
+                        int src_line) override
   {
     /*
       Putting the mutex unlock in thd->exit_cond() ensures that
@@ -4237,8 +4237,8 @@ public:
     mysql_mutex_unlock(&mysys_var->mutex);
     return;
   }
-  virtual int is_killed() { return killed; }
-  virtual THD* get_thd() { return this; }
+  int is_killed() override { return killed; }
+  THD* get_thd() override { return this; }
 
   /**
     A callback to the server internals that is used to address
@@ -4263,8 +4263,8 @@ public:
     @retval  TRUE  if the thread was woken up
     @retval  FALSE otherwise.
    */
-  virtual bool notify_shared_lock(MDL_context_owner *ctx_in_use,
-                                  bool needs_thr_lock_abort);
+  bool notify_shared_lock(MDL_context_owner *ctx_in_use,
+                          bool needs_thr_lock_abort) override;
 
   // End implementation of MDL_context_owner interface.
 
@@ -5083,7 +5083,7 @@ public:
     */
     return Lex_ident_db_normalized(ident);
   }
-  /* Get db name or "". Use for printing current db */
+  /* Get db name or "". */
   const char *get_db()
   { return safe_str(db.str); }
 
@@ -5300,7 +5300,7 @@ public:
 
 public:
   /** Overloaded to guard query/query_length fields */
-  virtual void set_statement(Statement *stmt);
+  void set_statement(Statement *stmt) override;
   inline void set_command(enum enum_server_command command)
   {
     DBUG_ASSERT(command != COM_SLEEP);
@@ -6296,7 +6296,7 @@ public:
   TABLE *dst_table; /* table to write into */
 
   /* The following is called in the child thread: */
-  int send_data(List<Item> &items);
+  int send_data(List<Item> &items) override;
 };
 
 
@@ -6310,7 +6310,7 @@ class select_result_text_buffer : public select_result_sink
 {
 public:
   select_result_text_buffer(THD *thd_arg): select_result_sink(thd_arg) {}
-  int send_data(List<Item> &items);
+  int send_data(List<Item> &items) override;
   bool send_result_set_metadata(List<Item> &fields, uint flag);
 
   void save_to(String *res);
@@ -6338,9 +6338,9 @@ public:
     DBUG_PRINT("enter", ("this %p", this));
     DBUG_VOID_RETURN;
   }              /* Remove gcc warning */
-  uint field_count(List<Item> &fields) const { return 0; }
-  bool send_result_set_metadata(List<Item> &fields, uint flag) { return FALSE; }
-  select_result_interceptor *result_interceptor() { return this; }
+  uint field_count(List<Item> &fields) const override { return 0; }
+  bool send_result_set_metadata(List<Item> &fields, uint flag) override { return FALSE; }
+  select_result_interceptor *result_interceptor() override { return this; }
 
   /*
     Instruct the object to not call my_ok(). Client output will be handled
@@ -6410,10 +6410,10 @@ private:
     uint get_field_count() { return field_count; }
     void set_spvar_list(List<sp_variable> *vars) { spvar_list= vars; }
 
-    virtual bool send_eof() { return FALSE; }
-    virtual int send_data(List<Item> &items);
-    virtual int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-    virtual bool view_structure_only() const { return m_view_structure_only; }
+    bool send_eof() override { return FALSE; }
+    int send_data(List<Item> &items) override;
+    int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
+    bool view_structure_only() const override { return m_view_structure_only; }
 };
 
 public:
@@ -6467,13 +6467,13 @@ class select_send :public select_result {
 public:
   select_send(THD *thd_arg):
     select_result(thd_arg), is_result_set_started(FALSE) {}
-  bool send_result_set_metadata(List<Item> &list, uint flags);
-  int send_data(List<Item> &items);
-  bool send_eof();
-  virtual bool check_simple_select() const { return FALSE; }
-  void abort_result_set();
-  virtual void cleanup();
-  select_result_interceptor *result_interceptor() { return NULL; }
+  bool send_result_set_metadata(List<Item> &list, uint flags) override;
+  int send_data(List<Item> &items) override;
+  bool send_eof() override;
+  bool check_simple_select() const override { return FALSE; }
+  void abort_result_set() override;
+  void cleanup() override;
+  select_result_interceptor *result_interceptor() override { return NULL; }
 };
 
 
@@ -6485,9 +6485,9 @@ public:
 
 class select_send_analyze : public select_send
 {
-  bool send_result_set_metadata(List<Item> &list, uint flags) { return 0; }
-  bool send_eof() { return 0; }
-  void abort_result_set() {}
+  bool send_result_set_metadata(List<Item> &list, uint flags) override { return 0; }
+  bool send_eof() override { return 0; }
+  void abort_result_set() override {}
 public:
   select_send_analyze(THD *thd_arg): select_send(thd_arg) {}
 };
@@ -6506,8 +6506,8 @@ public:
     select_result_interceptor(thd_arg), exchange(ex), file(-1),row_count(0L)
   { path[0]=0; }
   ~select_to_file();
-  bool send_eof();
-  void cleanup();
+  bool send_eof() override;
+  void cleanup() override;
 };
 
 
@@ -6547,16 +6547,16 @@ class select_export :public select_to_file {
 public:
   select_export(THD *thd_arg, sql_exchange *ex): select_to_file(thd_arg, ex) {}
   ~select_export();
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-  int send_data(List<Item> &items);
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
+  int send_data(List<Item> &items) override;
 };
 
 
 class select_dump :public select_to_file {
 public:
   select_dump(THD *thd_arg, sql_exchange *ex): select_to_file(thd_arg, ex) {}
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-  int send_data(List<Item> &items);
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
+  int send_data(List<Item> &items) override;
 };
 
 
@@ -6574,17 +6574,17 @@ class select_insert :public select_result_interceptor {
                 List<Item> *update_values, enum_duplicates duplic,
                 bool ignore, select_result *sel_ret_list);
   ~select_insert();
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-  virtual int prepare2(JOIN *join);
-  virtual int send_data(List<Item> &items);
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
+  int prepare2(JOIN *join) override;
+  int send_data(List<Item> &items) override;
   virtual bool store_values(List<Item> &values);
   virtual bool can_rollback_data() { return 0; }
   bool prepare_eof();
   bool send_ok_packet();
-  bool send_eof();
-  virtual void abort_result_set();
+  bool send_eof() override;
+  void abort_result_set() override;
   /* not implemented: select_insert is never re-used in prepared statements */
-  void cleanup();
+  void cleanup() override;
 };
 
 
@@ -6619,18 +6619,18 @@ public:
       bzero(&ddl_log_state_create, sizeof(ddl_log_state_create));
       bzero(&ddl_log_state_rm, sizeof(ddl_log_state_rm));
     }
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
 
   int binlog_show_create_table(TABLE **tables, uint count);
-  bool store_values(List<Item> &values);
-  bool send_eof();
-  virtual void abort_result_set();
-  virtual bool can_rollback_data() { return 1; }
+  bool store_values(List<Item> &values) override;
+  bool send_eof() override;
+  void abort_result_set() override;
+  bool can_rollback_data() override { return 1; }
 
   // Needed for access from local class MY_HOOKS in prepare(), since thd is proteted.
   const THD *get_thd(void) { return thd; }
   const HA_CREATE_INFO *get_create_info() { return create_info; };
-  int prepare2(JOIN *join) { return 0; }
+  int prepare2(JOIN *join) override { return 0; }
 
 private:
   TABLE *create_table_from_items(THD *thd,
@@ -6793,7 +6793,7 @@ public:
     init();
     tmp_table_param.init();
   }
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
   /**
     Do prepare() and prepare2() if they have been postponed until
     column type information is computed (used by select_union_direct).
@@ -6804,13 +6804,13 @@ public:
   */
   virtual bool postponed_prepare(List<Item> &types)
   { return false; }
-  int send_data(List<Item> &items);
+  int send_data(List<Item> &items) override;
   int write_record();
   int update_counter(Field *counter, longlong value);
   int delete_record();
-  bool send_eof();
+  bool send_eof() override;
   virtual bool flush();
-  void cleanup();
+  void cleanup() override;
   virtual bool create_result_table(THD *thd, List<Item> *column_types,
                                    bool is_distinct, ulonglong options,
                                    const LEX_CSTRING *alias,
@@ -6937,11 +6937,11 @@ public:
     curr_op_type(UNSPECIFIED)
   {
   };
-  int send_data(List<Item> &items);
-  void change_select();
+  int send_data(List<Item> &items) override;
+  void change_select() override;
   int unfold_record(ha_rows cnt);
-  bool send_eof();
-  bool force_enable_index_if_needed()
+  bool send_eof() override;
+  bool force_enable_index_if_needed() override
   {
     is_index_enabled= true;
     return true;
@@ -6998,15 +6998,15 @@ class select_union_recursive :public select_unit
       row_counter(0)
   { incr_table_param.init(); };
 
-  int send_data(List<Item> &items);
+  int send_data(List<Item> &items) override;
   bool create_result_table(THD *thd, List<Item> *column_types,
                            bool is_distinct, ulonglong options,
                            const LEX_CSTRING *alias,
                            bool bit_fields_as_long,
                            bool create_table,
                            bool keep_row_order,
-                           uint hidden);
-  void cleanup();
+                           uint hidden) override;
+  void cleanup() override;
 };
 
 /**
@@ -7053,30 +7053,30 @@ public:
     done_send_result_set_metadata(false), done_initialize_tables(false),
     limit_found_rows(0)
     { send_records= 0; }
-  bool change_result(select_result *new_result);
-  uint field_count(List<Item> &fields) const
+  bool change_result(select_result *new_result) override;
+  uint field_count(List<Item> &fields) const override
   {
     // Only called for top-level select_results, usually select_send
     DBUG_ASSERT(false); /* purecov: inspected */
     return 0; /* purecov: inspected */
   }
-  bool postponed_prepare(List<Item> &types);
-  bool send_result_set_metadata(List<Item> &list, uint flags);
-  int send_data(List<Item> &items);
-  bool initialize_tables (JOIN *join);
-  bool send_eof();
-  bool flush() { return false; }
-  bool check_simple_select() const
+  bool postponed_prepare(List<Item> &types) override;
+  bool send_result_set_metadata(List<Item> &list, uint flags) override;
+  int send_data(List<Item> &items) override;
+  bool initialize_tables (JOIN *join) override;
+  bool send_eof() override;
+  bool flush() override { return false; }
+  bool check_simple_select() const override
   {
     /* Only called for top-level select_results, usually select_send */
     DBUG_ASSERT(false); /* purecov: inspected */
     return false; /* purecov: inspected */
   }
-  void abort_result_set()
+  void abort_result_set() override
   {
     result->abort_result_set(); /* purecov: inspected */
   }
-  void cleanup()
+  void cleanup() override
   {
     send_records= 0;
   }
@@ -7094,7 +7094,11 @@ public:
     // EXPLAIN should never output to a select_union_direct
     DBUG_ASSERT(false); /* purecov: inspected */
   }
+#ifdef EMBEDDED_LIBRARY
+  void begin_dataset() override
+#else
   void begin_dataset()
+#endif
   {
     // Only called for sp_cursor::Select_fetch_into_spvars
     DBUG_ASSERT(false); /* purecov: inspected */
@@ -7110,8 +7114,8 @@ protected:
 public:
   select_subselect(THD *thd_arg, Item_subselect *item_arg):
     select_result_interceptor(thd_arg), item(item_arg) {}
-  int send_data(List<Item> &items)=0;
-  bool send_eof() { return 0; };
+  int send_data(List<Item> &items) override=0;
+  bool send_eof() override { return 0; };
 };
 
 /* Single value subselect interface class */
@@ -7121,7 +7125,7 @@ public:
   select_singlerow_subselect(THD *thd_arg, Item_subselect *item_arg):
     select_subselect(thd_arg, item_arg)
   {}
-  int send_data(List<Item> &items);
+  int send_data(List<Item> &items) override;
 };
 
 
@@ -7172,10 +7176,10 @@ public:
                            bool bit_fields_as_long,
                            bool create_table,
                            bool keep_row_order,
-                           uint hidden);
+                           uint hidden) override;
   bool init_result_table(ulonglong select_options);
-  int send_data(List<Item> &items);
-  void cleanup();
+  int send_data(List<Item> &items) override;
+  void cleanup() override;
   ha_rows get_null_count_of_col(uint idx)
   {
     DBUG_ASSERT(idx < table->s->fields);
@@ -7208,8 +7212,8 @@ public:
                                   bool mx, bool all):
     select_subselect(thd_arg, item_arg), cache(0), fmax(mx), is_all(all)
   {}
-  void cleanup();
-  int send_data(List<Item> &items);
+  void cleanup() override;
+  int send_data(List<Item> &items) override;
   bool cmp_real();
   bool cmp_int();
   bool cmp_decimal();
@@ -7224,7 +7228,7 @@ class select_exists_subselect :public select_subselect
 public:
   select_exists_subselect(THD *thd_arg, Item_subselect *item_arg):
     select_subselect(thd_arg, item_arg) {}
-  int send_data(List<Item> &items);
+  int send_data(List<Item> &items) override;
 };
 
 
@@ -7491,15 +7495,15 @@ public:
 public:
   multi_delete(THD *thd_arg, TABLE_LIST *dt, uint num_of_tables);
   ~multi_delete();
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-  int send_data(List<Item> &items);
-  bool initialize_tables (JOIN *join);
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
+  int send_data(List<Item> &items) override;
+  bool initialize_tables (JOIN *join) override;
   int do_deletes();
   int do_table_deletes(TABLE *table, SORT_INFO *sort_info, bool ignore);
-  bool send_eof();
+  bool send_eof() override;
   inline ha_rows num_deleted() const { return deleted; }
-  virtual void abort_result_set();
-  void prepare_to_read_rows();
+  void abort_result_set() override;
+  void prepare_to_read_rows() override;
 };
 
 
@@ -7547,19 +7551,19 @@ public:
   ~multi_update();
   bool init(THD *thd);
   bool init_for_single_table(THD *thd);
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-  int send_data(List<Item> &items);
-  bool initialize_tables (JOIN *join);
-  int prepare2(JOIN *join);
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
+  int send_data(List<Item> &items) override;
+  bool initialize_tables (JOIN *join) override;
+  int prepare2(JOIN *join) override;
   int  do_updates();
-  bool send_eof();
+  bool send_eof() override;
   inline ha_rows num_found() const { return found; }
   inline ha_rows num_updated() const { return updated; }
   inline void set_found (ha_rows n) { found= n; }
   inline void set_updated (ha_rows n) { updated= n; }
-  virtual void abort_result_set();
-  void update_used_tables();
-  void prepare_to_read_rows();
+  virtual void abort_result_set() override;
+  void update_used_tables() override;
+  void prepare_to_read_rows() override;
 };
 
 class my_var_sp;
@@ -7591,8 +7595,8 @@ public:
       m_rcontext_handler(rcontext_handler),
       m_type_handler(type_handler), offset(o), sp(s) { }
   ~my_var_sp() = default;
-  bool set(THD *thd, Item *val);
-  my_var_sp *get_my_var_sp() { return this; }
+  bool set(THD *thd, Item *val) override;
+  my_var_sp *get_my_var_sp() override { return this; }
   const Type_handler *type_handler() const
   { return m_type_handler; }
   sp_rcontext *get_rcontext(sp_rcontext *local_ctx) const;
@@ -7613,7 +7617,7 @@ public:
               &type_handler_double/*Not really used*/, s),
     m_field_offset(field_idx)
   { }
-  bool set(THD *thd, Item *val);
+  bool set(THD *thd, Item *val) override;
 };
 
 class my_var_user: public my_var {
@@ -7621,7 +7625,7 @@ public:
   my_var_user(const LEX_CSTRING *j)
     : my_var(j, SESSION_VAR) { }
   ~my_var_user() = default;
-  bool set(THD *thd, Item *val);
+  bool set(THD *thd, Item *val) override;
 };
 
 class select_dumpvar :public select_result_interceptor {
@@ -7634,11 +7638,11 @@ public:
    :select_result_interceptor(thd_arg), row_count(0), m_var_sp_row(NULL)
   { var_list.empty(); }
   ~select_dumpvar() = default;
-  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-  int send_data(List<Item> &items);
-  bool send_eof();
-  virtual bool check_simple_select() const;
-  void cleanup();
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
+  int send_data(List<Item> &items) override;
+  bool send_eof() override;
+  bool check_simple_select() const override;
+  void cleanup() override;
 };
 
 /* Bits in sql_command_flags */
diff --git a/sql/sql_cmd.h b/sql/sql_cmd.h
index bedd7e118f0..baa779e9610 100644
--- a/sql/sql_cmd.h
+++ b/sql/sql_cmd.h
@@ -311,16 +311,16 @@ public:
     @param thd  global context the processed statement
     @returns false on success, true on error
   */
-  virtual bool prepare(THD *thd);
+  bool prepare(THD *thd) override;
 
   /**
     Execute the processed statement once
     @param thd  global context the processed statement
     @returns false on success, true on error
   */
-  virtual bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
-  virtual bool is_dml() const { return true; }
+  bool is_dml() const override { return true; }
 
   select_result *get_result() { return result; }
 
@@ -410,9 +410,9 @@ public:
     :show_all_slaves_status(status_all)
   {}
 
-  enum_sql_command sql_command_code() const { return SQLCOM_SHOW_SLAVE_STAT; }
+  enum_sql_command sql_command_code() const override { return SQLCOM_SHOW_SLAVE_STAT; }
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
   bool is_show_all_slaves_stat() { return show_all_slaves_status; }
 };
 
@@ -421,20 +421,20 @@ class Sql_cmd_create_table_like: public Sql_cmd,
                                  public Storage_engine_name
 {
 public:
-  Storage_engine_name *option_storage_engine_name() { return this; }
-  bool execute(THD *thd);
+  Storage_engine_name *option_storage_engine_name() override { return this; }
+  bool execute(THD *thd) override;
 };
 
 class Sql_cmd_create_table: public Sql_cmd_create_table_like
 {
 public:
-  enum_sql_command sql_command_code() const { return SQLCOM_CREATE_TABLE; }
+  enum_sql_command sql_command_code() const override { return SQLCOM_CREATE_TABLE; }
 };
 
 class Sql_cmd_create_sequence: public Sql_cmd_create_table_like
 {
 public:
-  enum_sql_command sql_command_code() const { return SQLCOM_CREATE_SEQUENCE; }
+  enum_sql_command sql_command_code() const override { return SQLCOM_CREATE_SEQUENCE; }
 };
 
 
@@ -458,9 +458,9 @@ public:
     @param thd the current thread.
     @return false on success.
   */
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_CALL;
   }
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc
index 999c6961cc7..ccbf2f35a30 100644
--- a/sql/sql_cursor.cc
+++ b/sql/sql_cursor.cc
@@ -49,15 +49,15 @@ public:
   Materialized_cursor(select_result *result, TABLE *table);
 
   int send_result_set_metadata(THD *thd, List<Item> &send_result_set_metadata);
-  virtual bool is_open() const { return table != 0; }
-  virtual int open(JOIN *join __attribute__((unused)));
-  virtual void fetch(ulong num_rows);
-  virtual void close();
-  bool export_structure(THD *thd, Row_definition_list *defs)
+  bool is_open() const override { return table != 0; }
+  int open(JOIN *join __attribute__((unused))) override;
+  void fetch(ulong num_rows) override;
+  void close() override;
+  bool export_structure(THD *thd, Row_definition_list *defs) override
   {
     return table->export_structure(thd, defs);
   }
-  virtual ~Materialized_cursor();
+  ~Materialized_cursor() override;
 
   void on_table_fill_finished();
 };
@@ -79,9 +79,9 @@ public:
   Materialized_cursor *materialized_cursor;
   Select_materialize(THD *thd_arg, select_result *result_arg):
     select_unit(thd_arg), result(result_arg), materialized_cursor(0) {}
-  virtual bool send_result_set_metadata(List<Item> &list, uint flags);
-  bool send_eof() { return false; }
-  bool view_structure_only() const
+  bool send_result_set_metadata(List<Item> &list, uint flags) override;
+  bool send_eof() override { return false; }
+  bool view_structure_only() const override
   {
     return result->view_structure_only();
   }
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index f4e3be0aaa7..88c93f829b1 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -536,6 +536,12 @@ bool Sql_cmd_delete::delete_from_single_table(THD *thd)
     if (thd->binlog_for_noop_dml(transactional_table))
       DBUG_RETURN(1);
 
+    if (!thd->lex->current_select->leaf_tables_saved)
+    {
+      thd->lex->current_select->save_leaf_tables(thd);
+      thd->lex->current_select->leaf_tables_saved= true;
+    }
+
     my_ok(thd, 0);
     DBUG_RETURN(0);				// Nothing to delete
   }
@@ -908,10 +914,10 @@ cleanup:
     query_cache_invalidate3(thd, table_list, 1);
   }
 
-  if (thd->lex->current_select->first_cond_optimization)
+  if (!thd->lex->current_select->leaf_tables_saved)
   {
     thd->lex->current_select->save_leaf_tables(thd);
-    thd->lex->current_select->first_cond_optimization= 0;
+    thd->lex->current_select->leaf_tables_saved= true;
   }
 
   delete deltempfile;
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
index edd57cb5eb5..b1944effbec 100644
--- a/sql/sql_explain.cc
+++ b/sql/sql_explain.cc
@@ -1933,6 +1933,8 @@ static void trace_engine_stats(handler *file, Json_writer *writer)
     if (hs->pages_read_time)
       writer->add_member("pages_read_time_ms").
         add_double(hs->pages_read_time * 1000. / timer_tracker_frequency());
+    if (hs->pages_prefetched)
+      writer->add_member("pages_prefetch_read_count").add_ull(hs->pages_prefetched);
     if (hs->undo_records_read)
       writer->add_member("old_rows_read").add_ull(hs->undo_records_read);
     writer->end_object();
diff --git a/sql/sql_explain.h b/sql/sql_explain.h
index 6f9ee2bab2d..9c128359e07 100644
--- a/sql/sql_explain.h
+++ b/sql/sql_explain.h
@@ -159,21 +159,21 @@ class Explain_table_access;
 class Explain_basic_join : public Explain_node
 {
 public:
-  enum explain_node_type get_type() { return EXPLAIN_BASIC_JOIN; }
+  enum explain_node_type get_type() override { return EXPLAIN_BASIC_JOIN; }
   
   Explain_basic_join(MEM_ROOT *root) : Explain_node(root), join_tabs(NULL) {}
   ~Explain_basic_join();
 
   bool add_table(Explain_table_access *tab, Explain_query *query);
 
-  uint get_select_id() { return select_id; }
+  uint get_select_id() override { return select_id; }
 
   uint select_id;
 
   int print_explain(Explain_query *query, select_result_sink *output,
-                    uint8 explain_flags, bool is_analyze);
+                    uint8 explain_flags, bool is_analyze) override;
   void print_explain_json(Explain_query *query, Json_writer *writer, 
-                          bool is_analyze);
+                          bool is_analyze) override;
 
   void print_explain_json_interns(Explain_query *query, Json_writer *writer,
                                   bool is_analyze);
@@ -203,7 +203,7 @@ class Explain_aggr_node;
 class Explain_select : public Explain_basic_join
 {
 public:
-  enum explain_node_type get_type() { return EXPLAIN_SELECT; }
+  enum explain_node_type get_type() override { return EXPLAIN_SELECT; }
 
   Explain_select(MEM_ROOT *root, bool is_analyze) : 
   Explain_basic_join(root),
@@ -260,9 +260,9 @@ public:
   Explain_aggr_node* aggr_tree;
 
   int print_explain(Explain_query *query, select_result_sink *output, 
-                    uint8 explain_flags, bool is_analyze);
+                    uint8 explain_flags, bool is_analyze) override;
   void print_explain_json(Explain_query *query, Json_writer *writer, 
-                          bool is_analyze);
+                          bool is_analyze) override;
   
   Table_access_tracker *get_using_temporary_read_tracker()
   {
@@ -299,7 +299,7 @@ class Explain_aggr_filesort : public Explain_aggr_node
   List<Item> sort_items;
   List<ORDER::enum_order> sort_directions;
 public:
-  enum_explain_aggr_node_type get_type() { return AGGR_OP_FILESORT; }
+  enum_explain_aggr_node_type get_type() override { return AGGR_OP_FILESORT; }
   Filesort_tracker tracker;
 
   Explain_aggr_filesort(MEM_ROOT *mem_root, bool is_analyze, 
@@ -311,20 +311,20 @@ public:
 class Explain_aggr_tmp_table : public Explain_aggr_node
 {
 public:
-  enum_explain_aggr_node_type get_type() { return AGGR_OP_TEMP_TABLE; }
+  enum_explain_aggr_node_type get_type() override { return AGGR_OP_TEMP_TABLE; }
 };
 
 class Explain_aggr_remove_dups : public Explain_aggr_node
 {
 public:
-  enum_explain_aggr_node_type get_type() { return AGGR_OP_REMOVE_DUPLICATES; }
+  enum_explain_aggr_node_type get_type() override { return AGGR_OP_REMOVE_DUPLICATES; }
 };
 
 class Explain_aggr_window_funcs : public Explain_aggr_node
 {
   List<Explain_aggr_filesort> sorts;
 public:
-  enum_explain_aggr_node_type get_type() { return AGGR_OP_WINDOW_FUNCS; }
+  enum_explain_aggr_node_type get_type() override { return AGGR_OP_WINDOW_FUNCS; }
 
   void print_json_members(Json_writer *writer, bool is_analyze);
   friend class Window_funcs_computation;
@@ -352,10 +352,10 @@ public:
     fake_select_lex_explain(root, is_analyze)
   {}
 
-  enum explain_node_type get_type() { return EXPLAIN_UNION; }
+  enum explain_node_type get_type() override { return EXPLAIN_UNION; }
   unit_common_op operation;
 
-  uint get_select_id()
+  uint get_select_id() override
   {
     DBUG_ASSERT(union_members.elements() > 0);
     return union_members.at(0);
@@ -377,10 +377,10 @@ public:
   {
     union_members.append(select_no);
   }
-  int print_explain(Explain_query *query, select_result_sink *output, 
-                    uint8 explain_flags, bool is_analyze);
+  int print_explain(Explain_query *query, select_result_sink *output,
+                    uint8 explain_flags, bool is_analyze) override;
   void print_explain_json(Explain_query *query, Json_writer *writer,
-                          bool is_analyze);
+                          bool is_analyze) override;
   void print_explain_json_regular(Explain_query *query, Json_writer *writer,
                           bool is_analyze);
   void print_explain_json_pushed_down(Explain_query *query,
@@ -954,8 +954,8 @@ public:
     handler_for_stats(NULL)
   {}
 
-  virtual enum explain_node_type get_type() { return EXPLAIN_UPDATE; }
-  virtual uint get_select_id() { return 1; /* always root */ }
+  enum explain_node_type get_type() override { return EXPLAIN_UPDATE; }
+  uint get_select_id() override { return 1; /* always root */ }
 
   const char *select_type;
 
@@ -1014,10 +1014,10 @@ public:
   /* The same as  Explain_table_access::handler_for_stats */
   handler *handler_for_stats;
 
-  virtual int print_explain(Explain_query *query, select_result_sink *output, 
-                            uint8 explain_flags, bool is_analyze);
-  virtual void print_explain_json(Explain_query *query, Json_writer *writer,
-                                  bool is_analyze);
+  int print_explain(Explain_query *query, select_result_sink *output,
+                    uint8 explain_flags, bool is_analyze) override;
+  void print_explain_json(Explain_query *query, Json_writer *writer,
+                          bool is_analyze) override;
 };
 
 
@@ -1037,13 +1037,13 @@ public:
 
   StringBuffer<64> table_name;
 
-  enum explain_node_type get_type() { return EXPLAIN_INSERT; }
-  uint get_select_id() { return 1; /* always root */ }
+  enum explain_node_type get_type() override { return EXPLAIN_INSERT; }
+  uint get_select_id() override { return 1; /* always root */ }
 
-  int print_explain(Explain_query *query, select_result_sink *output, 
-                    uint8 explain_flags, bool is_analyze);
-  void print_explain_json(Explain_query *query, Json_writer *writer, 
-                          bool is_analyze);
+  int print_explain(Explain_query *query, select_result_sink *output,
+                    uint8 explain_flags, bool is_analyze) override;
+  void print_explain_json(Explain_query *query, Json_writer *writer,
+                          bool is_analyze) override;
 };
 
 
@@ -1064,13 +1064,13 @@ public:
   */
   bool deleting_all_rows;
 
-  virtual enum explain_node_type get_type() { return EXPLAIN_DELETE; }
-  virtual uint get_select_id() { return 1; /* always root */ }
+  enum explain_node_type get_type() override { return EXPLAIN_DELETE; }
+  uint get_select_id() override { return 1; /* always root */ }
 
-  virtual int print_explain(Explain_query *query, select_result_sink *output, 
-                            uint8 explain_flags, bool is_analyze);
-  virtual void print_explain_json(Explain_query *query, Json_writer *writer,
-                                  bool is_analyze);
+  int print_explain(Explain_query *query, select_result_sink *output, 
+                    uint8 explain_flags, bool is_analyze) override;
+  void print_explain_json(Explain_query *query, Json_writer *writer,
+                          bool is_analyze) override;
 };
 
 
diff --git a/sql/sql_expression_cache.h b/sql/sql_expression_cache.h
index 88436837a2d..fd5dffc0e5a 100644
--- a/sql/sql_expression_cache.h
+++ b/sql/sql_expression_cache.h
@@ -113,19 +113,19 @@ class Expression_cache_tmptable :public Expression_cache
 public:
   Expression_cache_tmptable(THD *thd, List<Item> &dependants, Item *value);
   virtual ~Expression_cache_tmptable();
-  virtual result check_value(Item **value);
-  virtual my_bool put_value(Item *value);
+  result check_value(Item **value) override;
+  my_bool put_value(Item *value) override;
 
-  void print(String *str, enum_query_type query_type);
-  bool is_inited() { return inited; };
-  void init();
+  void print(String *str, enum_query_type query_type) override;
+  bool is_inited() override { return inited; };
+  void init() override;
 
   void set_tracker(Expression_cache_tracker *st)
   {
     tracker= st;
     update_tracker();
   }
-  virtual void update_tracker()
+  void update_tracker() override
   {
     if (tracker)
     {
diff --git a/sql/sql_get_diagnostics.h b/sql/sql_get_diagnostics.h
index efe526d7c61..977d7675618 100644
--- a/sql/sql_get_diagnostics.h
+++ b/sql/sql_get_diagnostics.h
@@ -39,12 +39,12 @@ public:
     : m_info(info)
   {}
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_GET_DIAGNOSTICS;
   }
 
-  virtual bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
 private:
   /** The information to be obtained. */
@@ -223,7 +223,7 @@ public:
   {}
 
   /** Obtain statement information in the context of a diagnostics area. */
-  bool aggregate(THD *thd, const Diagnostics_area *da);
+  bool aggregate(THD *thd, const Diagnostics_area *da) override;
 
 private:
   /* List of statement information items. */
@@ -302,7 +302,7 @@ public:
   {}
 
   /** Obtain condition information in the context of a diagnostics area. */
-  bool aggregate(THD *thd, const Diagnostics_area *da);
+  bool aggregate(THD *thd, const Diagnostics_area *da) override;
 
 private:
   /**
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 695d1f98f34..dcba1eae21d 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1063,10 +1063,19 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list,
         */
         restore_record(table,s->default_values);	// Get empty record
         table->reset_default_fields();
+        /*
+          Reset the sentinel thd->bulk_param in order not to consume the next
+          values of a bound array in case one of statement executed by
+          the trigger's body is INSERT statement.
+        */
+        void *save_bulk_param= thd->bulk_param;
+        thd->bulk_param= nullptr;
+
         if (unlikely(fill_record_n_invoke_before_triggers(thd, table, fields,
                                                           *values, 0,
                                                           TRG_EVENT_INSERT)))
         {
+          thd->bulk_param= save_bulk_param;
           if (values_list.elements != 1 && ! thd->is_error())
           {
             info.records++;
@@ -1080,6 +1089,7 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list,
 	  error=1;
 	  break;
         }
+        thd->bulk_param= save_bulk_param;
       }
       else
       {
@@ -1109,12 +1119,22 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list,
           }
         }
         table->reset_default_fields();
+
+        /*
+          Reset the sentinel thd->bulk_param in order not to consume the next
+          values of a bound array in case one of statement executed by
+          the trigger's body is INSERT statement.
+        */
+        void *save_bulk_param= thd->bulk_param;
+        thd->bulk_param= nullptr;
+
         if (unlikely(fill_record_n_invoke_before_triggers(thd, table,
                                                           table->
                                                           field_to_fill(),
                                                           *values, 0,
                                                           TRG_EVENT_INSERT)))
         {
+          thd->bulk_param= save_bulk_param;
           if (values_list.elements != 1 && ! thd->is_error())
 	  {
 	    info.records++;
@@ -1123,6 +1143,7 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list,
 	  error=1;
 	  break;
         }
+        thd->bulk_param= save_bulk_param;
       }
 
       /*
@@ -1394,10 +1415,10 @@ values_loop_end:
       ::my_ok(thd, info.copied + info.deleted + updated, id, buff);
   }
   thd->abort_on_warning= 0;
-  if (thd->lex->current_select->first_cond_optimization)
+  if (!thd->lex->current_select->leaf_tables_saved)
   {
     thd->lex->current_select->save_leaf_tables(thd);
-    thd->lex->current_select->first_cond_optimization= 0;
+    thd->lex->current_select->leaf_tables_saved= true;
   }
 
   my_free(readbuff);
@@ -2390,7 +2411,7 @@ public:
       forced_insert_id(0), query(query_arg), time_zone(0),
       user(0), host(0), ip(0)
     {}
-  ~delayed_row()
+  ~delayed_row() override
   {
     my_free(query.str);
     my_free(record);
@@ -2474,7 +2495,7 @@ public:
                                           TL_WRITE_LOW_PRIORITY : TL_WRITE;
     DBUG_VOID_RETURN;
   }
-  ~Delayed_insert()
+  ~Delayed_insert() override
   {
     /* The following is not really needed, but just for safety */
     delayed_row *row;
@@ -3155,13 +3176,13 @@ void kill_delayed_threads(void)
 class Delayed_prelocking_strategy : public Prelocking_strategy
 {
 public:
-  virtual bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
+  bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
                               Sroutine_hash_entry *rt, sp_head *sp,
-                              bool *need_prelocking);
-  virtual bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
-                            TABLE_LIST *table_list, bool *need_prelocking);
-  virtual bool handle_view(THD *thd, Query_tables_list *prelocking_ctx,
-                           TABLE_LIST *table_list, bool *need_prelocking);
+                              bool *need_prelocking) override;
+  bool handle_table(THD *thd, Query_tables_list *prelocking_ctx,
+                            TABLE_LIST *table_list, bool *need_prelocking) override;
+  bool handle_view(THD *thd, Query_tables_list *prelocking_ctx,
+                           TABLE_LIST *table_list, bool *need_prelocking) override;
 };
 
 
diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h
index d2d2e1a1c01..bfed7afd4fb 100644
--- a/sql/sql_join_cache.h
+++ b/sql/sql_join_cache.h
@@ -943,7 +943,7 @@ protected:
   }
   
   /* Get the total length of all prefixes of a record in hashed join buffer */ 
-  uint get_prefix_length() 
+  uint get_prefix_length() override 
   { 
     return base_prefix_length + get_size_of_rec_offset();
   }
@@ -952,13 +952,13 @@ protected:
     Get maximum size of the additional space per record used for
     the hash table with record keys
   */
-  uint get_max_key_addon_space_per_record();
+  uint get_max_key_addon_space_per_record() override;
 
   /* 
     Calculate how much space in the buffer would not be occupied by
     records, key entries and additional memory for the MMR buffer.
   */ 
-  size_t rem_space() 
+  size_t rem_space() override 
   { 
     return MY_MAX(last_key_entry-end_pos-aux_buff_size,0);
   }
@@ -967,25 +967,25 @@ protected:
     Calculate how much space is taken by allocation of the key
     entry for a record in the join buffer
   */
-  uint extra_key_length() { return key_entry_length; }
+  uint extra_key_length() override { return key_entry_length; }
 
   /* 
     Skip record from a hashed join buffer if its match flag
     is set to MATCH_FOUND
   */
-  bool skip_if_matched();
+  bool skip_if_matched() override;
 
   /*
     Skip record from a hashed join buffer if its match flag setting 
     commands to do so
   */
-  bool skip_if_not_needed_match();
+  bool skip_if_not_needed_match() override;
 
   /* Search for a key in the hash table of the join buffer */
   bool key_search(uchar *key, uint key_len, uchar **key_ref_ptr);
 
   /* Reallocate the join buffer of a hashed join cache */
-  int realloc_buffer();
+  int realloc_buffer() override;
 
   /* 
     This constructor creates an unlinked hashed join cache. The cache is to be
@@ -1006,16 +1006,16 @@ protected:
 public:
 
   /* Initialize a hashed join cache */       
-  int init(bool for_explain);
+  int init(bool for_explain) override;
 
   /* Reset the buffer of a hashed join cache for reading/writing */
-  void reset(bool for_writing);
+  void reset(bool for_writing) override;
 
   /* Add a record into the buffer of a hashed join cache */
-  bool put_record();
+  bool put_record() override;
 
   /* Read the next record from the buffer of a hashed join cache */
-  bool get_record();
+  bool get_record() override;
 
   /*
     Shall check whether all records in a key chain have 
@@ -1115,13 +1115,13 @@ private:
 
 protected:
 
-  bool prepare_look_for_matches(bool skip_last);
+  bool prepare_look_for_matches(bool skip_last) override;
 
-  uchar *get_next_candidate_for_match();
+  uchar *get_next_candidate_for_match() override;
 
-  bool skip_next_candidate_for_match(uchar *rec_ptr);
+  bool skip_next_candidate_for_match(uchar *rec_ptr) override;
 
-  void read_next_candidate_for_match(uchar *rec_ptr);
+  void read_next_candidate_for_match(uchar *rec_ptr) override;
 
 public:
 
@@ -1142,11 +1142,11 @@ public:
     :JOIN_CACHE(j, tab, prev) {}
 
   /* Initialize the BNL cache */       
-  int init(bool for_explain);
+  int init(bool for_explain) override;
 
-  enum Join_algorithm get_join_alg() { return BNL_JOIN_ALG; }
+  enum Join_algorithm get_join_alg() override { return BNL_JOIN_ALG; }
 
-  bool is_key_access() { return FALSE; }
+  bool is_key_access() override { return FALSE; }
 
 };
 
@@ -1182,13 +1182,13 @@ protected:
   */
   uchar *get_matching_chain_by_join_key();
 
-  bool prepare_look_for_matches(bool skip_last);
+  bool prepare_look_for_matches(bool skip_last) override;
 
-  uchar *get_next_candidate_for_match();
+  uchar *get_next_candidate_for_match() override;
 
-  bool skip_next_candidate_for_match(uchar *rec_ptr);
+  bool skip_next_candidate_for_match(uchar *rec_ptr) override;
 
-  void read_next_candidate_for_match(uchar *rec_ptr);
+  void read_next_candidate_for_match(uchar *rec_ptr) override;
 
 public:
 
@@ -1209,11 +1209,11 @@ public:
     : JOIN_CACHE_HASHED(j, tab, prev) {}
 
   /* Initialize the BNLH cache */       
-  int init(bool for_explain);
+  int init(bool for_explain) override;
 
-  enum Join_algorithm get_join_alg() { return BNLH_JOIN_ALG; }
+  enum Join_algorithm get_join_alg() override { return BNLH_JOIN_ALG; }
 
-  bool is_key_access() { return TRUE; }
+  bool is_key_access() override { return TRUE; }
 
 };
 
@@ -1256,11 +1256,11 @@ public:
   JOIN_TAB_SCAN_MRR(JOIN *j, JOIN_TAB *tab, uint flags, RANGE_SEQ_IF rs_funcs)
     :JOIN_TAB_SCAN(j, tab), range_seq_funcs(rs_funcs), mrr_mode(flags) {}
 
-  uint aux_buffer_incr(size_t recno);
+  uint aux_buffer_incr(size_t recno) override;
 
-  int open();
+  int open() override;
  
-  int next();
+  int next() override;
 
   friend class JOIN_CACHE_BKA; /* it needs to add an mrr_mode flag after JOIN_CACHE::init() call */
 };
@@ -1296,26 +1296,26 @@ protected:
     Get the number of ranges in the cache buffer passed to the MRR
     interface. For each record its own range is passed.
   */
-  uint get_number_of_ranges_for_mrr() { return (uint)records; }
+  uint get_number_of_ranges_for_mrr() override { return (uint)records; }
 
  /*
    Setup the MRR buffer as the space between the last record put
    into the join buffer and the very end of the join buffer 
  */
-  int setup_aux_buffer(HANDLER_BUFFER &aux_buff)
+  int setup_aux_buffer(HANDLER_BUFFER &aux_buff) override
   {
     aux_buff.buffer= end_pos;
     aux_buff.buffer_end= buff+buff_size;
     return 0;
   }
 
-  bool prepare_look_for_matches(bool skip_last);
+  bool prepare_look_for_matches(bool skip_last) override;
 
-  uchar *get_next_candidate_for_match();
+  uchar *get_next_candidate_for_match() override;
 
-  bool skip_next_candidate_for_match(uchar *rec_ptr);
+  bool skip_next_candidate_for_match(uchar *rec_ptr) override;
 
-  void read_next_candidate_for_match(uchar *rec_ptr);
+  void read_next_candidate_for_match(uchar *rec_ptr) override;
 
 public:
 
@@ -1341,14 +1341,14 @@ public:
     :JOIN_CACHE(bka->join, bka->join_tab, bka->prev_cache),
       mrr_mode(bka->mrr_mode)  {}
 
-  uchar **get_curr_association_ptr() { return &curr_association; }
+  uchar **get_curr_association_ptr() override { return &curr_association; }
 
   /* Initialize the BKA cache */       
-  int init(bool for_explain);
+  int init(bool for_explain) override;
 
-  enum Join_algorithm get_join_alg() { return BKA_JOIN_ALG; }
+  enum Join_algorithm get_join_alg() override { return BKA_JOIN_ALG; }
 
-  bool is_key_access() { return TRUE; }
+  bool is_key_access() override { return TRUE; }
 
   /* Get the key built over the next record from the join buffer */
   uint get_next_key(uchar **key);
@@ -1356,7 +1356,7 @@ public:
   /* Check index condition of the joined table for a record from BKA cache */
   bool skip_index_tuple(range_id_t range_info);
 
-  bool save_explain_data(EXPLAIN_BKA_TYPE *explain);
+  bool save_explain_data(EXPLAIN_BKA_TYPE *explain) override;
 };
 
 
@@ -1392,21 +1392,21 @@ private:
 
 protected:
 
-  uint get_number_of_ranges_for_mrr() { return key_entries; }
+  uint get_number_of_ranges_for_mrr() override { return key_entries; }
 
   /* 
     Initialize the MRR buffer allocating some space within the join buffer.
     The entire space between the last record put into the join buffer and the
     last key entry added to the hash table is used for the MRR buffer.
   */
-  int setup_aux_buffer(HANDLER_BUFFER &aux_buff)
+  int setup_aux_buffer(HANDLER_BUFFER &aux_buff) override
   {
     aux_buff.buffer= end_pos;
     aux_buff.buffer_end= last_key_entry;
     return 0;
   }
 
-  bool prepare_look_for_matches(bool skip_last);
+  bool prepare_look_for_matches(bool skip_last) override;
 
   /*
     The implementations of the methods
@@ -1441,15 +1441,15 @@ public:
     :JOIN_CACHE_BNLH(bkah->join, bkah->join_tab, bkah->prev_cache),
       mrr_mode(bkah->mrr_mode)  {}
 
-  uchar **get_curr_association_ptr() { return &curr_matching_chain; }
+  uchar **get_curr_association_ptr() override { return &curr_matching_chain; }
 
   /* Initialize the BKAH cache */       
-  int init(bool for_explain);
+  int init(bool for_explain) override;
 
-  enum Join_algorithm get_join_alg() { return BKAH_JOIN_ALG; }
+  enum Join_algorithm get_join_alg() override { return BKAH_JOIN_ALG; }
 
   /* Check index condition of the joined table for a record from BKAH cache */
   bool skip_index_tuple(range_id_t range_info);
 
-  bool save_explain_data(EXPLAIN_BKA_TYPE *explain);
+  bool save_explain_data(EXPLAIN_BKA_TYPE *explain) override;
 };
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index bf2d784bbbe..98fe59187be 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -3055,6 +3055,7 @@ void st_select_lex::init_query()
   first_natural_join_processing= 1;
   first_cond_optimization= 1;
   first_rownum_optimization= true;
+  leaf_tables_saved= false;
   no_wrap_view_item= 0;
   exclude_from_table_unique_test= 0;
   in_tvc= 0;
@@ -11566,6 +11567,19 @@ Item *st_select_lex::pushdown_from_having_into_where(THD *thd, Item *having)
       goto exit;
     }
   }
+
+  /*
+    Remove IMMUTABLE_FL only after all of the elements of the condition are processed.
+  */
+  it.rewind();
+  while ((item=it++))
+  {
+    if (item->walk(&Item::remove_immutable_flag_processor, 0, STOP_PTR))
+    {
+      attach_to_conds.empty();
+      goto exit;
+    }
+  }
 exit:
   thd->lex->current_select= save_curr_select;
   return having;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index be46a6d7ef0..3f4af2fa940 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1273,6 +1273,10 @@ public:
     from the method JOIN::optimize_inner.
   */
   bool first_rownum_optimization:1;
+  /**
+    Flag to guard against double initialization of leaf tables list
+  */
+  bool leaf_tables_saved:1;
   /* do not wrap view fields with Item_ref */
   bool no_wrap_view_item:1;
   /* exclude this select from check of unique_table() */
@@ -3690,6 +3694,15 @@ public:
     return (context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW);
   }
 
+  /**
+    Mark all queries in this lex structure as uncacheable for the cause given
+
+    @param cause    the reason queries are to be marked as uncacheable
+
+    Note, any cause is sufficient for st_select_lex_unit::can_be_merged() to
+    disallow query merges.
+  */
+
   inline void uncacheable(uint8 cause)
   {
     safe_to_cache_query= 0;
diff --git a/sql/sql_lifo_buffer.h b/sql/sql_lifo_buffer.h
index 2d648271898..04496ef74b8 100644
--- a/sql/sql_lifo_buffer.h
+++ b/sql/sql_lifo_buffer.h
@@ -162,22 +162,22 @@ class Forward_lifo_buffer: public Lifo_buffer
 {
   uchar *pos;
 public:
-  enum_direction type() { return FORWARD; }
-  size_t used_size()
+  enum_direction type() override { return FORWARD; }
+  size_t used_size() override
   {
     return (size_t)(pos - start);
   }
-  void reset()
+  void reset() override
   {
     pos= start;
   }
-  uchar *end_of_space() { return pos; }
-  bool have_space_for(size_t bytes)
+  uchar *end_of_space() override { return pos; }
+  bool have_space_for(size_t bytes) override
   {
     return (pos + bytes < end);
   }
 
-  void write()
+  void write() override
   {
     write_bytes(write_ptr1, size1);
     if (size2)
@@ -199,8 +199,8 @@ public:
     *position= (*position) - bytes;
     return *position;
   }
-  bool read() { return read(&pos, &read_ptr1, &read_ptr2); }
-  bool read(uchar **position, uchar **ptr1, uchar **ptr2)
+  bool read() override { return read(&pos, &read_ptr1, &read_ptr2); }
+  bool read(uchar **position, uchar **ptr1, uchar **ptr2) override
   {
     if (!have_data(*position, size1 + size2))
       return TRUE;
@@ -209,7 +209,7 @@ public:
     *ptr1= read_bytes(position, size1);
     return FALSE;
   }
-  void remove_unused_space(uchar **unused_start, uchar **unused_end)
+  void remove_unused_space(uchar **unused_start, uchar **unused_end) override
   {
     DBUG_ASSERT(0); /* Don't need this yet */
   }
@@ -228,9 +228,9 @@ public:
     end= unused_end;
   }
   /* Return pointer to start of the memory area that is occupied by the data */
-  uchar *used_area() { return start; }
+  uchar *used_area() override { return start; }
   friend class Lifo_buffer_iterator;
-  uchar *get_pos() { return pos; }
+  uchar *get_pos() override { return pos; }
 };
 
 
@@ -254,22 +254,22 @@ class Backward_lifo_buffer: public Lifo_buffer
 {
   uchar *pos;
 public:
-  enum_direction type() { return BACKWARD; }
+  enum_direction type() override { return BACKWARD; }
  
-  size_t used_size()
+  size_t used_size() override
   {
     return (size_t)(end - pos);
   }
-  void reset()
+  void reset() override
   {
     pos= end;
   }
-  uchar *end_of_space() { return end; }
-  bool have_space_for(size_t bytes)
+  uchar *end_of_space() override { return end; }
+  bool have_space_for(size_t bytes) override
   {
     return (pos - bytes >= start);
   }
-  void write()
+  void write() override
   {
     if (write_ptr2)
       write_bytes(write_ptr2, size2);
@@ -281,11 +281,11 @@ public:
     pos -= bytes;
     memcpy(pos, data, bytes);
   }
-  bool read()
+  bool read() override
   {
     return read(&pos, &read_ptr1, &read_ptr2);
   }
-  bool read(uchar **position, uchar **ptr1, uchar **ptr2)
+  bool read(uchar **position, uchar **ptr1, uchar **ptr2) override
   {
     if (!have_data(*position, size1 + size2))
       return TRUE;
@@ -310,7 +310,7 @@ public:
     @param unused_start  OUT Start of the unused space
     @param unused_end    OUT End of the unused space
   */
-  void remove_unused_space(uchar **unused_start, uchar **unused_end)
+  void remove_unused_space(uchar **unused_start, uchar **unused_end) override
   {
     *unused_start= start;
     *unused_end= pos;
@@ -321,9 +321,9 @@ public:
     DBUG_ASSERT(0); /* Not used for backward buffers */
   }
   /* Return pointer to start of the memory area that is occupied by the data */
-  uchar *used_area() { return pos; }
+  uchar *used_area() override { return pos; }
   friend class Lifo_buffer_iterator;
-  uchar *get_pos() { return pos; }
+  uchar *get_pos() override { return pos; }
 };
 
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index e8ca5f12e4f..3b46ce6a847 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1526,14 +1526,14 @@ class Silence_all_errors : public Internal_error_handler
   int error;
 public:
   Silence_all_errors():error(0) {}
-  virtual ~Silence_all_errors() {}
+  ~Silence_all_errors() override {}
 
-  virtual bool handle_condition(THD *thd,
+  bool handle_condition(THD *thd,
                                 uint sql_errno,
                                 const char* sql_state,
                                 Sql_condition::enum_warning_level *level,
                                 const char* msg,
-                                Sql_condition ** cond_hdl)
+                                Sql_condition ** cond_hdl) override
   {
     error= sql_errno;
     *cond_hdl= NULL;
@@ -2683,8 +2683,8 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
       DBUG_RETURN(1);
     lex->query_tables_last= query_tables_last;
     break;
-#endif
   }
+#endif
   case SCH_PROFILES:
     /* 
       Mark this current profiling record to be discarded.  We don't
@@ -2940,7 +2940,7 @@ retry:
             Deadlock occurred during upgrade of metadata lock.
             Let us restart acquring and opening tables for LOCK TABLES.
           */
-          close_tables_for_reopen(thd, &tables, mdl_savepoint);
+          close_tables_for_reopen(thd, &tables, mdl_savepoint, true);
           if (thd->open_temporary_tables(tables))
             goto err;
           goto retry;
@@ -8880,6 +8880,7 @@ push_new_name_resolution_context(THD *thd,
 
 /**
   Fix condition which contains only field (f turns to  f <> 0 )
+    or only contains the function NOT field (not f turns to  f == 0)
 
   @param cond            The condition to fix
 
@@ -8895,6 +8896,21 @@ Item *normalize_cond(THD *thd, Item *cond)
     {
       cond= new (thd->mem_root) Item_func_ne(thd, cond, new (thd->mem_root) Item_int(thd, 0));
     }
+    else
+    {
+      if (type == Item::FUNC_ITEM)
+      {
+        Item_func *func_item= (Item_func *)cond;
+        if (func_item->functype() == Item_func::NOT_FUNC)
+        {
+          Item *arg= func_item->arguments()[0];
+          if (arg->type() == Item::FIELD_ITEM ||
+              arg->type() == Item::REF_ITEM)
+            cond= new (thd->mem_root) Item_func_eq(thd, arg,
+                                          new (thd->mem_root) Item_int(thd, 0));
+        }
+      }
+    }
   }
   return cond;
 }
@@ -9025,8 +9041,12 @@ THD *find_thread_by_id(longlong id, bool query_id)
   @param type                   Type of id: thread id or query id
 */
 
-uint
-kill_one_thread(THD *thd, my_thread_id id, killed_state kill_signal, killed_type type)
+static uint
+kill_one_thread(THD *thd, my_thread_id id, killed_state kill_signal, killed_type type
+#ifdef WITH_WSREP
+                , bool &wsrep_high_priority
+#endif
+)
 {
   THD *tmp;
   uint error= (type == KILL_TYPE_QUERY ? ER_NO_SUCH_QUERY : ER_NO_SUCH_THREAD);
@@ -9061,17 +9081,22 @@ kill_one_thread(THD *thd, my_thread_id id, killed_state kill_signal, killed_type
 
     mysql_mutex_lock(&tmp->LOCK_thd_data); // Lock from concurrent usage
 
-#ifdef WITH_WSREP
-    if (((thd->security_ctx->master_access & PRIV_KILL_OTHER_USER_PROCESS) ||
-        thd->security_ctx->user_matches(tmp->security_ctx)) &&
-        !wsrep_thd_is_BF(tmp, false) && !tmp->wsrep_applier)
-#else
     if ((thd->security_ctx->master_access & PRIV_KILL_OTHER_USER_PROCESS) ||
         thd->security_ctx->user_matches(tmp->security_ctx))
-#endif /* WITH_WSREP */
     {
-      {
 #ifdef WITH_WSREP
+      if (wsrep_thd_is_BF(tmp, false) || tmp->wsrep_applier)
+      {
+        error= ER_KILL_DENIED_ERROR;
+        wsrep_high_priority= true;
+        push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
+                            ER_KILL_DENIED_ERROR,
+                            "Thread %lld is %s and cannot be killed",
+                            tmp->thread_id,
+                           (tmp->wsrep_applier ? "wsrep applier" : "high priority"));
+      }
+      else
+      {
         if (WSREP(tmp))
         {
           error = wsrep_kill_thd(thd, tmp, kill_signal);
@@ -9083,8 +9108,8 @@ kill_one_thread(THD *thd, my_thread_id id, killed_state kill_signal, killed_type
         error= 0;
 #ifdef WITH_WSREP
         }
-#endif /* WITH_WSREP */
       }
+#endif /* WITH_WSREP */
     }
     else
       error= (type == KILL_TYPE_QUERY ? ER_KILL_QUERY_DENIED_ERROR :
@@ -9183,16 +9208,32 @@ static uint kill_threads_for_user(THD *thd, LEX_USER *user,
 static
 void sql_kill(THD *thd, my_thread_id id, killed_state state, killed_type type)
 {
-  uint error;
-  if (likely(!(error= kill_one_thread(thd, id, state, type))))
+#ifdef WITH_WSREP
+  bool wsrep_high_priority= false;
+#endif
+  uint error= kill_one_thread(thd, id, state, type
+#ifdef WITH_WSREP
+                              , wsrep_high_priority
+#endif
+                              );
+
+  if (likely(!error))
   {
     if (!thd->killed)
       my_ok(thd);
     else
       thd->send_kill_message();
   }
+#ifdef WITH_WSREP
+  else if (wsrep_high_priority)
+    my_printf_error(error, "This is a high priority thread/query and"
+                    " cannot be killed without compromising"
+                    " the consistency of the cluster", MYF(0));
+#endif
   else
+  {
     my_error(error, MYF(0), id);
+  }
 }
 
 
diff --git a/sql/sql_partition_admin.h b/sql/sql_partition_admin.h
index b50c3555bcb..2a8e37e87a0 100644
--- a/sql/sql_partition_admin.h
+++ b/sql/sql_partition_admin.h
@@ -32,12 +32,12 @@ public:
   {}
 
   /* Override SQLCOM_*, since it is an ALTER command */
-  virtual enum_sql_command sql_command_code() const
+  virtual enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_TABLE;
   }
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 
@@ -129,7 +129,7 @@ public:
 
   ~Sql_cmd_alter_table_exchange_partition() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
 private:
   bool exchange_partition(THD *thd, TABLE_LIST *, Alter_info *);
@@ -151,10 +151,10 @@ public:
 
   ~Sql_cmd_alter_table_analyze_partition() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
   /* Override SQLCOM_ANALYZE, since it is an ALTER command */
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_TABLE;
   }
@@ -176,10 +176,10 @@ public:
 
   ~Sql_cmd_alter_table_check_partition() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
   /* Override SQLCOM_CHECK, since it is an ALTER command */
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_TABLE;
   }
@@ -201,10 +201,10 @@ public:
 
   ~Sql_cmd_alter_table_optimize_partition() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
   /* Override SQLCOM_OPTIMIZE, since it is an ALTER command */
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_TABLE;
   }
@@ -226,10 +226,10 @@ public:
 
   ~Sql_cmd_alter_table_repair_partition() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
   /* Override SQLCOM_REPAIR, since it is an ALTER command */
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_TABLE;
   }
@@ -249,10 +249,10 @@ public:
 
   virtual ~Sql_cmd_alter_table_truncate_partition() = default;
 
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
   /* Override SQLCOM_TRUNCATE, since it is an ALTER command */
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_ALTER_TABLE;
   }
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 506403131b1..5ce7dc57b23 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -314,22 +314,22 @@ public:
   sys_var_pluginvar(sys_var_chain *chain, const char *name_arg,
                     st_plugin_int *p, st_mysql_sys_var *plugin_var_arg,
                     const char *substitute);
-  sys_var_pluginvar *cast_pluginvar() { return this; }
+  sys_var_pluginvar *cast_pluginvar() override { return this; }
   uchar* real_value_ptr(THD *thd, enum_var_type type) const;
   TYPELIB* plugin_var_typelib(void) const;
   const uchar* do_value_ptr(THD *thd, enum_var_type type, const LEX_CSTRING *base) const;
-  const uchar* session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar* session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return do_value_ptr(thd, OPT_SESSION, base); }
-  const uchar* global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar* global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return do_value_ptr(thd, OPT_GLOBAL, base); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return do_value_ptr(thd, OPT_DEFAULT, 0); }
-  bool do_check(THD *thd, set_var *var);
-  virtual void session_save_default(THD *thd, set_var *var) {}
-  virtual void global_save_default(THD *thd, set_var *var) {}
-  bool session_update(THD *thd, set_var *var);
-  bool global_update(THD *thd, set_var *var);
-  bool session_is_default(THD *thd);
+  bool do_check(THD *thd, set_var *var) override;
+  void session_save_default(THD *thd, set_var *var) override {}
+  void global_save_default(THD *thd, set_var *var) override {}
+  bool session_update(THD *thd, set_var *var) override;
+  bool global_update(THD *thd, set_var *var) override;
+  bool session_is_default(THD *thd) override;
 };
 
 
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 6261ba46cac..2c9ef081296 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -143,11 +143,11 @@ class Select_fetch_protocol_binary: public select_send
   Protocol_binary protocol;
 public:
   Select_fetch_protocol_binary(THD *thd);
-  virtual bool send_result_set_metadata(List<Item> &list, uint flags);
-  virtual int send_data(List<Item> &items);
-  virtual bool send_eof();
+  bool send_result_set_metadata(List<Item> &list, uint flags) override;
+  int send_data(List<Item> &items) override;
+  bool send_eof() override;
 #ifdef EMBEDDED_LIBRARY
-  void begin_dataset()
+  void begin_dataset() override
   {
     protocol.begin_dataset();
   }
@@ -208,7 +208,7 @@ public:
                                         String *expanded_query);
 public:
   Prepared_statement(THD *thd_arg);
-  virtual ~Prepared_statement();
+  ~Prepared_statement() override;
   void setup_set_params();
   Query_arena::Type type() const override;
   bool cleanup_stmt(bool restore_set_statement_vars) override;
@@ -270,7 +270,7 @@ class Execute_sql_statement: public Server_runnable
 {
 public:
   Execute_sql_statement(LEX_STRING sql_text);
-  virtual bool execute_server_code(THD *thd);
+  bool execute_server_code(THD *thd) override;
 private:
   LEX_STRING m_sql_text;
 };
@@ -5516,29 +5516,33 @@ public:
     thd->set_binlog_bit();
   }
 protected:
-  bool net_store_data(const uchar *from, size_t length);
+  bool net_store_data(const uchar *from, size_t length) override;
   bool net_store_data_cs(const uchar *from, size_t length,
-                         CHARSET_INFO *fromcs, CHARSET_INFO *tocs);
-  bool net_send_eof(THD *thd, uint server_status, uint statement_warn_count);
+                         CHARSET_INFO *fromcs, CHARSET_INFO *tocs) override;
+  bool net_send_eof(THD *thd, uint server_status, uint statement_warn_count) override;
   bool net_send_ok(THD *, uint, uint, ulonglong, ulonglong, const char *,
-                   bool);
-  bool net_send_error_packet(THD *, uint, const char *, const char *);
+                   bool) override;
+  bool net_send_error_packet(THD *, uint, const char *, const char *) override;
   bool begin_dataset();
   bool begin_dataset(THD *thd, uint numfields);
 
-  bool write();
-  bool flush();
+  bool write() override;
+  bool flush() override;
 
   bool store_field_metadata(const THD *thd, const Send_field &field,
                             CHARSET_INFO *charset_for_protocol,
                             uint pos);
-  bool send_result_set_metadata(List<Item> *list, uint flags);
+  bool send_result_set_metadata(List<Item> *list, uint flags) override;
+#ifdef EMBEDDED_LIBRARY
+  void remove_last_row() override;
+#else
   void remove_last_row();
-  bool store_null();
-  void prepare_for_resend();
+#endif
+  bool store_null() override;
+  void prepare_for_resend() override;
   bool send_list_fields(List<Field> *list, const TABLE_LIST *table_list);
  
-  enum enum_protocol_type type() { return PROTOCOL_LOCAL; };
+  enum enum_protocol_type type() override { return PROTOCOL_LOCAL; };
 };
 
 static
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index b4bf9d60ba1..7afe4a9674c 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -258,7 +258,10 @@
 */
 /* This subquery has fields from outer query (put by user) */
 #define UNCACHEABLE_DEPENDENT_GENERATED   1
-/* This subquery contains functions with random result */
+/*
+  This subquery contains functions with random result.
+  Something that is uncacheable is by default unmergeable.
+*/
 #define UNCACHEABLE_RAND        2
 /* This subquery contains functions with side effect */
 #define UNCACHEABLE_SIDEEFFECT	4
diff --git a/sql/sql_schema.cc b/sql/sql_schema.cc
index a267ad83ef7..776f7bcc4d7 100644
--- a/sql/sql_schema.cc
+++ b/sql/sql_schema.cc
@@ -26,7 +26,7 @@ public:
    :Schema(name)
   { }
   const Type_handler *map_data_type(THD *thd, const Type_handler *src)
-                                    const
+                                    const override
   {
     if (src == &type_handler_newdate)
       return thd->type_handler_for_datetime();
@@ -34,7 +34,7 @@ public:
   }
 
   Create_func *find_native_function_builder(THD *thd, const LEX_CSTRING &name)
-                                                                         const
+                                                                         const override
   {
     return native_functions_hash_oracle.find(thd, name);
   }
@@ -42,10 +42,10 @@ public:
   Item *make_item_func_replace(THD *thd,
                                Item *subj,
                                Item *find,
-                               Item *replace) const;
+                               Item *replace) const override;
   Item *make_item_func_substr(THD *thd,
-                              const Lex_substring_spec_st &spec) const;
-  Item *make_item_func_trim(THD *thd, const Lex_trim_st &spec) const;
+                              const Lex_substring_spec_st &spec) const override;
+  Item *make_item_func_trim(THD *thd, const Lex_trim_st &spec) const override;
 };
 
 
@@ -56,7 +56,7 @@ public:
    :Schema(name)
   { }
   const Type_handler *map_data_type(THD *thd, const Type_handler *src)
-                                    const
+                                    const override
   {
     if (src == &type_handler_timestamp ||
         src == &type_handler_timestamp2)
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 536f7225d5c..bb7a88fd67c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2015,7 +2015,7 @@ int JOIN::optimize()
     the joined table.
 
   @retval false  Ok
-  @retval true   Error
+  @retval true   Error, query should abort
 */
 
 bool JOIN::make_range_rowid_filters()
@@ -2065,8 +2065,9 @@ bool JOIN::make_range_rowid_filters()
     rc= sel->test_quick_select(thd, filter_map, (table_map) 0,
                                (ha_rows) HA_POS_ERROR, true, false, true,
                                true, Item_func::BITMAP_EXCEPT_ANY_EQUALITY);
-    if (rc == SQL_SELECT::ERROR || thd->is_error())
+    if (rc == SQL_SELECT::ERROR || thd->is_error() || thd->check_killed())
     {
+      delete sel;
       DBUG_RETURN(true); /* Fatal error */
     }
     /*
@@ -2095,8 +2096,6 @@ bool JOIN::make_range_rowid_filters()
       }
     }
   no_filter:
-    if (sel->quick)
-      delete sel->quick;
     delete sel;
   }
 
@@ -2114,7 +2113,9 @@ bool JOIN::make_range_rowid_filters()
     rowid container employed by the filter. On success it lets the table engine
     know that what rowid filter will be used when accessing the table rows.
 
-  @retval false  always
+  @retval
+    false OK
+    true  Error, query should abort
 */
 
 bool
@@ -2299,12 +2300,14 @@ JOIN::optimize_inner()
 
     add_table_function_dependencies(join_list, table_map(-1));
 
-    if (thd->is_error() || select_lex->save_leaf_tables(thd))
+    if (thd->is_error() ||
+        (!select_lex->leaf_tables_saved && select_lex->save_leaf_tables(thd)))
     {
       if (arena)
         thd->restore_active_arena(arena, &backup);
       DBUG_RETURN(1);
     }
+    select_lex->leaf_tables_saved= true;
     build_bitmap_for_nested_joins(join_list, 0);
 
     sel->prep_where= conds ? conds->copy_andor_structure(thd) : 0;
@@ -26467,6 +26470,90 @@ void compute_part_of_sort_key_for_equals(JOIN *join, TABLE *table,
 }
 
 
+/*
+  @brief
+    This is called when switching table access to produce records
+    in reverse order.
+
+  @detail
+    - Disable "Range checked for each record" (Is this strictly necessary
+      here?)
+    - Disable Index Condition Pushdown and Rowid Filtering.
+
+  IndexConditionPushdownAndReverseScans, RowidFilteringAndReverseScans:
+  Suppose we're computing
+
+    select * from t1
+    where
+      key1 between 10 and 20 and extra_condition
+    order by key1 desc
+
+  here the range access uses a reverse-ordered scan on (1 <= key1 <= 10) and
+  extra_condition is checked by either ICP or Rowid Filtering.
+
+  Also suppose that extra_condition happens to be false for rows of t1 that
+  do not satisfy the "10 <= key1 <= 20" condition.
+
+  For forward ordered range scan, the SQL layer will make these calls:
+
+    h->read_range_first(RANGE(10 <= key1 <= 20));
+    while (h->read_range_next()) { ... }
+
+  The storage engine sees the end endpoint of "key1<=20" and can stop scanning
+  as soon as it encounters a row with key1>20.
+
+  For backward-ordered range scan, the SQL layer will make these calls:
+
+    h->index_read_map(key1=20, HA_READ_PREFIX_LAST_OR_PREV);
+    while (h->index_prev()) {
+      if (cmp_key(h->record, "key1=10" )<0)
+        break; // end of range
+      ...
+    }
+
+  Note that the check whether we've walked beyond the key=10 endpoint is
+  made at the SQL layer. The storage engine has no information about the left
+  endpoint of the interval we're scanning.  If all rows before that endpoint
+  do not satisfy ICP condition or do not pass the Rowid Filter, the storage
+  engine will enumerate the records until the table start.
+
+  In MySQL, the API is extended with set_end_range() call so that the storage
+  engine "knows" when to stop scanning.
+*/
+
+static void prepare_for_reverse_ordered_access(JOIN_TAB *tab)
+{
+  /* Cancel "Range checked for each record" */
+  if (tab->use_quick == 2)
+  {
+    tab->use_quick= 1;
+    tab->read_first_record= join_init_read_record;
+  }
+  /*
+    Cancel Pushed Index Condition, as it doesn't work for reverse scans.
+  */
+  if (tab->select && tab->select->pre_idx_push_select_cond)
+  {
+    tab->set_cond(tab->select->pre_idx_push_select_cond);
+     tab->table->file->cancel_pushed_idx_cond();
+  }
+  /*
+    The same with Rowid Filter: it doesn't work with reverse scans so cancel
+    it, too.
+  */
+  {
+    /*
+      Rowid Filter is initialized at a later stage. It is not pushed to
+      the storage engine yet:
+    */
+    DBUG_ASSERT(!tab->table->file->pushed_rowid_filter);
+    tab->range_rowid_filter_info= NULL;
+    delete tab->rowid_filter;
+    tab->rowid_filter= NULL;
+  }
+}
+
+
 /**
   Test if we can skip the ORDER BY by using an index.
 
@@ -26923,23 +27010,11 @@ check_reverse_order:
           tab->limit= 0;
           goto use_filesort;           // Reverse sort failed -> filesort
         }
-        /*
-          Cancel Pushed Index Condition, as it doesn't work for reverse scans.
-        */
-        if (tab->select && tab->select->pre_idx_push_select_cond)
-	{
-          tab->set_cond(tab->select->pre_idx_push_select_cond);
-           tab->table->file->cancel_pushed_idx_cond();
-        }
+        prepare_for_reverse_ordered_access(tab);
+
         if (select->quick == save_quick)
           save_quick= 0;                // make_reverse() consumed it
         select->set_quick(tmp);
-        /* Cancel "Range checked for each record" */
-        if (tab->use_quick == 2)
-        {
-          tab->use_quick= 1;
-          tab->read_first_record= join_init_read_record;
-        }
       }
       else if (tab->type != JT_NEXT && tab->type != JT_REF_OR_NULL &&
                tab->ref.key >= 0 && tab->ref.key_parts <= used_key_parts)
@@ -26952,20 +27027,7 @@ check_reverse_order:
         */
         tab->read_first_record= join_read_last_key;
         tab->read_record.read_record_func= join_read_prev_same;
-        /* Cancel "Range checked for each record" */
-        if (tab->use_quick == 2)
-        {
-          tab->use_quick= 1;
-          tab->read_first_record= join_init_read_record;
-        }
-        /*
-          Cancel Pushed Index Condition, as it doesn't work for reverse scans.
-        */
-        if (tab->select && tab->select->pre_idx_push_select_cond)
-	{
-          tab->set_cond(tab->select->pre_idx_push_select_cond);
-           tab->table->file->cancel_pushed_idx_cond();
-        }
+        prepare_for_reverse_ordered_access(tab);
       }
     }
     else if (select && select->quick)
diff --git a/sql/sql_select.h b/sql/sql_select.h
index fd280164792..1f914172380 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -821,13 +821,13 @@ class Duplicate_weedout_picker : public Semi_join_strategy_picker
   
   bool is_used;
 public:
-  void set_empty()
+  void set_empty() override
   {
     dupsweedout_tables= 0;
     first_dupsweedout_table= MAX_TABLES;
     is_used= FALSE;
   }
-  void set_from_prev(POSITION *prev);
+  void set_from_prev(POSITION *prev) override;
   
   bool check_qep(JOIN *join,
                  uint idx,
@@ -837,9 +837,9 @@ public:
                  double *read_time,
                  table_map *handled_fanout,
                  sj_strategy_enum *stratey,
-                 POSITION *loose_scan_pos);
+                 POSITION *loose_scan_pos) override;
 
-  void mark_used() { is_used= TRUE; }
+  void mark_used() override { is_used= TRUE; }
   friend void fix_semijoin_strategies_for_picked_join_order(JOIN *join);
 };
 
@@ -867,13 +867,13 @@ class Firstmatch_picker : public Semi_join_strategy_picker
   bool in_firstmatch_prefix() { return (first_firstmatch_table != MAX_TABLES); }
   void invalidate_firstmatch_prefix() { first_firstmatch_table= MAX_TABLES; }
 public:
-  void set_empty()
+  void set_empty() override
   {
     invalidate_firstmatch_prefix();
     is_used= FALSE;
   }
 
-  void set_from_prev(POSITION *prev);
+  void set_from_prev(POSITION *prev) override;
   bool check_qep(JOIN *join,
                  uint idx,
                  table_map remaining_tables, 
@@ -882,9 +882,9 @@ public:
                  double *read_time,
                  table_map *handled_fanout,
                  sj_strategy_enum *strategy,
-                 POSITION *loose_scan_pos);
+                 POSITION *loose_scan_pos) override;
 
-  void mark_used() { is_used= TRUE; }
+  void mark_used() override { is_used= TRUE; }
   friend void fix_semijoin_strategies_for_picked_join_order(JOIN *join);
 };
 
@@ -910,13 +910,13 @@ public:
   uint loosescan_parts; /* Number of keyparts to be kept distinct */
   
   bool is_used;
-  void set_empty()
+  void set_empty() override
   {
     first_loosescan_table= MAX_TABLES; 
     is_used= FALSE;
   }
 
-  void set_from_prev(POSITION *prev);
+  void set_from_prev(POSITION *prev) override;
   bool check_qep(JOIN *join,
                  uint idx,
                  table_map remaining_tables, 
@@ -925,8 +925,8 @@ public:
                  double *read_time,
                  table_map *handled_fanout,
                  sj_strategy_enum *strategy,
-                 POSITION *loose_scan_pos);
-  void mark_used() { is_used= TRUE; }
+                 POSITION *loose_scan_pos) override;
+  void mark_used() override { is_used= TRUE; }
 
   friend class Loose_scan_opt;
   friend void best_access_path(JOIN      *join,
@@ -958,13 +958,13 @@ class Sj_materialization_picker : public Semi_join_strategy_picker
   table_map sjm_scan_need_tables;
 
 public:
-  void set_empty()
+  void set_empty() override
   {
     sjm_scan_need_tables= 0;
     sjm_scan_last_inner= 0;
     is_used= FALSE;
   }
-  void set_from_prev(POSITION *prev);
+  void set_from_prev(POSITION *prev) override;
   bool check_qep(JOIN *join,
                  uint idx,
                  table_map remaining_tables, 
@@ -973,8 +973,8 @@ public:
                  double *read_time,
                  table_map *handled_fanout,
                  sj_strategy_enum *strategy,
-                 POSITION *loose_scan_pos);
-  void mark_used() { is_used= TRUE; }
+                 POSITION *loose_scan_pos) override;
+  void mark_used() override { is_used= TRUE; }
 
   friend void fix_semijoin_strategies_for_picked_join_order(JOIN *join);
 };
@@ -2154,7 +2154,7 @@ public:
 
 
   enum Type type() const override { return ITEM_STORE_KEY; }
-  const char *name() const  override { return "func"; }
+  const char *name() const override { return "func"; }
 
  protected:  
   enum store_key_result copy_inner() override
@@ -2207,7 +2207,7 @@ public:
   {}
 
   enum Type type() const override { return CONST_ITEM_STORE_KEY; }
-  const char *name() const  override { return "const"; }
+  const char *name() const override { return "const"; }
   bool store_key_is_const() override { return true; }
 
 protected:  
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 7e9882c1db4..3e658b1e444 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -355,7 +355,7 @@ public:
                         const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
                         const char* msg,
-                        Sql_condition ** cond_hdl)
+                        Sql_condition ** cond_hdl) override
   {
     if (sql_errno == ER_CANT_FIND_DL_ENTRY ||
         sql_errno == ER_CANT_OPEN_LIBRARY)
@@ -1124,7 +1124,7 @@ public:
 
   bool handle_condition(THD *thd, uint sql_errno, const char * /* sqlstate */,
                         Sql_condition::enum_warning_level *level,
-                        const char *message, Sql_condition ** /* cond_hdl */)
+                        const char *message, Sql_condition ** /* cond_hdl */) override
   {
     /*
        The handler does not handle the errors raised by itself.
@@ -5306,7 +5306,7 @@ class Warnings_only_error_handler : public Internal_error_handler
 public:
   bool handle_condition(THD *thd, uint sql_errno, const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
-                        const char* msg, Sql_condition ** cond_hdl)
+                        const char* msg, Sql_condition ** cond_hdl) override
   {
     if (sql_errno == ER_TRG_NO_DEFINER || sql_errno == ER_TRG_NO_CREATION_CTX
         || sql_errno == ER_PARSE_ERROR)
@@ -10921,12 +10921,12 @@ class IS_internal_schema_access : public ACL_internal_schema_access
 public:
   IS_internal_schema_access() = default;
 
-  ~IS_internal_schema_access() = default;
+  ~IS_internal_schema_access() override = default;
 
   ACL_internal_access_result check(privilege_t want_access,
-                                   privilege_t *save_priv) const;
+                                   privilege_t *save_priv) const override;
 
-  const ACL_internal_table_access *lookup(const char *name) const;
+  const ACL_internal_table_access *lookup(const char *name) const override;
 };
 
 ACL_internal_access_result
diff --git a/sql/sql_signal.h b/sql/sql_signal.h
index abc9905aefb..b2fe8eb69c4 100644
--- a/sql/sql_signal.h
+++ b/sql/sql_signal.h
@@ -85,12 +85,12 @@ public:
 
   virtual ~Sql_cmd_signal() = default;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_SIGNAL;
   }
 
-  virtual bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 /**
@@ -111,12 +111,12 @@ public:
 
   virtual ~Sql_cmd_resignal() = default;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_RESIGNAL;
   }
 
-  virtual bool execute(THD *thd);
+  bool execute(THD *thd) override;
 };
 
 #endif
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc
index 1194c5fcae2..490af4cfed1 100644
--- a/sql/sql_statistics.cc
+++ b/sql/sql_statistics.cc
@@ -1908,7 +1908,7 @@ public:
                      tree_key_length, max_heap_table_size, 1);
   }
 
-  bool add()
+  bool add() override
   {
     longlong val= table_field->val_int();   
     return tree->unique_add(&val);
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 3078589338a..804514cb164 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -11802,6 +11802,7 @@ end_temporary:
 
   thd->variables.option_bits&= ~OPTION_BIN_COMMIT_OFF;
 
+  thd_progress_end(thd);
   *recreate_info= Recreate_info(copied, deleted);
   thd->my_ok_with_recreate_info(*recreate_info,
                                 (ulong) thd->get_stmt_da()->
@@ -11929,7 +11930,7 @@ class Has_default_error_handler : public Internal_error_handler
 public:
   bool handle_condition(THD *, uint sql_errno, const char *,
                         Sql_condition::enum_warning_level *,
-                        const char *, Sql_condition **)
+                        const char *, Sql_condition **) override
   {
     return sql_errno == ER_NO_DEFAULT_FOR_FIELD;
   }
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 2cc0801c485..14cf72211b6 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -82,7 +82,7 @@ public:
     :Stored_program_creation_ctx(client_cs, connection_cl, db_cl)
   { }
 
-  virtual Stored_program_creation_ctx *clone(MEM_ROOT *mem_root)
+  Stored_program_creation_ctx *clone(MEM_ROOT *mem_root) override
   {
     return new (mem_root) Trigger_creation_ctx(m_client_cs,
                                                m_connection_cl,
@@ -90,7 +90,7 @@ public:
   }
 
 protected:
-  virtual Object_creation_ctx *create_backup_ctx(THD *thd) const
+  Object_creation_ctx *create_backup_ctx(THD *thd) const override
   {
     return new Trigger_creation_ctx(thd);
   }
@@ -282,8 +282,8 @@ public:
   Handle_old_incorrect_sql_modes_hook(const char *file_path)
     :path(file_path)
   {};
-  virtual bool process_unknown_string(const char *&unknown_key, uchar* base,
-                                      MEM_ROOT *mem_root, const char *end);
+  bool process_unknown_string(const char *&unknown_key, uchar* base,
+                                      MEM_ROOT *mem_root, const char *end) override;
 };
 
 
@@ -294,8 +294,8 @@ public:
                                           LEX_CSTRING *trigger_table_arg)
     :path(file_path), trigger_table_value(trigger_table_arg)
   {};
-  virtual bool process_unknown_string(const char *&unknown_key, uchar* base,
-                                      MEM_ROOT *mem_root, const char *end);
+  bool process_unknown_string(const char *&unknown_key, uchar* base,
+                                      MEM_ROOT *mem_root, const char *end) override;
 private:
   const char *path;
   LEX_CSTRING *trigger_table_value;
@@ -322,12 +322,12 @@ public:
 
   Deprecated_trigger_syntax_handler() : m_trigger_name(NULL) {}
 
-  virtual bool handle_condition(THD *thd,
+  bool handle_condition(THD *thd,
                                 uint sql_errno,
                                 const char* sqlstate,
                                 Sql_condition::enum_warning_level *level,
                                 const char* message,
-                                Sql_condition ** cond_hdl)
+                                Sql_condition ** cond_hdl) override
   {
     if (sql_errno != EE_OUTOFMEMORY &&
         sql_errno != ER_OUT_OF_RESOURCES)
diff --git a/sql/sql_truncate.h b/sql/sql_truncate.h
index 5704da1dd7b..52d8e385fba 100644
--- a/sql/sql_truncate.h
+++ b/sql/sql_truncate.h
@@ -40,9 +40,9 @@ public:
     @param thd the current thread.
     @return false on success.
   */
-  bool execute(THD *thd);
+  bool execute(THD *thd) override;
 
-  virtual enum_sql_command sql_command_code() const
+  enum_sql_command sql_command_code() const override
   {
     return SQLCOM_TRUNCATE;
   }
diff --git a/sql/sql_type.cc b/sql/sql_type.cc
index 0c505c29503..ef9d03a8bea 100644
--- a/sql/sql_type.cc
+++ b/sql/sql_type.cc
@@ -33,6 +33,93 @@ const DTCollation &DTCollation_numeric::singleton()
   return tmp;
 }
 
+
+bool
+DTCollation::merge_charset_and_collation(Sql_used *used,
+                                         const Charset_collation_map_st &map,
+                                         CHARSET_INFO *cs,
+                                         const Lex_extended_collation_st &cl,
+                                         my_repertoire_t repertoire)
+{
+  Lex_exact_charset_opt_extended_collate cscl(cs, true);
+  if (cscl.merge_collation_override(used, map, cl))
+    return true;
+  set(cscl.collation().charset_info(), DERIVATION_EXPLICIT, repertoire);
+  return false;
+}
+
+
+bool DTCollation::merge_collation(Sql_used *used,
+                                  const Charset_collation_map_st &map,
+                                  const Lex_extended_collation_st &cl,
+                                  my_repertoire_t repertoire,
+                                  bool allow_ignorable_with_context_collation)
+{
+  if (derivation != DERIVATION_IGNORABLE)
+  {
+    // A known character set + an extended collation
+    return merge_charset_and_collation(used, map, collation, cl, repertoire);
+  }
+
+  if (cl.type() == Lex_extended_collation::TYPE_EXACT)
+  {
+    /*
+      An unknown character set + an exact collation.
+      Just use this exact collation.
+      Examples:
+      - Expressions derived from an explicit NULL:
+          SELECT NULL         COLLATE utf8mb4_general_ci;
+          SELECT CONCAT(NULL) COLLATE utf8mb4_general_ci;
+        Any collation is applicable to an explicit NULL.
+
+      - Expressions with PS parameters (at PREPARE time, not bound yet)
+          SELECT ?         COLLATE utf8mb4_general_ci;
+          SELECT CONCAT(?) COLLATE utf8mb4_general_ci;
+        The collation will be checked for applicability to the
+        character set of the actual bound parameter at the EXECUTE time.
+        We're now in PREPARE: let's assume it will be applicable.
+    */
+    set(cl.charset_info(), DERIVATION_EXPLICIT, repertoire);
+    return false;
+  }
+
+  // An unknown character set + a contextually typed collation
+  if (allow_ignorable_with_context_collation)
+  {
+    /*
+      Expressions with non-bound PS parameters, PREPARE time.
+        SELECT ?         COLLATE uca1400_ai_ci;
+        SELECT CONCAT(?) COLLATE uca1400_ai_ci;
+      There is a chance the character set of the actual bound parameter
+      will be known at the EXECUTE time (unless an explicit NULL is bound).
+
+      For now let's use utf8mb4 to resolve collations like uca1400_ai_ci.
+      The real character set of the actual bound parameter expression will be
+      later used to resolve the collation again, during the EXECUTE time.
+    */
+    return merge_charset_and_collation(used, map,
+                                       &my_charset_utf8mb4_general_ci,
+                                       cl, repertoire);
+  }
+
+  /*
+    Expressions with an unknown character set:
+    - Either without PS parameters at all:
+        SELECT NULL         COLLATE uca1400_ai_ci;
+        SELECT CONCAT(NULL) COLLATE uca1400_ai_ci;
+    - Or with PS parameters bound to NULL at EXECUTE time:
+        EXECUTE IMMEDIATE
+          'SELECT ? COLLATE uca1400_ai_ci' USING NULL;
+        EXECUTE IMMEDIATE
+          'SELECT CONCAT(?) COLLATE uca1400_ai_ci' USING NULL;
+        EXECUTE IMMEDIATE
+          'SELECT ? COLLATE uca1400_ai_ci' USING CONCAT(NULL);
+  */
+  my_error(ER_NOT_ALLOWED_IN_THIS_CONTEXT, MYF(0), "NULL");
+  return true;
+}
+
+
 Named_type_handler<Type_handler_row> type_handler_row("row");
 
 Named_type_handler<Type_handler_null> type_handler_null("null");
@@ -7849,7 +7936,7 @@ Type_handler_datetime_common::convert_item_for_comparison(
                           const char *sqlstate,
                           Sql_condition::enum_warning_level *level,
                           const char *msg,
-                          Sql_condition **cond_hdl)
+                          Sql_condition **cond_hdl) override
     {
       hit++;
       return *level >= Sql_condition::WARN_LEVEL_WARN;
diff --git a/sql/sql_type.h b/sql/sql_type.h
index 399362a316e..beba39a1d1e 100644
--- a/sql/sql_type.h
+++ b/sql/sql_type.h
@@ -3145,6 +3145,16 @@ public:
   bool aggregate(const DTCollation &dt, uint flags= 0);
   bool set(DTCollation &dt1, DTCollation &dt2, uint flags= 0)
   { set(dt1); return aggregate(dt2, flags); }
+  bool merge_charset_and_collation(Sql_used *used,
+                                   const Charset_collation_map_st &map,
+                                   CHARSET_INFO *cs,
+                                   const Lex_extended_collation_st &cl,
+                                   my_repertoire_t repertoire);
+  bool merge_collation(Sql_used *used,
+                       const Charset_collation_map_st &map,
+                       const Lex_extended_collation_st &cl,
+                       my_repertoire_t repertoire,
+                       bool allow_ignorable_with_context_collation);
   const char *derivation_name() const
   {
     switch(derivation)
@@ -3766,13 +3776,13 @@ public:
 class Vers_type_timestamp: public Vers_type_handler
 {
 public:
-  virtual vers_kind_t kind() const
+  vers_kind_t kind() const override
   {
     return VERS_TIMESTAMP;
   }
   bool check_sys_fields(const LEX_CSTRING &table_name,
                         const Column_definition *row_start,
-                        const Column_definition *row_end) const;
+                        const Column_definition *row_end) const override;
 };
 extern Vers_type_timestamp vers_type_timestamp;
 
@@ -3780,13 +3790,13 @@ extern Vers_type_timestamp vers_type_timestamp;
 class Vers_type_trx: public Vers_type_handler
 {
 public:
-  virtual vers_kind_t kind() const
+  vers_kind_t kind() const override
   {
     return VERS_TRX_ID;
   }
   bool check_sys_fields(const LEX_CSTRING &table_name,
                         const Column_definition *row_start,
-                        const Column_definition *row_end) const;
+                        const Column_definition *row_end) const override;
 };
 extern MYSQL_PLUGIN_IMPORT Vers_type_trx vers_type_trx;
 
diff --git a/sql/sql_type_fixedbin.h b/sql/sql_type_fixedbin.h
index 13145085b9a..f6055dbb4f5 100644
--- a/sql/sql_type_fixedbin.h
+++ b/sql/sql_type_fixedbin.h
@@ -990,9 +990,9 @@ public:
   public:
     Item_cache_fbt(THD *thd)
      :Item_cache(thd, singleton()) { }
-    Item *get_copy(THD *thd)
+    Item *get_copy(THD *thd) override
     { return get_item_copy<Item_cache_fbt>(thd, this); }
-    bool cache_value()
+    bool cache_value() override
     {
       if (!example)
         return false;
@@ -1002,54 +1002,54 @@ public:
                                                    &m_value, type_handler());
       return true;
     }
-    String* val_str(String *to)
+    String* val_str(String *to) override
     {
       if (!has_value())
         return NULL;
       Fbt_null tmp(m_value.ptr(), m_value.length());
       return tmp.is_null() || tmp.to_string(to) ? NULL : to;
     }
-    my_decimal *val_decimal(my_decimal *to)
+    my_decimal *val_decimal(my_decimal *to) override
     {
       if (!has_value())
         return NULL;
       my_decimal_set_zero(to);
       return to;
     }
-    longlong val_int()
+    longlong val_int() override
     {
       if (!has_value())
         return 0;
       return 0;
     }
-    double val_real()
+    double val_real() override
     {
       if (!has_value())
         return 0;
       return 0;
     }
-    longlong val_datetime_packed(THD *thd)
+    longlong val_datetime_packed(THD *) override
     {
       DBUG_ASSERT(0);
       if (!has_value())
         return 0;
       return 0;
     }
-    longlong val_time_packed(THD *thd)
+    longlong val_time_packed(THD *) override
     {
       DBUG_ASSERT(0);
       if (!has_value())
         return 0;
       return 0;
     }
-    bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate)
+    bool get_date(THD *, MYSQL_TIME *ltime, date_mode_t) override
     {
       if (!has_value())
         return true;
       set_zero_time(ltime, MYSQL_TIMESTAMP_TIME);
       return false;
     }
-    bool val_native(THD *thd, Native *to)
+    bool val_native(THD *, Native *to) override
     {
       if (!has_value())
         return true;
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index e090331292c..ea07caabf35 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -503,6 +503,12 @@ bool Sql_cmd_update::update_single_table(THD *thd)
     if (thd->binlog_for_noop_dml(transactional_table))
       DBUG_RETURN(1);
 
+    if (!thd->lex->current_select->leaf_tables_saved)
+    {
+      thd->lex->current_select->save_leaf_tables(thd);
+      thd->lex->current_select->leaf_tables_saved= true;
+    }
+
     my_ok(thd);				// No matching records
     DBUG_RETURN(0);
   }
@@ -1260,10 +1266,10 @@ update_end:
   }
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;		/* calc cuted fields */
   thd->abort_on_warning= 0;
-  if (thd->lex->current_select->first_cond_optimization)
+  if (!thd->lex->current_select->leaf_tables_saved)
   {
     thd->lex->current_select->save_leaf_tables(thd);
-    thd->lex->current_select->first_cond_optimization= 0;
+    thd->lex->current_select->leaf_tables_saved= true;
   }
   ((multi_update *)result)->set_found(found);
   ((multi_update *)result)->set_updated(updated);
diff --git a/sql/sql_window.cc b/sql/sql_window.cc
index c5668d7f046..a75ea5289be 100644
--- a/sql/sql_window.cc
+++ b/sql/sql_window.cc
@@ -961,7 +961,7 @@ protected:
 class Table_read_cursor : public Rowid_seq_cursor
 {
 public:
-  virtual ~Table_read_cursor() = default;
+  ~Table_read_cursor() override = default;
 
   void init(READ_RECORD *info)
   {
@@ -1029,7 +1029,7 @@ public:
   /*
     This returns -1 when end of partition was reached.
   */
-  int next()
+  int next() override
   {
     int res;
     if (end_of_partition)
@@ -1319,12 +1319,12 @@ public:
     item_add->fix_fields(thd, &item_add);
   }
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     // Save the value of FUNC(current_row)
     range_expr->fetch_value_from(item_add);
@@ -1333,19 +1333,19 @@ public:
     end_of_partition= false;
   }
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     walk_till_non_peer();
   }
 
-  void pre_next_row()
+  void pre_next_row() override
   {
     if (end_of_partition)
       return;
     range_expr->fetch_value_from(item_add);
   }
 
-  void next_row()
+  void next_row() override
   {
     if (end_of_partition)
       return;
@@ -1357,12 +1357,12 @@ public:
     walk_till_non_peer();
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
 
-  bool is_outside_computation_bounds() const
+  bool is_outside_computation_bounds() const override
   {
     if (end_of_partition)
       return true;
@@ -1459,12 +1459,12 @@ public:
     item_add->fix_fields(thd, &item_add);
   }
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     // Save the value of FUNC(current_row)
     range_expr->fetch_value_from(item_add);
@@ -1474,20 +1474,20 @@ public:
     added_values= false;
   }
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     cursor.move_to(rownum);
     walk_till_non_peer();
   }
 
-  void pre_next_row()
+  void pre_next_row() override
   {
     if (end_of_partition)
       return;
     range_expr->fetch_value_from(item_add);
   }
 
-  void next_row()
+  void next_row() override
   {
     if (end_of_partition)
       return;
@@ -1499,14 +1499,14 @@ public:
     walk_till_non_peer();
   }
 
-  bool is_outside_computation_bounds() const
+  bool is_outside_computation_bounds() const override
   {
     if (!added_values)
       return true;
     return false;
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     if (end_of_partition)
       return cursor.get_rownum(); // Cursor does not pass over partition bound.
@@ -1568,13 +1568,13 @@ public:
   {
   }
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
     peer_tracker.init();
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     // Save the value of the current_row
     peer_tracker.check_if_next_group();
@@ -1583,17 +1583,17 @@ public:
     add_value_to_items();
   }
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     walk_till_non_peer();
   }
 
-  void pre_next_row()
+  void pre_next_row() override
   {
     dont_move= !peer_tracker.check_if_next_group();
   }
 
-  void next_row()
+  void next_row() override
   {
     // Check if our cursor is pointing at a peer of the current row.
     // If not, move forward until that becomes true
@@ -1608,7 +1608,7 @@ public:
     walk_till_non_peer();
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
@@ -1665,7 +1665,7 @@ public:
     move(false)
   {}
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     bound_tracker.init();
 
@@ -1673,23 +1673,23 @@ public:
     peer_tracker.init();
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     // Fetch the value from the first row
     peer_tracker.check_if_next_group();
     cursor.move_to(rownum);
   }
 
-  void next_partition(ha_rows rownum) {}
+  void next_partition(ha_rows rownum) override {}
 
-  void pre_next_row()
+  void pre_next_row() override
   {
     // Check if the new current_row is a peer of the row that our cursor is
     // pointing to.
     move= peer_tracker.check_if_next_group();
   }
 
-  void next_row()
+  void next_row() override
   {
     if (move)
     {
@@ -1717,7 +1717,7 @@ public:
     }
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
@@ -1739,9 +1739,9 @@ public:
                             SQL_I_List<ORDER> *order_list)
   {}
 
-  void init(READ_RECORD *info) {}
+  void init(READ_RECORD *info) override {}
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     /*
       UNBOUNDED PRECEDING frame end just stays on the first row of the
@@ -1751,12 +1751,12 @@ public:
     curr_rownum= rownum;
   }
 
-  void next_row()
+  void next_row() override
   {
     /* Do nothing, UNBOUNDED PRECEDING frame end doesn't move. */
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return curr_rownum;
   }
@@ -1781,17 +1781,17 @@ public:
       SQL_I_List<ORDER> *order_list) :
     cursor(thd, partition_list) {}
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     cursor.on_next_partition(rownum);
   }
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     /* Activate the first row */
     cursor.fetch();
@@ -1804,12 +1804,12 @@ public:
     }
   }
 
-  void next_row()
+  void next_row() override
   {
     /* Do nothing, UNBOUNDED FOLLOWING frame end doesn't move */
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
@@ -1824,7 +1824,7 @@ public:
       SQL_I_List<ORDER> *partition_list, SQL_I_List<ORDER> *order_list) :
     Frame_unbounded_following(thd, partition_list, order_list) {}
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     ha_rows num_rows_in_partition= 0;
     if (cursor.fetch())
@@ -1837,7 +1837,7 @@ public:
     set_win_funcs_row_count(num_rows_in_partition);
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
@@ -1864,7 +1864,7 @@ public:
   {
     order_item= order_list->first->item[0];
   }
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     ha_rows num_rows_in_partition= 0;
     if (cursor.fetch())
@@ -1880,7 +1880,7 @@ public:
     set_win_funcs_row_count(num_rows_in_partition);
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
@@ -1911,12 +1911,12 @@ public:
     is_top_bound(is_top_bound_arg), n_rows(n_rows_arg), n_rows_behind(0)
   {}
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
   }
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     /*
       Position our cursor to point at the first row in the new partition
@@ -1942,13 +1942,13 @@ public:
 
   }
 
-  void next_row()
+  void next_row() override
   {
     n_rows_behind++;
     move_cursor_if_possible();
   }
 
-  bool is_outside_computation_bounds() const
+  bool is_outside_computation_bounds() const override
   {
     /* As a bottom boundary, rows have not yet been added. */
     if (!is_top_bound && n_rows - n_rows_behind)
@@ -1956,7 +1956,7 @@ public:
     return false;
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
@@ -2014,26 +2014,26 @@ public:
 
   Frame_rows_current_row_bottom() : curr_rownum(0) {}
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     add_value_to_items();
     curr_rownum= rownum;
   }
 
-  void next_partition(ha_rows rownum) {}
+  void next_partition(ha_rows rownum) override {}
 
-  void pre_next_row()
+  void pre_next_row() override
   {
     /* Temp table's current row is current_row. Add it to the window func */
     add_value_to_items();
   }
 
-  void next_row()
+  void next_row() override
   {
     curr_rownum++;
   };
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return curr_rownum;
   }
@@ -2090,13 +2090,13 @@ public:
   {
   }
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
     at_partition_end= false;
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     at_partition_end= false;
 
@@ -2104,7 +2104,7 @@ public:
   }
 
   /* Move our cursor to be n_rows ahead.  */
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     if (is_top_bound)
       next_part_top(rownum);
@@ -2112,7 +2112,7 @@ public:
       next_part_bottom(rownum);
   }
 
-  void next_row()
+  void next_row() override
   {
     if (is_top_bound)
       next_row_top();
@@ -2120,7 +2120,7 @@ public:
       next_row_bottom();
   }
 
-  bool is_outside_computation_bounds() const
+  bool is_outside_computation_bounds() const override
   {
     /*
        The top bound can go over the current partition. In this case,
@@ -2131,7 +2131,7 @@ public:
     return false;
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return cursor.get_rownum();
   }
@@ -2217,12 +2217,12 @@ public:
                     const Frame_cursor &bottom_bound) :
     top_bound(top_bound), bottom_bound(bottom_bound) {}
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     /* TODO(cvicentiu) Sum functions get cleared on next partition anyway during
        the window function computation algorithm. Either perform this only in
@@ -2232,23 +2232,23 @@ public:
     clear_sum_functions();
   }
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     compute_values_for_current_row();
   }
 
-  void pre_next_row()
+  void pre_next_row() override
   {
     clear_sum_functions();
   }
 
-  void next_row()
+  void next_row() override
   {
     curr_rownum++;
     compute_values_for_current_row();
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return curr_rownum;
   }
@@ -2308,36 +2308,36 @@ class Frame_positional_cursor : public Frame_cursor
     bottom_bound(&bottom_bound), offset(&offset),
     negative_offset(negative_offset) {}
 
-  void init(READ_RECORD *info)
+  void init(READ_RECORD *info) override
   {
     cursor.init(info);
   }
 
-  void pre_next_partition(ha_rows rownum)
+  void pre_next_partition(ha_rows rownum) override
   {
     /* The offset is dependant on the current row values. We can only get
      * it here accurately. When fetching other rows, it changes. */
     save_offset_value();
   }
 
-  void next_partition(ha_rows rownum)
+  void next_partition(ha_rows rownum) override
   {
     save_positional_value();
   }
 
-  void pre_next_row()
+  void pre_next_row() override
   {
     /* The offset is dependant on the current row values. We can only get
      * it here accurately. When fetching other rows, it changes. */
     save_offset_value();
   }
 
-  void next_row()
+  void next_row() override
   {
     save_positional_value();
   }
 
-  ha_rows get_curr_rownum() const
+  ha_rows get_curr_rownum() const override
   {
     return position_cursor.get_curr_rownum();
   }
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index d449df0c5c2..368b7ce6a68 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -3027,7 +3027,7 @@ static Sys_var_uint Sys_port(
 #endif
        "built-in default (" STRINGIFY_ARG(MYSQL_PORT) "), whatever comes first",
        READ_ONLY GLOBAL_VAR(mysqld_port), CMD_LINE(REQUIRED_ARG, 'P'),
-       VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1));
+       VALID_RANGE(0, UINT_MAX16), DEFAULT(0), BLOCK_SIZE(1));
 
 static Sys_var_ulong Sys_preload_buff_size(
        "preload_buffer_size",
@@ -3503,6 +3503,14 @@ Sys_server_id(
        VALID_RANGE(1, UINT_MAX32), DEFAULT(1), BLOCK_SIZE(1), NO_MUTEX_GUARD,
        NOT_IN_BINLOG, ON_CHECK(check_server_id), ON_UPDATE(fix_server_id));
 
+char *server_uid_ptr= &server_uid[0];
+
+static Sys_var_charptr Sys_server_uid(
+      "server_uid", "Automatically calculated server unique id hash",
+       READ_ONLY GLOBAL_VAR(server_uid_ptr),
+       CMD_LINE_HELP_ONLY,
+       DEFAULT(server_uid));
+
 static Sys_var_on_access_global<Sys_var_mybool,
                           PRIV_SET_SYSTEM_GLOBAL_VAR_SLAVE_COMPRESSED_PROTOCOL>
 Sys_slave_compressed_protocol(
@@ -6579,7 +6587,7 @@ static Sys_var_uint Sys_extra_port(
        "Extra port number to use for tcp connections in a "
        "one-thread-per-connection manner. 0 means don't use another port",
        READ_ONLY GLOBAL_VAR(mysqld_extra_port), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1));
+       VALID_RANGE(0, UINT_MAX16), DEFAULT(0), BLOCK_SIZE(1));
 
 static Sys_var_on_access_global<Sys_var_ulong,
                               PRIV_SET_SYSTEM_GLOBAL_VAR_EXTRA_MAX_CONNECTIONS>
@@ -6619,7 +6627,8 @@ static Sys_var_set Sys_log_slow_filter(
        "is empty all kinds of queries are logged.  All types are bound by "
        "slow_query_time, except 'not_using_index' which is always logged "
        "if enabled",
-       SESSION_VAR(log_slow_filter), CMD_LINE(REQUIRED_ARG),
+       SESSION_VAR(log_slow_filter), CMD_LINE(REQUIRED_ARG,
+                                              OPT_LOG_SLOW_FILTER),
        log_slow_filter_names,
        /* by default we log all queries except 'not_using_index' */
        DEFAULT(my_set_bits(array_elements(log_slow_filter_names)-1) &
diff --git a/sql/sys_vars.inl b/sql/sys_vars.inl
index cc6c81107b9..263fc03800c 100644
--- a/sql/sys_vars.inl
+++ b/sql/sys_vars.inl
@@ -203,7 +203,7 @@ public:
     SYSVAR_ASSERT(block_size > 0);
     SYSVAR_ASSERT(def_val % block_size == 0);
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     my_bool fixed= FALSE, unused;
     longlong v= var->value->val_int();
@@ -250,23 +250,23 @@ public:
     return throw_bounds_warning(thd, name.str, fixed,
                                 var->value->unsigned_flag, v);
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, T)= static_cast<T>(var->save_result.ulonglong_value);
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(T)= static_cast<T>(var->save_result.ulonglong_value);
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= (ulonglong)*(T*)global_value_ptr(thd, 0); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= option.def_value; }
   private:
   T get_max_var() { return *((T*) max_var_ptr()); }
-  const uchar *default_value_ptr(THD *thd) const { return (uchar*) &option.def_value; }
+  const uchar *default_value_ptr(THD *thd) const override { return (uchar*) &option.def_value; }
 };
 
 typedef Sys_var_integer<int, GET_INT, SHOW_SINT> Sys_var_int;
@@ -332,7 +332,7 @@ public:
     typelib.type_lengths= 0;    // only used by Fields_enum and Field_set
     option.typelib= &typelib;
   }
-  bool do_check(THD *thd, set_var *var) // works for enums and my_bool
+  bool do_check(THD *thd, set_var *var) override // works for enums and my_bool
   {
     char buff[STRING_BUFFER_USUAL_SIZE];
     String str(buff, sizeof(buff), system_charset_info), *res;
@@ -400,7 +400,7 @@ public:
     SYSVAR_ASSERT(size == sizeof(ulong));
   }
   bool check_maximum(THD *thd, set_var *var,
-                     const char *c_val, longlong i_val)
+                     const char *c_val, longlong i_val) override
   {
     if (!max_var_ptr() ||
         var->save_result.ulonglong_value <= get_max_var())
@@ -411,27 +411,27 @@ public:
                    throw_bounds_warning(thd, name.str, TRUE,
                                         var->value->unsigned_flag, i_val);
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, ulong)= static_cast<ulong>(var->save_result.ulonglong_value);
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(ulong)= static_cast<ulong>(var->save_result.ulonglong_value);
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= global_var(ulong); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= option.def_value; }
   const uchar *valptr(THD *thd, ulong val) const
   { return reinterpret_cast<const uchar*>(typelib.type_names[val]); }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, session_var(thd, ulong)); }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(ulong)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return valptr(thd, (ulong)option.def_value); }
 
   ulong get_max_var() { return *((ulong *) max_var_ptr()); }
@@ -465,21 +465,21 @@ public:
     SYSVAR_ASSERT(getopt.arg_type == OPT_ARG || getopt.id < 0);
     SYSVAR_ASSERT(size == sizeof(my_bool));
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, my_bool)= var->save_result.ulonglong_value != 0;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(my_bool)= var->save_result.ulonglong_value != 0;
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= (ulonglong)*(my_bool *)global_value_ptr(thd, 0); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= option.def_value; }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   {
     thd->sys_var_tmp.my_bool_value=(my_bool) option.def_value;
     return (uchar*) &thd->sys_var_tmp.my_bool_value;
@@ -620,7 +620,7 @@ public:
     var->save_result.string_value.length=
       strlen(var->save_result.string_value.str);
   }
-  void global_save_default(THD *, set_var *var) override
+  void global_save_default(THD *thd, set_var *var) override
   {
     char *ptr= (char*)(intptr)option.def_value;
     var->save_result.string_value.str= ptr;
@@ -651,7 +651,7 @@ public:
                     getopt, def_val, lock,
                     VARIABLE_NOT_IN_BINLOG, 0, 0, 0)
     {}
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
      if (Sys_var_charptr::do_string_check(thd, var, charset(thd)) ||
          sysvartrack_validate_value(thd, var->save_result.string_value.str,
@@ -659,7 +659,7 @@ public:
        return TRUE;
      return FALSE;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     char *new_val= update_prepare(var, MYF(MY_WME));
     if (new_val)
@@ -675,9 +675,9 @@ public:
     global_update_finish(new_val);
     return (new_val == 0 && var->save_result.string_value.str != 0);
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   { return thd->session_tracker.sysvars.update(thd, var); }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
      var->save_result.string_value.str= global_var(char*);
      var->save_result.string_value.length=
@@ -709,27 +709,27 @@ public:
   {
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { DBUG_ASSERT(FALSE); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { DBUG_ASSERT(FALSE); }
 protected:
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     return thd->security_ctx->proxy_user[0] ?
       (uchar *) &(thd->security_ctx->proxy_user[0]) : NULL;
@@ -744,7 +744,7 @@ public:
   {}
 
 protected:
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     return (uchar*)thd->security_ctx->external_user;
   }
@@ -891,14 +891,14 @@ public:
     SYSVAR_ASSERT(size == sizeof(LEX_CSTRING));
     *const_cast<SHOW_TYPE*>(&show_val_type)= SHOW_LEX_STRING;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     if (Sys_var_charptr::global_update(thd, var))
       return true;
     global_var(LEX_CSTRING).length= var->save_result.string_value.length;
     return false;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     if (Sys_var_charptr::session_update(thd, var))
       return true;
@@ -936,14 +936,14 @@ public:
               lock, binlog_status_arg, on_check_func, on_update_func,
               substitute)
   { option.var_type|= GET_STR; }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     bool rc= Sys_var_charptr::do_string_check(thd, var, charset(thd));
     if (var->save_result.string_value.str == nullptr)
       var->save_result.string_value.str= const_cast<char*>("");
     return rc;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     const char *val= var->save_result.string_value.str;
     if (!var->value)
@@ -952,33 +952,33 @@ public:
       DBUG_SET(val);
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     const char *val= var->save_result.string_value.str;
     DBUG_SET_INITIAL(val);
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     char *ptr= (char*)(intptr)option.def_value;
     var->save_result.string_value.str= ptr;
     var->save_result.string_value.length= safe_strlen(ptr);
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     char buf[256];
     DBUG_EXPLAIN(buf, sizeof(buf));
     return (uchar*) thd->strdup(buf);
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     char buf[256];
     DBUG_EXPLAIN_INITIAL(buf, sizeof(buf));
     return (uchar*) thd->strdup(buf);
   }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return (uchar*)""; }
 };
 #endif
@@ -1024,7 +1024,7 @@ public:
     offset= global_var_ptr() - (uchar*)dflt_key_cache;
     SYSVAR_ASSERT(scope() == GLOBAL);
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     ulonglong new_value= var->save_result.ulonglong_value;
     LEX_CSTRING *base_name= &var->base;
@@ -1054,7 +1054,7 @@ public:
 
     return keycache_update(thd, key_cache, offset, new_value);
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     KEY_CACHE *key_cache= get_key_cache(base);
     if (!key_cache)
@@ -1187,7 +1187,7 @@ public:
     SYSVAR_ASSERT(max_val >= def_val);
     SYSVAR_ASSERT(size == sizeof(double));
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     my_bool fixed;
     double v= var->value->val_real();
@@ -1195,19 +1195,19 @@ public:
 
     return throw_bounds_warning(thd, name.str, fixed, v);
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, double)= var->save_result.double_value;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(double)= var->save_result.double_value;
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.double_value= global_var(double); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { var->save_result.double_value= getopt_ulonglong2double(option.def_value); }
 };
 
@@ -1240,20 +1240,20 @@ public:
   {
     cost_adjust= (double) arg_cost_adjust;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, double)= var->save_result.double_value/cost_adjust;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(double)= var->save_result.double_value/cost_adjust;
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.double_value= global_var(double) * cost_adjust; }
 
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     var->save_result.double_value= getopt_ulonglong2double(option.def_value);
   }
@@ -1263,12 +1263,12 @@ public:
       thd->sys_var_tmp.double_value*= cost_adjust;
     return (uchar*) &thd->sys_var_tmp.double_value;
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     thd->sys_var_tmp.double_value= session_var(thd, double);
     return tmp_ptr(thd);
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     thd->sys_var_tmp.double_value= global_var(double);
     return tmp_ptr(thd);
@@ -1312,7 +1312,7 @@ class Sys_var_engine_optimizer_cost: public Sys_var_optimizer_cost
     offset= global_var_ptr() - (uchar*) &default_optimizer_costs;
     SYSVAR_ASSERT(scope() == GLOBAL);
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     double new_value= var->save_result.double_value;
     LEX_CSTRING *base_name= &var->base;
@@ -1334,6 +1334,7 @@ class Sys_var_engine_optimizer_cost: public Sys_var_optimizer_cost
     return 0;
   }
   const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  override
   {
     OPTIMIZER_COSTS *optimizer_costs= get_optimizer_costs(base);
     if (!optimizer_costs)
@@ -1371,7 +1372,7 @@ public:
               lock, binlog_status_arg, on_check_func, on_update_func,
               substitute)
   { }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     if (thd->user_connect && thd->user_connect->user_resources.user_conn)
       return (uchar*) &(thd->user_connect->user_resources.user_conn);
@@ -1417,7 +1418,7 @@ public:
     SYSVAR_ASSERT(strcmp(values[typelib.count-1], "default") == 0);
     SYSVAR_ASSERT(size == sizeof(ulonglong));
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     char buff[STRING_BUFFER_USUAL_SIZE];
     String str(buff, sizeof(buff), system_charset_info), *res;
@@ -1469,27 +1470,27 @@ public:
 
     return false;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, ulonglong)= var->save_result.ulonglong_value;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(ulonglong)= var->save_result.ulonglong_value;
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= global_var(ulonglong); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= option.def_value; }
   const uchar *valptr(THD *thd, ulonglong val) const
   { return (uchar*)flagset_to_string(thd, 0, val, typelib.type_names); }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, session_var(thd, ulonglong)); }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(ulonglong)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return valptr(thd, option.def_value); }
 };
 
@@ -1536,7 +1537,7 @@ public:
     SYSVAR_ASSERT(size == sizeof(ulonglong));
   }
   bool check_maximum(THD *thd, set_var *var,
-                     const char *c_val, longlong i_val)
+                     const char *c_val, longlong i_val) override
   {
     if (!max_var_ptr() ||
         (var->save_result.ulonglong_value & ~(get_max_var())) == 0)
@@ -1547,7 +1548,7 @@ public:
                    throw_bounds_warning(thd, name.str, TRUE,
                                         var->value->unsigned_flag, i_val);
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     char buff[STRING_BUFFER_USUAL_SIZE];
     String str(buff, sizeof(buff), system_charset_info), *res;
@@ -1593,27 +1594,27 @@ public:
     var->save_result.ulonglong_value= tmp;
     return check_maximum(thd, var, 0, tmp);
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, ulonglong)= var->save_result.ulonglong_value;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(ulonglong)= var->save_result.ulonglong_value;
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= global_var(ulonglong); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= option.def_value; }
   const uchar *valptr(THD *thd, ulonglong val) const
   { return reinterpret_cast<const uchar*>(set_to_string(thd, 0, val, typelib.type_names)); }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, session_var(thd, ulonglong)); }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(ulonglong)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return valptr(thd, option.def_value); }
 
   ulonglong get_max_var() { return *((ulonglong*) max_var_ptr()); }
@@ -1654,7 +1655,7 @@ public:
     SYSVAR_ASSERT(size == sizeof(plugin_ref));
     SYSVAR_ASSERT(getopt.id < 0); // force NO_CMD_LINE
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     char buff[STRING_BUFFER_USUAL_SIZE];
     String str(buff,sizeof(buff), system_charset_info), *res;
@@ -1693,19 +1694,19 @@ public:
       plugin_unlock(NULL, oldval);
     }
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     do_update((plugin_ref*)session_var_ptr(thd),
               var->save_result.plugin);
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     do_update((plugin_ref*)global_var_ptr(),
               var->save_result.plugin);
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     plugin_ref plugin= global_var(plugin_ref);
     var->save_result.plugin= plugin ? my_plugin_lock(thd, plugin) : 0;
@@ -1727,7 +1728,7 @@ public:
     return my_plugin_lock(thd, plugin);
   }
 
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     var->save_result.plugin= get_default(thd);
   }
@@ -1737,11 +1738,11 @@ public:
     return (uchar*)(plugin ? thd->strmake(plugin_name(plugin)->str,
                                           plugin_name(plugin)->length) : 0);
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, session_var(thd, plugin_ref)); }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(plugin_ref)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return valptr(thd, get_default(thd)); }
 };
 
@@ -1790,7 +1791,7 @@ public:
     SYSVAR_ASSERT(size == sizeof(plugin_ref));
     SYSVAR_ASSERT(getopt.id < 0); // force NO_CMD_LINE
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     char buff[STRING_BUFFER_USUAL_SIZE];
     String str(buff,sizeof(buff), system_charset_info), *res;
@@ -1811,19 +1812,19 @@ public:
     *valptr= copy_engine_list(newval);
     free_engine_list(oldval);
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     do_update((plugin_ref**)session_var_ptr(thd),
               var->save_result.plugins);
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     do_update((plugin_ref**)global_var_ptr(),
               var->save_result.plugins);
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     plugin_ref* plugins= global_var(plugin_ref *);
     var->save_result.plugins= plugins ? temp_copy_engine_list(thd, plugins) : 0;
@@ -1837,7 +1838,7 @@ public:
                                false, true);
   }
 
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     var->save_result.plugins= get_default(thd);
   }
@@ -1846,11 +1847,11 @@ public:
   {
     return reinterpret_cast<uchar*>(pretty_print_engine_list(thd, plugins));
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, session_var(thd, plugin_ref*)); }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(plugin_ref*)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return valptr(thd, get_default(thd)); }
 };
 
@@ -1880,7 +1881,7 @@ public:
     SYSVAR_ASSERT(scope() == ONLY_SESSION);
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     char buff[STRING_BUFFER_USUAL_SIZE];
     String str(buff, sizeof(buff), system_charset_info), *res;
@@ -1895,35 +1896,35 @@ public:
     }
     return false;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     return debug_sync_update(thd, var->save_result.string_value.str,
                                   var->save_result.string_value.length);
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     var->save_result.string_value.str= const_cast<char*>("");
     var->save_result.string_value.length= 0;
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     return debug_sync_value_ptr(thd);
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(FALSE);
     return 0;
   }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return (uchar*)""; }
 };
 #endif /* defined(ENABLED_DEBUG_SYNC) */
@@ -1981,22 +1982,22 @@ public:
     SYSVAR_ASSERT(def_val < 2);
     SYSVAR_ASSERT(size == sizeof(ulonglong));
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     set(session_var_ptr(thd), var->save_result.ulonglong_value);
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     set(global_var_ptr(), var->save_result.ulonglong_value);
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     var->save_result.ulonglong_value=
       (reverse_semantics == !(global_var(ulonglong) & bitmask));
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { var->save_result.ulonglong_value= option.def_value; }
 
   uchar *valptr(THD *thd, ulonglong val) const
@@ -2004,11 +2005,11 @@ public:
     thd->sys_var_tmp.my_bool_value= (reverse_semantics == !(val & bitmask));
     return (uchar*) &thd->sys_var_tmp.my_bool_value;
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, session_var(thd, ulonglong)); }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(ulonglong)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   {
     thd->sys_var_tmp.my_bool_value= option.def_value != 0;
     return (uchar*) &thd->sys_var_tmp.my_bool_value;
@@ -2056,28 +2057,28 @@ public:
     SYSVAR_ASSERT(scope() == ONLY_SESSION);
     SYSVAR_ASSERT(getopt.id < 0); // NO_CMD_LINE, because the offset is fake
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   { return update_func(thd, var); }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->value= 0; }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { DBUG_ASSERT(FALSE); }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     thd->sys_var_tmp.ulonglong_value= read_func(thd);
     return (uchar*) &thd->sys_var_tmp.ulonglong_value;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(FALSE);
     return 0;
   }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   {
     thd->sys_var_tmp.ulonglong_value= 0;
     return (uchar*) &thd->sys_var_tmp.ulonglong_value;
@@ -2109,7 +2110,7 @@ public:
     SYSVAR_ASSERT(scope() == ONLY_SESSION);
     SYSVAR_ASSERT(getopt.id < 0); // NO_CMD_LINE, because the offset is fake
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     if (var->value)
     {
@@ -2120,36 +2121,36 @@ public:
       thd->user_time.val= 0;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  bool session_is_default(THD *thd)
+  bool session_is_default(THD *thd) override
   {
     return thd->user_time.val == 0;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->value= 0; }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   { DBUG_ASSERT(FALSE); }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     thd->sys_var_tmp.double_value= thd->start_time +
           thd->start_time_sec_part/(double)TIME_SECOND_PART_FACTOR;
     return (uchar*) &thd->sys_var_tmp.double_value;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(FALSE);
     return 0;
   }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   {
     thd->sys_var_tmp.double_value= 0;
     return (uchar*) &thd->sys_var_tmp.double_value;
   }
-  bool on_check_access_session(THD *thd) const;
+  bool on_check_access_session(THD *thd) const override;
 };
 
 
@@ -2188,28 +2189,28 @@ public:
     SYSVAR_ASSERT(size == sizeof(enum SHOW_COMP_OPTION));
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var) {
+  bool do_check(THD *thd, set_var *var) override {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(FALSE);
     return true;
   }
-  void session_save_default(THD *thd, set_var *var) { }
-  void global_save_default(THD *thd, set_var *var) { }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  void session_save_default(THD *thd, set_var *var) override { }
+  void global_save_default(THD *thd, set_var *var) override { }
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(FALSE);
     return 0;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     return (uchar*)show_comp_option_name[global_var(enum SHOW_COMP_OPTION)];
   }
@@ -2260,32 +2261,32 @@ public:
     SYSVAR_ASSERT(getopt.id < 0);
     SYSVAR_ASSERT(size == sizeof(void *));
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   { return false; }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, const void*)= var->save_result.ptr;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(const void*)= var->save_result.ptr;
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   { var->save_result.ptr= global_var(void*); }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     void **default_value= reinterpret_cast<void**>(option.def_value);
     var->save_result.ptr= *default_value;
   }
   uchar *valptr(THD *thd, uchar *val) const
   { return val ? *(uchar**)(val+name_offset) : 0; }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, session_var(thd, uchar*)); }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(uchar*)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return valptr(thd, *(uchar**)option.def_value); }
 };
 
@@ -2297,7 +2298,7 @@ class Sys_var_charset: public Sys_var_struct
 {
 public:
   using Sys_var_struct::Sys_var_struct;
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *, set_var *var) override
   {
     /*
       The default value can point to an arbitrary collation,
@@ -2344,7 +2345,7 @@ public:
     SYSVAR_ASSERT(size == sizeof(Time_zone *));
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     char buff[MAX_TIME_ZONE_NAME_LENGTH];
     String str(buff, sizeof(buff), &my_charset_latin1);
@@ -2361,28 +2362,28 @@ public:
     }
     return false;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     session_var(thd, Time_zone*)= var->save_result.time_zone;
     return false;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     global_var(Time_zone*)= var->save_result.time_zone;
     return false;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     var->save_result.time_zone= global_var(Time_zone*);
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     var->save_result.time_zone=
       *(Time_zone**)(intptr)option.def_value;
   }
   const uchar *valptr(THD *thd, Time_zone *val) const
   { return reinterpret_cast<const uchar*>(val->get_name()->ptr()); }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     /*
       This is an ugly fix for replication: we don't replicate properly queries
@@ -2395,9 +2396,9 @@ public:
     thd->used|= THD::TIME_ZONE_USED;
     return valptr(thd, session_var(thd, Time_zone *));
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return valptr(thd, global_var(Time_zone*)); }
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *default_value_ptr(THD *thd) const override
   { return valptr(thd, *(Time_zone**)option.def_value); }
 };
 
@@ -2426,7 +2427,7 @@ public:
                   values, def_val, lock, binlog_status_arg, on_check_func,
                   on_update_func, substitute)
   {}
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     if (var->type == OPT_SESSION && Sys_var_enum::session_update(thd, var))
       return TRUE;
@@ -2490,7 +2491,7 @@ public:
                     def_val, lock, binlog_status_arg, on_check_func,
                     on_update_func, substitute)
   {}
-  virtual bool session_update(THD *thd, set_var *var);
+  bool session_update(THD *thd, set_var *var) override;
 };
 
 /*
@@ -2509,7 +2510,7 @@ public:
     :Sys_var_enum(name_arg, comment, flag_args, off, size, getopt,
                   values, def_val, lock, binlog_status_arg)
   {}
-  bool global_update(THD *thd, set_var *var);
+  bool global_update(THD *thd, set_var *var) override;
 };
 
 /*
@@ -2550,16 +2551,16 @@ public:
     mi_accessor_func(mi_accessor_arg),
     update_multi_source_variable_func(on_update_func)
   { }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     return session_update(thd, var);
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     /* Use value given in variable declaration */
     global_save_default(thd, var);
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     ulonglong *tmp, res;
     tmp= (ulonglong*) (((uchar*)&(thd->variables)) + offset);
@@ -2567,7 +2568,7 @@ public:
     *tmp= res;
     return (uchar*) tmp;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     return session_value_ptr(thd, base);
   }
@@ -2596,35 +2597,35 @@ public:
     SYSVAR_ASSERT(is_readonly());
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(false);
     return NULL;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const;
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override;
 };
 
 
@@ -2645,35 +2646,35 @@ public:
     SYSVAR_ASSERT(is_readonly());
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(false);
     return NULL;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const;
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override;
 };
 
 
@@ -2692,31 +2693,31 @@ public:
   {
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var);
-  bool session_update(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override;
+  bool session_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool global_update(THD *thd, set_var *var);
-  void session_save_default(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override;
+  void session_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     /* Record the attempt to use default so we can error. */
     var->value= 0;
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(false);
     return NULL;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const;
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override;
+  const uchar *default_value_ptr(THD *thd) const override
   { return 0; }
-  bool on_check_access_global(THD *thd) const
+  bool on_check_access_global(THD *thd) const override
   {
     return check_global_access(thd, PRIV_SET_SYSTEM_GLOBAL_VAR_GTID_SLAVE_POS);
   }
@@ -2738,31 +2739,31 @@ public:
   {
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var);
-  bool session_update(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override;
+  bool session_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool global_update(THD *thd, set_var *var);
-  void session_save_default(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override;
+  void session_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     /* Record the attempt to use default so we can error. */
     var->value= 0;
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(false);
     return NULL;
   }
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const;
-  const uchar *default_value_ptr(THD *thd) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override;
+  const uchar *default_value_ptr(THD *thd) const override
   { return 0; }
-  bool on_check_access_global(THD *thd) const
+  bool on_check_access_global(THD *thd) const override
   {
     return
       check_global_access(thd, PRIV_SET_SYSTEM_GLOBAL_VAR_GTID_BINLOG_STATE);
@@ -2786,31 +2787,31 @@ public:
     SYSVAR_ASSERT(is_readonly());
     option.var_type|= GET_STR;
   }
-  bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
     return true;
   }
-  void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     DBUG_ASSERT(false);
   }
-  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const;
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override;
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   {
     DBUG_ASSERT(false);
     return NULL;
@@ -2835,8 +2836,8 @@ public:
     option.value= (uchar**)1; // crash me, please
     SYSVAR_ASSERT(scope() == GLOBAL);
   }
-  bool global_update(THD *thd, set_var *var);
-  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const;
+  bool global_update(THD *thd, set_var *var) override;
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override;
 };
 
 
@@ -2857,7 +2858,7 @@ public:
   {
     option.var_type= GET_STR;
   }
-  virtual bool do_check(THD *thd, set_var *var)
+  bool do_check(THD *thd, set_var *var) override
   {
     if (!var->value)
       return false;
@@ -2896,26 +2897,26 @@ private:
   }
 
 public:
-  virtual bool global_update(THD *thd, set_var *var)
+  bool global_update(THD *thd, set_var *var) override
   {
     return update(thd, var, &global_var(vers_asof_timestamp_t));
   }
-  virtual bool session_update(THD *thd, set_var *var)
+  bool session_update(THD *thd, set_var *var) override
   {
     return update(thd, var, &session_var(thd, vers_asof_timestamp_t));
   }
 
-  virtual bool session_is_default(THD *thd)
+  bool session_is_default(THD *thd) override
   {
     const vers_asof_timestamp_t &var= session_var(thd, vers_asof_timestamp_t);
     return var.type == SYSTEM_TIME_UNSPECIFIED;
   }
 
-  virtual void session_save_default(THD *thd, set_var *var)
+  void session_save_default(THD *thd, set_var *var) override
   {
     save_default(var, &session_var(thd, vers_asof_timestamp_t));
   }
-  virtual void global_save_default(THD *thd, set_var *var)
+  void global_save_default(THD *thd, set_var *var) override
   {
     save_default(var, &global_var(vers_asof_timestamp_t));
   }
@@ -2953,9 +2954,9 @@ private:
   }
 
 public:
-  virtual const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return value_ptr(thd, session_var(thd, vers_asof_timestamp_t)); }
-  virtual const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const
+  const uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
   { return value_ptr(thd, global_var(vers_asof_timestamp_t)); }
 };
 
diff --git a/sql/sys_vars_shared.h b/sql/sys_vars_shared.h
index 508a0a70c8f..708021b4127 100644
--- a/sql/sys_vars_shared.h
+++ b/sql/sys_vars_shared.h
@@ -52,9 +52,9 @@ class PolyLock_mutex: public PolyLock
   mysql_mutex_t *mutex;
 public:
   PolyLock_mutex(mysql_mutex_t *arg): mutex(arg) {}
-  void rdlock() { mysql_mutex_lock(mutex); }
-  void wrlock() { mysql_mutex_lock(mutex); }
-  void unlock() { mysql_mutex_unlock(mutex); }
+  void rdlock() override { mysql_mutex_lock(mutex); }
+  void wrlock() override { mysql_mutex_lock(mutex); }
+  void unlock() override { mysql_mutex_unlock(mutex); }
 };
 
 class PolyLock_rwlock: public PolyLock
@@ -62,9 +62,9 @@ class PolyLock_rwlock: public PolyLock
   mysql_rwlock_t *rwlock;
 public:
   PolyLock_rwlock(mysql_rwlock_t *arg): rwlock(arg) {}
-  void rdlock() { mysql_rwlock_rdlock(rwlock); }
-  void wrlock() { mysql_rwlock_wrlock(rwlock); }
-  void unlock() { mysql_rwlock_unlock(rwlock); }
+  void rdlock() override { mysql_rwlock_rdlock(rwlock); }
+  void wrlock() override { mysql_rwlock_wrlock(rwlock); }
+  void unlock() override { mysql_rwlock_unlock(rwlock); }
 };
 
 class AutoWLock
diff --git a/sql/table.h b/sql/table.h
index 1526bb2fd86..a77c24ec419 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -178,9 +178,9 @@ protected:
                               CHARSET_INFO *connection_cl);
 
 protected:
-  virtual Object_creation_ctx *create_backup_ctx(THD *thd) const;
+  Object_creation_ctx *create_backup_ctx(THD *thd) const override;
 
-  virtual void change_env(THD *thd) const;
+  void change_env(THD *thd) const override;
 
 protected:
   /**
@@ -590,7 +590,7 @@ public:
 class Table_check_intact_log_error : public Table_check_intact
 {
 protected:
-  void report_error(uint, const char *fmt, ...);
+  void report_error(uint, const char *fmt, ...) override;
 public:
   Table_check_intact_log_error() : Table_check_intact(true) {}
 };
@@ -616,9 +616,9 @@ public:
 
   MDL_context *get_ctx() const { return m_ctx; }
 
-  virtual bool accept_visitor(MDL_wait_for_graph_visitor *dvisitor);
+  bool accept_visitor(MDL_wait_for_graph_visitor *dvisitor) override;
 
-  virtual uint get_deadlock_weight() const;
+  uint get_deadlock_weight() const override;
 
   /**
     Pointers for participating in the list of waiters for table share.
@@ -3134,13 +3134,13 @@ class Field_iterator_table: public Field_iterator
   Field **ptr;
 public:
   Field_iterator_table() :ptr(0) {}
-  void set(TABLE_LIST *table) { ptr= table->table->field; }
+  void set(TABLE_LIST *table) override { ptr= table->table->field; }
   void set_table(TABLE *table) { ptr= table->field; }
-  void next() { ptr++; }
-  bool end_of_fields() { return *ptr == 0; }
-  const Lex_ident_column name();
-  Item *create_item(THD *thd);
-  Field *field() { return *ptr; }
+  void next() override { ptr++; }
+  bool end_of_fields() override { return *ptr == 0; }
+  const Lex_ident_column name() override;
+  Item *create_item(THD *thd) override ;
+  Field *field() override { return *ptr; }
 };
 
 
@@ -3152,13 +3152,13 @@ class Field_iterator_view: public Field_iterator
   TABLE_LIST *view;
 public:
   Field_iterator_view() :ptr(0), array_end(0) {}
-  void set(TABLE_LIST *table);
-  void next() { ptr++; }
-  bool end_of_fields() { return ptr == array_end; }
-  const Lex_ident_column name();
-  Item *create_item(THD *thd);
+  void set(TABLE_LIST *table) override;
+  void next() override { ptr++; }
+  bool end_of_fields() override { return ptr == array_end; }
+  const Lex_ident_column name() override;
+  Item *create_item(THD *thd) override;
   Item **item_ptr() {return &ptr->item; }
-  Field *field() { return 0; }
+  Field *field() override { return 0; }
   inline Item *item() { return ptr->item; }
   Field_translator *field_translator() { return ptr; }
 };
@@ -3176,12 +3176,12 @@ class Field_iterator_natural_join: public Field_iterator
 public:
   Field_iterator_natural_join() :cur_column_ref(NULL) {}
   ~Field_iterator_natural_join() = default;
-  void set(TABLE_LIST *table);
-  void next();
-  bool end_of_fields() { return !cur_column_ref; }
-  const Lex_ident_column name() { return cur_column_ref->name(); }
-  Item *create_item(THD *thd) { return cur_column_ref->create_item(thd); }
-  Field *field() { return cur_column_ref->field(); }
+  void set(TABLE_LIST *table) override;
+  void next() override;
+  bool end_of_fields() override { return !cur_column_ref; }
+  const Lex_ident_column name() override { return cur_column_ref->name(); }
+  Item *create_item(THD *thd) override { return cur_column_ref->create_item(thd); }
+  Field *field() override { return cur_column_ref->field(); }
   Natural_join_column *column_ref() const { return cur_column_ref; }
 };
 
@@ -3212,16 +3212,16 @@ class Field_iterator_table_ref: public Field_iterator
   void set_field_iterator();
 public:
   Field_iterator_table_ref() :field_it(NULL) {}
-  void set(TABLE_LIST *table);
-  void next();
-  bool end_of_fields()
+  void set(TABLE_LIST *table) override;
+  void next() override;
+  bool end_of_fields() override
   { return (table_ref == last_leaf && field_it->end_of_fields()); }
-  const Lex_ident_column name() { return field_it->name(); }
+  const Lex_ident_column name() override { return field_it->name(); }
   const Lex_ident_table get_table_name() const;
   const Lex_ident_db get_db_name() const;
   GRANT_INFO *grant();
-  Item *create_item(THD *thd) { return field_it->create_item(thd); }
-  Field *field() { return field_it->field(); }
+  Item *create_item(THD *thd) override { return field_it->create_item(thd); }
+  Field *field() override { return field_it->field(); }
   Natural_join_column *get_or_create_column_ref(THD *thd, TABLE_LIST *parent_table_ref);
   Natural_join_column *get_natural_column_ref();
 };
diff --git a/sql/threadpool.h b/sql/threadpool.h
index d815d538cde..4bae78dfddf 100644
--- a/sql/threadpool.h
+++ b/sql/threadpool.h
@@ -140,13 +140,13 @@ struct TP_pool
 struct TP_pool_win:TP_pool
 {
   TP_pool_win();
-  virtual int init();
-  virtual ~TP_pool_win();
-  virtual TP_connection *new_connection(CONNECT *c);
-  virtual void add(TP_connection *);
-  virtual int set_max_threads(uint);
-  virtual int set_min_threads(uint);
-  void resume(TP_connection *c);
+  int init() override;
+  ~TP_pool_win() override;
+  TP_connection *new_connection(CONNECT *c) override;
+  void add(TP_connection *) override;
+  int set_max_threads(uint) override;
+  int set_min_threads(uint) override;
+  void resume(TP_connection *c) override;
 };
 #endif
 
@@ -154,13 +154,13 @@ struct TP_pool_generic :TP_pool
 {
   TP_pool_generic();
   ~TP_pool_generic();
-  virtual int init();
-  virtual TP_connection *new_connection(CONNECT *c);
-  virtual void add(TP_connection *);
-  virtual int set_pool_size(uint);
-  virtual int set_stall_limit(uint);
-  virtual int get_idle_thread_count();
-  void resume(TP_connection* c);
+  int init() override;
+  TP_connection *new_connection(CONNECT *c) override;
+  void add(TP_connection *) override;
+  int set_pool_size(uint) override;
+  int set_stall_limit(uint) override;
+  int get_idle_thread_count() override;
+  void resume(TP_connection* c) override;
 };
 
 #endif /* HAVE_POOL_OF_THREADS */
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 830b7977099..9a547c2f759 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -1013,10 +1013,12 @@ class Time_zone_system : public Time_zone
 {
 public:
   Time_zone_system() = default;                       /* Remove gcc warning */
-  virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, uint *error_code) const;
-  virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const;
-  virtual const String * get_name() const;
-  virtual void get_timezone_information(struct my_tz* curr_tz, const MYSQL_TIME *local_TIME) const;
+  my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t,
+                            uint *error_code) const override;
+  void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const override;
+  const String * get_name() const override;
+  void get_timezone_information(struct my_tz* curr_tz,
+                                const MYSQL_TIME *local_TIME) const override;
 };
 
 
@@ -1119,11 +1121,12 @@ class Time_zone_utc : public Time_zone
 {
 public:
   Time_zone_utc() = default;                          /* Remove gcc warning */
-  virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t,
-                                    uint *error_code) const;
-  virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const;
-  virtual const String * get_name() const;
-  virtual void get_timezone_information(struct my_tz* curr_tz, const MYSQL_TIME *local_TIME) const;
+  my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t,
+                            uint *error_code) const override;
+  void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const override;
+  const String * get_name() const override;
+  void get_timezone_information(struct my_tz* curr_tz,
+                                const MYSQL_TIME *local_TIME) const override;
 };
 
 
@@ -1210,10 +1213,12 @@ class Time_zone_db : public Time_zone
 {
 public:
   Time_zone_db(TIME_ZONE_INFO *tz_info_arg, const String * tz_name_arg);
-  virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, uint *error_code) const;
-  virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const;
-  virtual const String * get_name() const;
-  virtual void get_timezone_information(struct my_tz* curr_tz, const MYSQL_TIME *local_TIME) const;
+  my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t,
+                            uint *error_code) const override;
+  void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const override;
+  const String * get_name() const override;
+  void get_timezone_information(struct my_tz* curr_tz,
+                                const MYSQL_TIME *local_TIME) const override;
 private:
   TIME_ZONE_INFO *tz_info;
   const String *tz_name;
@@ -1325,11 +1330,12 @@ class Time_zone_offset : public Time_zone
 {
 public:
   Time_zone_offset(long tz_offset_arg);
-  virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t,
-                                    uint *error_code) const;
-  virtual void   gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const;
-  virtual const String * get_name() const;
-  virtual void get_timezone_information(struct my_tz* curr_tz, const MYSQL_TIME *local_TIME) const;
+  my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t,
+                            uint *error_code) const override;
+  void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const override;
+  const String * get_name() const override;
+  void get_timezone_information(struct my_tz* curr_tz,
+                                const MYSQL_TIME *local_TIME) const override;
   /*
     This have to be public because we want to be able to access it from
     my_offset_tzs_get_key() function
diff --git a/sql/wsrep_client_service.h b/sql/wsrep_client_service.h
index b74c52b038f..f53d9be083d 100644
--- a/sql/wsrep_client_service.h
+++ b/sql/wsrep_client_service.h
@@ -36,38 +36,38 @@ class Wsrep_client_service : public wsrep::client_service
 public:
   Wsrep_client_service(THD*, Wsrep_client_state&);
 
-  bool interrupted(wsrep::unique_lock<wsrep::mutex>&) const;
-  void reset_globals();
-  void store_globals();
-  int prepare_data_for_replication();
-  void cleanup_transaction();
-  bool statement_allowed_for_streaming() const;
-  size_t bytes_generated() const;
-  int prepare_fragment_for_replication(wsrep::mutable_buffer&, size_t&);
-  int remove_fragments();
-  void emergency_shutdown()
+  bool interrupted(wsrep::unique_lock<wsrep::mutex>&) const override;
+  void reset_globals() override;
+  void store_globals() override;
+  int prepare_data_for_replication() override;
+  void cleanup_transaction() override;
+  bool statement_allowed_for_streaming() const override;
+  size_t bytes_generated() const override;
+  int prepare_fragment_for_replication(wsrep::mutable_buffer&, size_t&) override;
+  int remove_fragments() override;
+  void emergency_shutdown() override
   { throw wsrep::not_implemented_error(); }
-  void will_replay();
-  void signal_replayed();
-  enum wsrep::provider::status replay();
-  enum wsrep::provider::status replay_unordered();
-  void wait_for_replayers(wsrep::unique_lock<wsrep::mutex>&);
-  enum wsrep::provider::status commit_by_xid();
-  bool is_explicit_xa()
+  void will_replay() override;
+  void signal_replayed() override;
+  enum wsrep::provider::status replay() override;
+  enum wsrep::provider::status replay_unordered() override;
+  void wait_for_replayers(wsrep::unique_lock<wsrep::mutex>&) override;
+  enum wsrep::provider::status commit_by_xid() override;
+  bool is_explicit_xa() override
   {
     return false;
   }
-  bool is_prepared_xa()
+  bool is_prepared_xa() override
   {
     return false;
   }
-  bool is_xa_rollback()
+  bool is_xa_rollback() override
   {
     return false;
   }
-  void debug_sync(const char*);
-  void debug_crash(const char*);
-  int bf_rollback();
+  void debug_sync(const char*) override;
+  void debug_crash(const char*) override;
+  int bf_rollback() override;
 private:
   friend class Wsrep_server_service;
   THD* m_thd;
diff --git a/sql/wsrep_condition_variable.h b/sql/wsrep_condition_variable.h
index d9798bb9548..a4a121aa662 100644
--- a/sql/wsrep_condition_variable.h
+++ b/sql/wsrep_condition_variable.h
@@ -31,17 +31,17 @@ public:
   { }
   ~Wsrep_condition_variable() = default;
 
-  void notify_one()
+  void notify_one() override
   {
     mysql_cond_signal(m_cond);
   }
 
-  void notify_all()
+  void notify_all() override
   {
     mysql_cond_broadcast(m_cond);
   }
 
-  void wait(wsrep::unique_lock<wsrep::mutex>& lock)
+  void wait(wsrep::unique_lock<wsrep::mutex>& lock) override
   {
     mysql_mutex_t* mutex= static_cast<mysql_mutex_t*>(lock.mutex()->native());
     mysql_cond_wait(m_cond, mutex);
diff --git a/sql/wsrep_high_priority_service.h b/sql/wsrep_high_priority_service.h
index c275c352de2..33b85ec8a24 100644
--- a/sql/wsrep_high_priority_service.h
+++ b/sql/wsrep_high_priority_service.h
@@ -33,31 +33,31 @@ public:
   Wsrep_high_priority_service(THD*);
   ~Wsrep_high_priority_service();
   int start_transaction(const wsrep::ws_handle&,
-                        const wsrep::ws_meta&);
-  int next_fragment(const wsrep::ws_meta&);
-  const wsrep::transaction& transaction() const;
-  int adopt_transaction(const wsrep::transaction&);
+                        const wsrep::ws_meta&) override;
+  int next_fragment(const wsrep::ws_meta&) override;
+  const wsrep::transaction& transaction() const override;
+  int adopt_transaction(const wsrep::transaction&) override;
   int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
-                      wsrep::mutable_buffer&) = 0;
+                      wsrep::mutable_buffer&) override = 0;
   int append_fragment_and_commit(const wsrep::ws_handle&,
                                  const wsrep::ws_meta&,
                                  const wsrep::const_buffer&,
-                                 const wsrep::xid&);
-  int remove_fragments(const wsrep::ws_meta&);
-  int commit(const wsrep::ws_handle&, const wsrep::ws_meta&);
-  int rollback(const wsrep::ws_handle&, const wsrep::ws_meta&);
+                                 const wsrep::xid&) override;
+  int remove_fragments(const wsrep::ws_meta&) override;
+  int commit(const wsrep::ws_handle&, const wsrep::ws_meta&) override;
+  int rollback(const wsrep::ws_handle&, const wsrep::ws_meta&) override;
   int apply_toi(const wsrep::ws_meta&, const wsrep::const_buffer&,
-                wsrep::mutable_buffer&);
-  void store_globals();
-  void reset_globals();
-  void switch_execution_context(wsrep::high_priority_service&);
+                wsrep::mutable_buffer&) override;
+  void store_globals() override;
+  void reset_globals() override;
+  void switch_execution_context(wsrep::high_priority_service&) override;
   int log_dummy_write_set(const wsrep::ws_handle&,
                           const wsrep::ws_meta&,
-                          wsrep::mutable_buffer&);
-  void adopt_apply_error(wsrep::mutable_buffer&);
+                          wsrep::mutable_buffer&) override;
+  void adopt_apply_error(wsrep::mutable_buffer&) override;
 
   virtual bool check_exit_status() const = 0;
-  void debug_crash(const char*);
+  void debug_crash(const char*) override;
 protected:
   friend Wsrep_server_service;
   THD* m_thd;
@@ -84,12 +84,12 @@ public:
   Wsrep_applier_service(THD*);
   ~Wsrep_applier_service();
   int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
-                      wsrep::mutable_buffer&);
+                      wsrep::mutable_buffer&) override;
   int apply_nbo_begin(const wsrep::ws_meta&, const wsrep::const_buffer& data,
-                      wsrep::mutable_buffer& err);
-  void after_apply();
-  bool is_replaying() const { return false; }
-  bool check_exit_status() const;
+                      wsrep::mutable_buffer& err) override;
+  void after_apply() override;
+  bool is_replaying() const override { return false; }
+  bool check_exit_status() const override;
 };
 
 class Wsrep_replayer_service : public Wsrep_high_priority_service
@@ -98,21 +98,21 @@ public:
   Wsrep_replayer_service(THD* replayer_thd, THD* orig_thd);
   ~Wsrep_replayer_service();
   int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
-                      wsrep::mutable_buffer&);
+                      wsrep::mutable_buffer&) override;
   int apply_nbo_begin(const wsrep::ws_meta&, const wsrep::const_buffer& data,
-                      wsrep::mutable_buffer& err)
+                      wsrep::mutable_buffer& err) override
   {
     DBUG_ASSERT(0); /* DDL should never cause replaying */
     return 0;
   }
-  void after_apply() { }
-  bool is_replaying() const { return true; }
+  void after_apply() override { }
+  bool is_replaying() const override { return true; }
   void replay_status(enum wsrep::provider::status status)
   { m_replay_status = status; }
   enum wsrep::provider::status replay_status() const
   { return m_replay_status; }
   /* Replayer should never be forced to exit */
-  bool check_exit_status() const { return false; }
+  bool check_exit_status() const override { return false; }
 private:
   THD* m_orig_thd;
   struct da_shadow
diff --git a/sql/wsrep_mutex.h b/sql/wsrep_mutex.h
index 50f129c96cd..d137364f1ed 100644
--- a/sql/wsrep_mutex.h
+++ b/sql/wsrep_mutex.h
@@ -30,17 +30,17 @@ public:
     : m_mutex(mutex)
   { }
 
-  void lock()
+  void lock() override
   {
     mysql_mutex_lock(m_mutex);
   }
 
-  void unlock()
+  void unlock() override
   {
     mysql_mutex_unlock(m_mutex);
   }
 
-  void* native()
+  void* native() override
   {
     return m_mutex;
   }
diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc
index d9baf69999a..05eb1eeb7fa 100644
--- a/sql/wsrep_schema.cc
+++ b/sql/wsrep_schema.cc
@@ -163,6 +163,24 @@ private:
   my_bool m_wsrep_on;
 };
 
+class wsrep_ignore_table
+{
+public:
+  wsrep_ignore_table(THD* thd)
+    : m_thd(thd)
+    , m_wsrep_ignore_table(thd->wsrep_ignore_table)
+  {
+    thd->wsrep_ignore_table= true;
+  }
+  ~wsrep_ignore_table()
+  {
+    m_thd->wsrep_ignore_table= m_wsrep_ignore_table;
+  }
+private:
+  THD* m_thd;
+  my_bool m_wsrep_ignore_table;
+};
+
 class thd_server_status
 {
 public:
@@ -760,6 +778,12 @@ int Wsrep_schema::store_view(THD* thd, const Wsrep_view& view)
   Wsrep_schema_impl::binlog_off binlog_off(thd);
   Wsrep_schema_impl::sql_safe_updates sql_safe_updates(thd);
 
+  if (trans_begin(thd, MYSQL_START_TRANS_OPT_READ_WRITE))
+  {
+    WSREP_ERROR("Failed to start transaction for store view");
+    goto out_not_started;
+  }
+
   /*
     Clean up cluster table and members table.
   */
@@ -853,7 +877,22 @@ int Wsrep_schema::store_view(THD* thd, const Wsrep_view& view)
 #endif /* WSREP_SCHEMA_MEMBERS_HISTORY */
   ret= 0;
  out:
+  if (ret)
+  {
+    trans_rollback_stmt(thd);
+    if (!trans_rollback(thd))
+    {
+      close_thread_tables(thd);
+    }
+  }
+  else if (trans_commit(thd))
+  {
+    ret= 1;
+    WSREP_ERROR("Failed to commit transaction for store view");
+  }
+  thd->release_transactional_locks();
 
+out_not_started:
   DBUG_RETURN(ret);
 }
 
@@ -1205,7 +1244,7 @@ int Wsrep_schema::remove_fragments(THD* thd,
   int ret= 0;
 
   WSREP_DEBUG("Removing %zu fragments", fragments.size());
-  Wsrep_schema_impl::wsrep_off  wsrep_off(thd);
+  Wsrep_schema_impl::wsrep_ignore_table wsrep_ignore_table(thd);
   Wsrep_schema_impl::binlog_off binlog_off(thd);
   Wsrep_schema_impl::sql_safe_updates sql_safe_updates(thd);
 
diff --git a/sql/wsrep_server_service.cc b/sql/wsrep_server_service.cc
index 19fa4470687..71252c94399 100644
--- a/sql/wsrep_server_service.cc
+++ b/sql/wsrep_server_service.cc
@@ -239,29 +239,9 @@ void Wsrep_server_service::log_view(
                     view.state_id().seqno().get() >= prev_view.state_id().seqno().get());
       }
 
-      if (trans_begin(applier->m_thd, MYSQL_START_TRANS_OPT_READ_WRITE))
+      if (wsrep_schema->store_view(applier->m_thd, view))
       {
-        WSREP_WARN("Failed to start transaction for store view");
-      }
-      else
-      {
-        if (wsrep_schema->store_view(applier->m_thd, view))
-        {
-          WSREP_WARN("Failed to store view");
-          trans_rollback_stmt(applier->m_thd);
-          if (!trans_rollback(applier->m_thd))
-          {
-            close_thread_tables(applier->m_thd);
-          }
-        }
-        else
-        {
-          if (trans_commit(applier->m_thd))
-          {
-            WSREP_WARN("Failed to commit transaction for store view");
-          }
-        }
-        applier->m_thd->release_transactional_locks();
+        WSREP_WARN("Failed to store view");
       }
 
       /*
diff --git a/sql/wsrep_server_service.h b/sql/wsrep_server_service.h
index 0fc48402024..3a7da229cd4 100644
--- a/sql/wsrep_server_service.h
+++ b/sql/wsrep_server_service.h
@@ -32,49 +32,49 @@ public:
     : m_server_state(server_state)
   { }
 
-  wsrep::storage_service* storage_service(wsrep::client_service&);
+  wsrep::storage_service* storage_service(wsrep::client_service&) override;
 
-  wsrep::storage_service* storage_service(wsrep::high_priority_service&);
+  wsrep::storage_service* storage_service(wsrep::high_priority_service&) override;
 
-  void release_storage_service(wsrep::storage_service*);
+  void release_storage_service(wsrep::storage_service*) override;
 
   wsrep::high_priority_service*
-  streaming_applier_service(wsrep::client_service&);
+  streaming_applier_service(wsrep::client_service&) override;
 
   wsrep::high_priority_service*
-  streaming_applier_service(wsrep::high_priority_service&);
+  streaming_applier_service(wsrep::high_priority_service&) override;
 
-  void release_high_priority_service(wsrep::high_priority_service*);
+  void release_high_priority_service(wsrep::high_priority_service*) override;
 
   void background_rollback(wsrep::unique_lock<wsrep::mutex> &,
-                           wsrep::client_state &);
+                           wsrep::client_state &) override;
 
-  void bootstrap();
-  void log_message(enum wsrep::log::level, const char*);
+  void bootstrap() override;
+  void log_message(enum wsrep::log::level, const char*) override;
 
-  void log_dummy_write_set(wsrep::client_state&, const wsrep::ws_meta&)
+  void log_dummy_write_set(wsrep::client_state&, const wsrep::ws_meta&) override
   { throw wsrep::not_implemented_error(); }
 
-  void log_view(wsrep::high_priority_service*, const wsrep::view&);
+  void log_view(wsrep::high_priority_service*, const wsrep::view&) override;
 
-  void recover_streaming_appliers(wsrep::client_service&);
-  void recover_streaming_appliers(wsrep::high_priority_service&);
-  wsrep::view get_view(wsrep::client_service&, const wsrep::id& own_id);
+  void recover_streaming_appliers(wsrep::client_service&) override;
+  void recover_streaming_appliers(wsrep::high_priority_service&) override;
+  wsrep::view get_view(wsrep::client_service&, const wsrep::id& own_id) override;
 
-  wsrep::gtid get_position(wsrep::client_service&);
-  void set_position(wsrep::client_service&, const wsrep::gtid&);
+  wsrep::gtid get_position(wsrep::client_service&) override;
+  void set_position(wsrep::client_service&, const wsrep::gtid&) override;
 
   void log_state_change(enum wsrep::server_state::state,
-                        enum wsrep::server_state::state);
+                        enum wsrep::server_state::state) override;
 
-  bool sst_before_init() const;
+  bool sst_before_init() const override;
 
-  std::string sst_request();
-  int start_sst(const std::string&, const wsrep::gtid&, bool);
+  std::string sst_request() override;
+  int start_sst(const std::string&, const wsrep::gtid&, bool) override;
 
-  int wait_committing_transactions(int);
+  int wait_committing_transactions(int) override;
 
-  void debug_sync(const char*);
+  void debug_sync(const char*) override;
 private:
   Wsrep_server_state& m_server_state;
 };
diff --git a/sql/wsrep_storage_service.h b/sql/wsrep_storage_service.h
index f39543a89bc..e4b4402b410 100644
--- a/sql/wsrep_storage_service.h
+++ b/sql/wsrep_storage_service.h
@@ -28,19 +28,19 @@ class Wsrep_storage_service :
 public:
   Wsrep_storage_service(THD*);
   ~Wsrep_storage_service();
-  int start_transaction(const wsrep::ws_handle&);
-  void adopt_transaction(const wsrep::transaction&);
+  int start_transaction(const wsrep::ws_handle&) override;
+  void adopt_transaction(const wsrep::transaction&) override;
   int append_fragment(const wsrep::id&,
                       wsrep::transaction_id,
                       int flags,
                       const wsrep::const_buffer&,
-                      const wsrep::xid&);
-  int update_fragment_meta(const wsrep::ws_meta&);
-  int remove_fragments();
-  int commit(const wsrep::ws_handle&, const wsrep::ws_meta&);
-  int rollback(const wsrep::ws_handle&, const wsrep::ws_meta&);
-  void store_globals();
-  void reset_globals();
+                      const wsrep::xid&) override;
+  int update_fragment_meta(const wsrep::ws_meta&) override;
+  int remove_fragments() override;
+  int commit(const wsrep::ws_handle&, const wsrep::ws_meta&) override;
+  int rollback(const wsrep::ws_handle&, const wsrep::ws_meta&) override;
+  void store_globals() override;
+  void reset_globals() override;
 private:
   friend class Wsrep_server_service;
   THD* m_thd;
diff --git a/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h
index 04ca65f2a53..287f1db6bfa 100644
--- a/storage/blackhole/ha_blackhole.h
+++ b/storage/blackhole/ha_blackhole.h
@@ -49,15 +49,15 @@ public:
     The name of the index type that will be used for display
     don't implement this method unless you really have indexes
   */
-  const char *index_type(uint key_number);
-  ulonglong table_flags() const
+  const char *index_type(uint key_number) override;
+  ulonglong table_flags() const override
   {
     return(HA_NULL_IN_KEY | HA_CAN_FULLTEXT | HA_CAN_SQL_HANDLER |
            HA_BINLOG_STMT_CAPABLE | HA_BINLOG_ROW_CAPABLE |
            HA_CAN_INDEX_BLOBS | HA_AUTO_PART_KEY | HA_CAN_ONLINE_BACKUPS |
            HA_FILE_BASED | HA_CAN_GEOMETRY | HA_CAN_INSERT_DELAYED);
   }
-  ulong index_flags(uint inx, uint part, bool all_parts) const
+  ulong index_flags(uint inx, uint part, bool all_parts) const override
   {
     return ((table_share->key_info[inx].algorithm == HA_KEY_ALG_FULLTEXT) ?
             0 : HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE |
@@ -67,39 +67,39 @@ public:
 #define BLACKHOLE_MAX_KEY	MAX_KEY		/* Max allowed keys */
 #define BLACKHOLE_MAX_KEY_SEG	16		/* Max segments for key */
 #define BLACKHOLE_MAX_KEY_LENGTH	3500		/* Like in InnoDB */
-  uint max_supported_keys()          const { return BLACKHOLE_MAX_KEY; }
-  uint max_supported_key_length()    const { return BLACKHOLE_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length() const { return BLACKHOLE_MAX_KEY_LENGTH; }
-  int open(const char *name, int mode, uint test_if_locked);
-  int close(void);
-  int truncate();
-  int rnd_init(bool scan);
-  int rnd_next(uchar *buf);
-  int rnd_pos(uchar * buf, uchar *pos);
+  uint max_supported_keys() const       override { return BLACKHOLE_MAX_KEY; }
+  uint max_supported_key_length() const override { return BLACKHOLE_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length() const override { return BLACKHOLE_MAX_KEY_LENGTH; }
+  int open(const char *name, int mode, uint test_if_locked) override;
+  int close(void) override;
+  int truncate() override;
+  int rnd_init(bool scan) override;
+  int rnd_next(uchar *buf) override;
+  int rnd_pos(uchar * buf, uchar *pos) override;
   int index_read_map(uchar * buf, const uchar * key, key_part_map keypart_map,
-                     enum ha_rkey_function find_flag);
+                     enum ha_rkey_function find_flag) override;
   int index_read_idx_map(uchar * buf, uint idx, const uchar * key,
                          key_part_map keypart_map,
-                         enum ha_rkey_function find_flag);
-  int index_read_last_map(uchar * buf, const uchar * key, key_part_map keypart_map);
-  int index_next(uchar * buf);
-  int index_prev(uchar * buf);
-  int index_first(uchar * buf);
-  int index_last(uchar * buf);
-  void position(const uchar *record);
-  int info(uint flag);
-  int external_lock(THD *thd, int lock_type);
+                         enum ha_rkey_function find_flag) override;
+  int index_read_last_map(uchar * buf, const uchar * key, key_part_map keypart_map) override;
+  int index_next(uchar * buf) override;
+  int index_prev(uchar * buf) override;
+  int index_first(uchar * buf) override;
+  int index_last(uchar * buf) override;
+  void position(const uchar *record) override;
+  int info(uint flag) override;
+  int external_lock(THD *thd, int lock_type) override;
   int create(const char *name, TABLE *table_arg,
-             HA_CREATE_INFO *create_info);
+             HA_CREATE_INFO *create_info) override;
   THR_LOCK_DATA **store_lock(THD *thd,
                              THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type);
-  int delete_table(const char *name)
+                             enum thr_lock_type lock_type) override;
+  int delete_table(const char *name) override
   {
     return 0;
   }
 private:
-  virtual int write_row(const uchar *buf);
-  virtual int update_row(const uchar *old_data, const uchar *new_data);
-  virtual int delete_row(const uchar *buf);
+  int write_row(const uchar *buf) override;
+  int update_row(const uchar *old_data, const uchar *new_data) override;
+  int delete_row(const uchar *buf) override;
 };
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index 1d6bdd4db5c..4e831489b71 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -10,6 +10,11 @@ IF(NOT PLUGIN_PERFSCHEMA STREQUAL NO)
   add_definitions(-DHAVE_PSI_INTERFACE=)
 ENDIF()
 
+# let's temporarily disable the warning, until ColumnStore is fixed
+MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-error=suggest-override")
+MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-suggest-override")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -U_GLIBCXX_DEBUG -U_GLIBCXX_ASSERTIONS")
+
 # new gcc is quite buggy re. spurious warnings. let's shut it up
 IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "12.0.0")
   # 12
diff --git a/storage/connect/array.h b/storage/connect/array.h
index bd38344de06..af8e101594a 100644
--- a/storage/connect/array.h
+++ b/storage/connect/array.h
@@ -38,11 +38,11 @@ class DllExport ARRAY : public XOBJECT, public CSORT { // Array descblock
 //ARRAY(PGLOBAL g, PARRAY par, int k);
 
   // Implementation
-  virtual int   GetType(void) {return TYPE_ARRAY;}
-  virtual int   GetResultType(void) {return Type;}
-  virtual int   GetLength(void) {return Len;}
-  virtual int   GetLengthEx(void) {return Len;}
-  virtual int   GetScale() {return 0;}
+  int   GetType(void) override {return TYPE_ARRAY;}
+  int   GetResultType(void) override {return Type;}
+  int   GetLength(void) override {return Len;}
+  int   GetLengthEx(void) override {return Len;}
+  int   GetScale() override {return 0;}
           int   GetNval(void) {return Nval;}
           int   GetSize(void) {return Size;}
 //        PVAL  GetValp(void) {return Valp;}
@@ -51,13 +51,13 @@ class DllExport ARRAY : public XOBJECT, public CSORT { // Array descblock
 
   // Methods
   using XOBJECT::GetIntValue;
-  virtual void  Reset(void) {Bot = -1;}
-  virtual int   Qcompare(int *, int *);
-  virtual bool  Compare(PXOB) {assert(false); return false;}
-  virtual bool  SetFormat(PGLOBAL, FORMAT&) {assert(false); return false;}
+  void  Reset(void) override {Bot = -1;}
+  int   Qcompare(int *, int *) override;
+  bool  Compare(PXOB) override {assert(false); return false;}
+  bool  SetFormat(PGLOBAL, FORMAT&) override {assert(false); return false;}
 //virtual int   CheckSpcCol(PTDB, int) {return 0;}
-  virtual void  Printf(PGLOBAL g, FILE *f, uint n);
-  virtual void  Prints(PGLOBAL g, char *ps, uint z);
+  void  Printf(PGLOBAL g, FILE *f, uint n) override;
+  void  Prints(PGLOBAL g, char *ps, uint z) override;
 //        void  Empty(void);
           void  SetPrecision(PGLOBAL g, int p);
           bool  AddValue(PGLOBAL g, PSZ sp);
@@ -119,7 +119,7 @@ class MULAR : public CSORT, public BLOCK {   // No need to be an XOBJECT
   void SetPars(PARRAY par, int i) {Pars[i] = par;}
 
   // Methods
-  virtual int Qcompare(int *i1, int *i2);   // Sort compare routine
+  int Qcompare(int *i1, int *i2) override;   // Sort compare routine
           bool Sort(PGLOBAL g);
 
  protected:
diff --git a/storage/connect/blkfil.h b/storage/connect/blkfil.h
index 27e6fd4b166..0fe5252d4c5 100644
--- a/storage/connect/blkfil.h
+++ b/storage/connect/blkfil.h
@@ -27,8 +27,8 @@ class DllExport BLOCKFILTER : public BLOCK {           /* Block Filter */
   // Methods
   virtual void Reset(PGLOBAL) = 0;
   virtual int  BlockEval(PGLOBAL) = 0;
-  virtual void Printf(PGLOBAL g, FILE *f, uint n);
-  virtual void Prints(PGLOBAL g, char *ps, uint z);
+  void Printf(PGLOBAL g, FILE *f, uint n) override;
+  void Prints(PGLOBAL g, char *ps, uint z) override;
 
  protected:
   BLOCKFILTER(void) = default;       // Standard constructor not to be used
@@ -50,8 +50,8 @@ class DllExport BLKFILLOG : public BLOCKFILTER { /* Logical Op Block Filter */
   BLKFILLOG(PTDBDOS tdbp, int op, PBF *bfp, int n);
 
   // Methods
-  virtual void Reset(PGLOBAL g);
-  virtual int  BlockEval(PGLOBAL g);
+  void Reset(PGLOBAL g) override;
+  int  BlockEval(PGLOBAL g) override;
 
  protected:
   BLKFILLOG(void) = default;       // Standard constructor not to be used
@@ -70,8 +70,8 @@ class DllExport BLKFILARI : public BLOCKFILTER { /* Arithm. Op Block Filter */
   BLKFILARI(PGLOBAL g, PTDBDOS tdbp, int op, PXOB *xp);
 
   // Methods
-  virtual void Reset(PGLOBAL g);
-  virtual int  BlockEval(PGLOBAL g);
+  void Reset(PGLOBAL g) override;
+  int  BlockEval(PGLOBAL g) override;
   virtual void MakeValueBitmap(void) {}
 
  protected:
@@ -93,8 +93,8 @@ class DllExport BLKFILAR2 : public BLKFILARI { /* Arithm. Op Block Filter */
   BLKFILAR2(PGLOBAL g, PTDBDOS tdbp, int op, PXOB *xp);
 
   // Methods
-  virtual int  BlockEval(PGLOBAL g);
-  virtual void MakeValueBitmap(void);
+  int  BlockEval(PGLOBAL g) override;
+  void MakeValueBitmap(void) override;
 
  protected:
   BLKFILAR2(void) = default;       // Standard constructor not to be used
@@ -114,8 +114,8 @@ class DllExport BLKFILMR2 : public BLKFILARI { /* Arithm. Op Block Filter */
   BLKFILMR2(PGLOBAL g, PTDBDOS tdbp, int op, PXOB *xp);
 
   // Methods
-  virtual int  BlockEval(PGLOBAL g);
-  virtual void MakeValueBitmap(void);
+  int  BlockEval(PGLOBAL g) override;
+  void MakeValueBitmap(void) override;
 
  protected:
   BLKFILMR2(void) = default;       // Standard constructor not to be used
@@ -137,8 +137,8 @@ class DllExport BLKSPCARI : public BLOCKFILTER { /* Arithm. Op Block Filter */
   BLKSPCARI(PTDBDOS tdbp, int op, PXOB *xp, int bsize);
 
   // Methods
-  virtual void Reset(PGLOBAL g);
-  virtual int  BlockEval(PGLOBAL g);
+  void Reset(PGLOBAL g) override;
+  int  BlockEval(PGLOBAL g) override;
 
  protected:
   BLKSPCARI(void) = default;       // Standard constructor not to be used
@@ -159,8 +159,8 @@ class DllExport BLKFILIN : public BLOCKFILTER {  // With array arguments.
   BLKFILIN(PGLOBAL g, PTDBDOS tdbp, int op, int opm, PXOB *xp);
 
   // Methods
-  virtual void Reset(PGLOBAL g);
-  virtual int  BlockEval(PGLOBAL g);
+  void Reset(PGLOBAL g) override;
+  int  BlockEval(PGLOBAL g) override;
   virtual void MakeValueBitmap(void) {}
 
  protected:
@@ -181,8 +181,8 @@ class DllExport BLKFILIN2 : public BLKFILIN {  // With array arguments.
 
   // Methods
 //virtual void Reset(PGLOBAL g);
-  virtual int  BlockEval(PGLOBAL g);
-  virtual void MakeValueBitmap(void);
+  int  BlockEval(PGLOBAL g) override;
+  void MakeValueBitmap(void) override;
 
  protected:
   // Member
@@ -205,8 +205,8 @@ class DllExport BLKSPCIN : public BLOCKFILTER {  // With array arguments.
   BLKSPCIN(PGLOBAL g, PTDBDOS tdbp, int op, int opm, PXOB *xp, int bsize);
 
   // Methods
-  virtual void Reset(PGLOBAL g);
-  virtual int  BlockEval(PGLOBAL g);
+  void Reset(PGLOBAL g) override;
+  int  BlockEval(PGLOBAL g) override;
 
  protected:
   // Member
diff --git a/storage/connect/cmgfam.h b/storage/connect/cmgfam.h
index 9c5f91f0d23..d5c637cbdd7 100644
--- a/storage/connect/cmgfam.h
+++ b/storage/connect/cmgfam.h
@@ -26,18 +26,18 @@ public:
 	CMGFAM(PCMGFAM txfp);
 
 	// Implementation
-	virtual AMT   GetAmType(void) { return TYPE_AM_MGO; }
+	AMT   GetAmType(void) override { return TYPE_AM_MGO; }
 	virtual bool  GetUseTemp(void) { return false; }
 	virtual int   GetPos(void);
 	virtual int   GetNextPos(void);
 	void  SetTdbp(PTDBDOS tdbp) { Tdbp = tdbp; }
-	virtual PTXF  Duplicate(PGLOBAL g) { return (PTXF)new(g) CMGFAM(this); }
+	PTXF  Duplicate(PGLOBAL g) { return (PTXF)new(g) CMGFAM(this); }
 	void  SetLrecl(int lrecl) { Lrecl = lrecl; }
 
 	// Methods
 	virtual void  Reset(void);
 	virtual int   GetFileLength(PGLOBAL g);
-	virtual int   Cardinality(PGLOBAL g);
+	int   Cardinality(PGLOBAL g) override;
 	virtual int   MaxBlkSize(PGLOBAL g, int s);
 	virtual bool  AllocateBuffer(PGLOBAL g) { return false; }
 	virtual int   GetRowID(void);
diff --git a/storage/connect/colblk.h b/storage/connect/colblk.h
index e67ba3ba3f9..4a2f572ec2d 100644
--- a/storage/connect/colblk.h
+++ b/storage/connect/colblk.h
@@ -27,12 +27,12 @@ class DllExport COLBLK : public XOBJECT {
 
  public:
   // Implementation
-  virtual int     GetType(void) {return TYPE_COLBLK;}
-  virtual int     GetResultType(void) {return Buf_Type;}
-  virtual int     GetScale(void) {return Format.Prec;}
+  int     GetType(void) override {return TYPE_COLBLK;}
+  int     GetResultType(void) override {return Buf_Type;}
+  int     GetScale(void) override {return Format.Prec;}
   virtual int     GetPrecision(void) {return Precision;}
-  virtual int     GetLength(void) {return Long;}
-  virtual int     GetLengthEx(void);
+  int     GetLength(void) override {return Long;}
+  int     GetLengthEx(void) override;
   virtual int     GetAmType() {return TYPE_AM_ERROR;}
   virtual void    SetOk(void) {Status |= BUF_EMPTY;}
   virtual PTDB    GetTo_Tdb(void) {return To_Tdb;}
@@ -65,17 +65,17 @@ class DllExport COLBLK : public XOBJECT {
           void    SetNullable(bool b) {Nullable = b;}
           void    SetName(PSZ name_var) { Name= name_var; }
   // Methods
-  virtual void    Reset(void);
-  virtual bool    Compare(PXOB xp);
-  virtual bool    SetFormat(PGLOBAL, FORMAT&);
+  void    Reset(void) override;
+  bool    Compare(PXOB xp) override;
+  bool    SetFormat(PGLOBAL, FORMAT&) override;
   virtual bool    IsSpecial(void) {return false;}
-  virtual bool    Eval(PGLOBAL g);
+  bool    Eval(PGLOBAL g) override;
   virtual bool    SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
   virtual void    SetTo_Val(PVAL) {}
   virtual void    ReadColumn(PGLOBAL g);
   virtual void    WriteColumn(PGLOBAL g);
-  virtual void    Printf(PGLOBAL g, FILE *, uint);
-  virtual void    Prints(PGLOBAL g, char *, uint);
+  void    Printf(PGLOBAL g, FILE *, uint) override;
+  void    Prints(PGLOBAL g, char *, uint) override;
   virtual bool    VarSize(void) {return false;}
           bool    InitValue(PGLOBAL g);
 
@@ -108,13 +108,12 @@ class DllExport SPCBLK : public COLBLK {
   SPCBLK(PCOLUMN cp);
 
   // Implementation
-  virtual int  GetAmType(void) = 0;
   virtual bool GetRnm(void) {return false;}
 
   // Methods
-  virtual bool IsSpecial(void) {return true;}
-  virtual void ReadColumn(PGLOBAL g) = 0;
-  virtual void WriteColumn(PGLOBAL g);
+  bool IsSpecial(void) override {return true;}
+  void ReadColumn(PGLOBAL g) override = 0;
+  void WriteColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
@@ -130,11 +129,11 @@ class DllExport RIDBLK : public SPCBLK {
   RIDBLK(PCOLUMN cp, bool rnm);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_ROWID;}
-  virtual bool GetRnm(void) {return Rnm;}
+  int  GetAmType(void) override {return TYPE_AM_ROWID;}
+  bool GetRnm(void) override {return Rnm;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   bool Rnm;                         // False for RowID, True for RowNum
@@ -149,11 +148,11 @@ class DllExport FIDBLK : public SPCBLK {
   FIDBLK(PCOLUMN cp, OPVAL op);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_FILID;}
+  int  GetAmType(void) override {return TYPE_AM_FILID;}
 
   // Methods
-  virtual void Reset(void) {}       // This is a pseudo constant column
-  virtual void ReadColumn(PGLOBAL g);
+  void Reset(void) override {}       // This is a pseudo constant column
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   PCSZ  Fn;                         // The current To_File of the table
@@ -169,11 +168,11 @@ class DllExport TIDBLK : public SPCBLK {
   TIDBLK(PCOLUMN cp);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_TABID;}
+  int  GetAmType(void) override {return TYPE_AM_TABID;}
 
   // Methods
-  virtual void Reset(void) {}       // This is a pseudo constant column
-  virtual void ReadColumn(PGLOBAL g);
+  void Reset(void) override {}       // This is a pseudo constant column
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
@@ -192,11 +191,11 @@ class DllExport PRTBLK : public SPCBLK {
   PRTBLK(PCOLUMN cp);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_PRTID;}
+  int  GetAmType(void) override {return TYPE_AM_PRTID;}
 
   // Methods
-  virtual void Reset(void) {}       // This is a pseudo constant column
-  virtual void ReadColumn(PGLOBAL g);
+  void Reset(void) override {}       // This is a pseudo constant column
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
@@ -215,11 +214,11 @@ class DllExport SIDBLK : public SPCBLK {
   SIDBLK(PCOLUMN cp);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_SRVID;}
+  int  GetAmType(void) override {return TYPE_AM_SRVID;}
 
   // Methods
-  virtual void Reset(void) {}       // This is a pseudo constant column
-  virtual void ReadColumn(PGLOBAL g);
+  void Reset(void) override {}       // This is a pseudo constant column
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
diff --git a/storage/connect/domdoc.h b/storage/connect/domdoc.h
index dd8936097e2..6a25978f1af 100644
--- a/storage/connect/domdoc.h
+++ b/storage/connect/domdoc.h
@@ -73,7 +73,7 @@ class DOMNODE : public XMLNODE {
   // Methods
   virtual RCODE  GetContent(PGLOBAL g, char *buf, int len);
   virtual bool   SetContent(PGLOBAL g, char *txtp, int len);
-  virtual PXNODE Clone(PGLOBAL g, PXNODE np);
+  PXNODE Clone(PGLOBAL g, PXNODE np) override;
   virtual PXLIST GetChildElements(PGLOBAL g, char *xp, PXLIST lp);
   virtual PXLIST SelectNodes(PGLOBAL g, char *xp, PXLIST lp);
   virtual PXNODE SelectSingleNode(PGLOBAL g, char *xp, PXNODE np);
diff --git a/storage/connect/filamap.h b/storage/connect/filamap.h
index 774eb8b91b3..b201b3f9903 100644
--- a/storage/connect/filamap.h
+++ b/storage/connect/filamap.h
@@ -24,32 +24,32 @@ class DllExport MAPFAM : public TXTFAM {
   MAPFAM(PMAPFAM tmfp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_MAP;}
-  virtual int   GetPos(void);
-  virtual int   GetNextPos(void);
-  virtual PTXF  Duplicate(PGLOBAL g)
+  AMT   GetAmType(void) override {return TYPE_AM_MAP;}
+  int   GetPos(void) override;
+  int   GetNextPos(void) override;
+  PTXF  Duplicate(PGLOBAL g) override
                   {return (PTXF)new(g) MAPFAM(this);}
 
   // Methods
-  virtual void  Reset(void);
-  virtual int   GetFileLength(PGLOBAL g);
-  virtual int   Cardinality(PGLOBAL g) {return (g) ? -1 : 0;}
-  virtual int   MaxBlkSize(PGLOBAL g, int s) {return s;}
-  virtual int   GetRowID(void);
-  virtual bool  RecordPos(PGLOBAL g);
-  virtual bool  SetPos(PGLOBAL g, int recpos);
-  virtual int   SkipRecord(PGLOBAL g, bool header);
-  virtual bool  OpenTableFile(PGLOBAL g);
-  virtual bool  DeferReading(void) {return false;}
+  void  Reset(void) override;
+  int   GetFileLength(PGLOBAL g) override;
+  int   Cardinality(PGLOBAL g) override {return (g) ? -1 : 0;}
+  int   MaxBlkSize(PGLOBAL g, int s) override {return s;}
+  int   GetRowID(void) override;
+  bool  RecordPos(PGLOBAL g) override;
+  bool  SetPos(PGLOBAL g, int recpos) override;
+  int   SkipRecord(PGLOBAL g, bool header) override;
+  bool  OpenTableFile(PGLOBAL g) override;
+  bool  DeferReading(void) override {return false;}
 	virtual int   GetNext(PGLOBAL g) {return RC_EF;}
-	virtual int   ReadBuffer(PGLOBAL g);
-  virtual int   WriteBuffer(PGLOBAL g);
-  virtual int   DeleteRecords(PGLOBAL g, int irc);
-  virtual void  CloseTableFile(PGLOBAL g, bool abort);
-  virtual void  Rewind(void);
+	int   ReadBuffer(PGLOBAL g) override;
+  int   WriteBuffer(PGLOBAL g) override;
+  int   DeleteRecords(PGLOBAL g, int irc) override;
+  void  CloseTableFile(PGLOBAL g, bool abort) override;
+  void  Rewind(void) override;
 
  protected:
-  virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
+  int   InitDelete(PGLOBAL g, int fpos, int spos) override;
 
   // Members
   char *Memory;               // Pointer on file mapping view.
@@ -70,18 +70,18 @@ class DllExport MBKFAM : public MAPFAM {
   MBKFAM(PMAPFAM tmfp) : MAPFAM(tmfp) {}
 
   // Implementation
-  virtual PTXF Duplicate(PGLOBAL g)
+  PTXF Duplicate(PGLOBAL g) override
                   {return (PTXF)new(g) MBKFAM(this);}
 
   // Methods
-  virtual void Reset(void);
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  MaxBlkSize(PGLOBAL g, int s)
+  void Reset(void) override;
+  int  Cardinality(PGLOBAL g) override;
+  int  MaxBlkSize(PGLOBAL g, int s) override
                 {return TXTFAM::MaxBlkSize(g, s);}
-  virtual int  GetRowID(void);
-  virtual int  SkipRecord(PGLOBAL g, bool header);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual void Rewind(void);
+  int  GetRowID(void) override;
+  int  SkipRecord(PGLOBAL g, bool header) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  void Rewind(void) override;
 
  protected:
   // No additional members
@@ -97,22 +97,22 @@ class DllExport MPXFAM : public MBKFAM {
   MPXFAM(PMAPFAM tmfp) : MBKFAM(tmfp) {}
 
   // Implementation
-  virtual int   GetPos(void);
-  virtual PTXF  Duplicate(PGLOBAL g)
+  int   GetPos(void) override;
+  PTXF  Duplicate(PGLOBAL g) override
                   {return (PTXF)new(g) MPXFAM(this);}
 
   // Methods
-  virtual int   Cardinality(PGLOBAL g) {return TXTFAM::Cardinality(g);}
-  virtual int   MaxBlkSize(PGLOBAL g, int s)
+  int   Cardinality(PGLOBAL g) override {return TXTFAM::Cardinality(g);}
+  int   MaxBlkSize(PGLOBAL g, int s) override
                 {return TXTFAM::MaxBlkSize(g, s);}
-  virtual bool  SetPos(PGLOBAL g, int recpos);
-  virtual int   GetNextPos(void) {return GetPos() + 1;}
-  virtual bool  DeferReading(void) {return false;}
-  virtual int   ReadBuffer(PGLOBAL g);
-  virtual int   WriteBuffer(PGLOBAL g);
+  bool  SetPos(PGLOBAL g, int recpos) override;
+  int   GetNextPos(void) override {return GetPos() + 1;}
+  bool  DeferReading(void) override {return false;}
+  int   ReadBuffer(PGLOBAL g) override;
+  int   WriteBuffer(PGLOBAL g) override;
 
  protected:
-  virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
+  int   InitDelete(PGLOBAL g, int fpos, int spos) override;
 
   // No additional members
   }; // end of class MPXFAM
diff --git a/storage/connect/filamdbf.h b/storage/connect/filamdbf.h
index 6cf6331abd4..7a7a65b0236 100644
--- a/storage/connect/filamdbf.h
+++ b/storage/connect/filamdbf.h
@@ -55,23 +55,23 @@ class DllExport DBFFAM : public FIXFAM, public DBFBASE {
   DBFFAM(PDBFFAM txfp) : FIXFAM(txfp), DBFBASE((PDBF)txfp) {}
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_DBF;}
-  virtual PTXF Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_DBF;}
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) DBFFAM(this);}
 
   // Methods
-  virtual int  GetNerr(void) {return Nerr;}
-  virtual int  Cardinality(PGLOBAL g);
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual void ResetBuffer(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
-  virtual void Rewind(void);
+  int  GetNerr(void) override {return Nerr;}
+  int  Cardinality(PGLOBAL g) override;
+  bool OpenTableFile(PGLOBAL g) override;
+  bool AllocateBuffer(PGLOBAL g) override;
+  void ResetBuffer(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
+  void Rewind(void) override;
 
  protected:
-  virtual bool CopyHeader(PGLOBAL g);
+  bool CopyHeader(PGLOBAL g) override;
 //virtual int  InitDelete(PGLOBAL g, int fpos, int spos);
 
   // Members
@@ -88,18 +88,18 @@ class DllExport DBMFAM : public MPXFAM, public DBFBASE {
   DBMFAM(PDBMFAM txfp) : MPXFAM(txfp), DBFBASE((PDBF)txfp) {}
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_DBF;}
-  virtual PTXF Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_DBF;}
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) DBMFAM(this);}
-  virtual  int  GetDelRows(void);
+   int  GetDelRows(void) override;
 
   // Methods
-  virtual int  GetNerr(void) {return Nerr;}
-  virtual int  Cardinality(PGLOBAL g);
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void Rewind(void);
+  int  GetNerr(void) override {return Nerr;}
+  int  Cardinality(PGLOBAL g) override;
+  bool AllocateBuffer(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void Rewind(void) override;
 
  protected:
   // Members
diff --git a/storage/connect/filamfix.h b/storage/connect/filamfix.h
index a99a36af232..60697acc3eb 100644
--- a/storage/connect/filamfix.h
+++ b/storage/connect/filamfix.h
@@ -25,28 +25,28 @@ class DllExport FIXFAM : public BLKFAM {
   FIXFAM(PFIXFAM txfp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_FIX;}
-  virtual PTXF Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_FIX;}
+  PTXF Duplicate(PGLOBAL g) override
                  {return (PTXF)new(g) FIXFAM(this);}
 
   // Methods
-  virtual int  Cardinality(PGLOBAL g) {return TXTFAM::Cardinality(g);}
-  virtual int  MaxBlkSize(PGLOBAL g, int s)
+  int  Cardinality(PGLOBAL g) override {return TXTFAM::Cardinality(g);}
+  int  MaxBlkSize(PGLOBAL g, int s) override
                 {return TXTFAM::MaxBlkSize(g, s);}
-  virtual bool SetPos(PGLOBAL g, int recpos);
-  virtual int  GetNextPos(void) {return Fpos + 1;}
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual void ResetBuffer(PGLOBAL g);
+  bool SetPos(PGLOBAL g, int recpos) override;
+  int  GetNextPos(void) override {return Fpos + 1;}
+  bool AllocateBuffer(PGLOBAL g) override;
+  void ResetBuffer(PGLOBAL g) override;
   virtual int  WriteModifiedBlock(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
+  int  ReadBuffer(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
 
  protected:
   virtual bool CopyHeader(PGLOBAL g) {return false;}
-  virtual bool MoveIntermediateLines(PGLOBAL g, bool *b);
-  virtual int  InitDelete(PGLOBAL g, int fpos, int spos);
+  bool MoveIntermediateLines(PGLOBAL g, bool *b) override;
+  int  InitDelete(PGLOBAL g, int fpos, int spos) override;
 
   // No additional members
   }; // end of class FIXFAM
@@ -64,22 +64,22 @@ class BGXFAM : public FIXFAM {
   BGXFAM(PBGXFAM txfp);
 
   // Implementation
-  virtual PTXF Duplicate(PGLOBAL g)
+  PTXF Duplicate(PGLOBAL g) override
                  {return (PTXF)new(g) BGXFAM(this);}
 
   // Methods
-  virtual int  Cardinality(PGLOBAL g);
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual int  WriteModifiedBlock(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
-  virtual void Rewind(void);
+  int  Cardinality(PGLOBAL g) override;
+  bool OpenTableFile(PGLOBAL g) override;
+  int  WriteModifiedBlock(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
+  void Rewind(void) override;
 
  protected:
-  virtual bool OpenTempFile(PGLOBAL g);
-  virtual bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL);
+  bool OpenTempFile(PGLOBAL g) override;
+  bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL) override;
           int  BigRead(PGLOBAL g, HANDLE h, void *inbuf, int req);
           bool BigWrite(PGLOBAL g, HANDLE h, void *inbuf, int req);
           bool BigSeek(PGLOBAL g, HANDLE h, BIGINT pos
diff --git a/storage/connect/filamgz.h b/storage/connect/filamgz.h
index 7a00c0d4bc7..fd5c0d24188 100644
--- a/storage/connect/filamgz.h
+++ b/storage/connect/filamgz.h
@@ -28,28 +28,28 @@ class DllExport GZFAM : public TXTFAM {
   GZFAM(PGZFAM txfp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_GZ;}
-  virtual int  GetPos(void);
-  virtual int  GetNextPos(void);
-  virtual PTXF Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_GZ;}
+  int  GetPos(void) override;
+  int  GetNextPos(void) override;
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) GZFAM(this);}
 
   // Methods
-  virtual void Reset(void);
-  virtual int  GetFileLength(PGLOBAL g);
-  virtual int  Cardinality(PGLOBAL g) {return (g) ? -1 : 0;}
-  virtual int  MaxBlkSize(PGLOBAL g, int s) {return s;}
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual int  GetRowID(void);
-  virtual bool RecordPos(PGLOBAL g);
-  virtual bool SetPos(PGLOBAL g, int recpos);
-  virtual int  SkipRecord(PGLOBAL g, bool header);
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
-  virtual void Rewind(void);
+  void Reset(void) override;
+  int  GetFileLength(PGLOBAL g) override;
+  int  Cardinality(PGLOBAL g) override {return (g) ? -1 : 0;}
+  int  MaxBlkSize(PGLOBAL g, int s) override {return s;}
+  bool AllocateBuffer(PGLOBAL g) override;
+  int  GetRowID(void) override;
+  bool RecordPos(PGLOBAL g) override;
+  bool SetPos(PGLOBAL g, int recpos) override;
+  int  SkipRecord(PGLOBAL g, bool header) override;
+  bool OpenTableFile(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
+  void Rewind(void) override;
 
  protected:
           int  Zerror(PGLOBAL g);    // GZ error function
@@ -71,23 +71,23 @@ class DllExport ZBKFAM : public GZFAM {
   ZBKFAM(PZBKFAM txfp);
 
   // Implementation
-  virtual int  GetPos(void);
-  virtual int  GetNextPos(void) {return 0;}
-  virtual PTXF Duplicate(PGLOBAL g)
+  int  GetPos(void) override;
+  int  GetNextPos(void) override {return 0;}
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) ZBKFAM(this);}
 
   // Methods
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  MaxBlkSize(PGLOBAL g, int s);
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual int  GetRowID(void);
-  virtual bool RecordPos(PGLOBAL g);
-  virtual int  SkipRecord(PGLOBAL g, bool header);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
-  virtual void Rewind(void);
+  int  Cardinality(PGLOBAL g) override;
+  int  MaxBlkSize(PGLOBAL g, int s) override;
+  bool AllocateBuffer(PGLOBAL g) override;
+  int  GetRowID(void) override;
+  bool RecordPos(PGLOBAL g) override;
+  int  SkipRecord(PGLOBAL g, bool header) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
+  void Rewind(void) override;
 
  protected:
   // Members
@@ -108,15 +108,15 @@ class DllExport GZXFAM : public ZBKFAM {
   GZXFAM(PZIXFAM txfp) : ZBKFAM(txfp) {}
 
   // Implementation
-  virtual int  GetNextPos(void) {return 0;}
-  virtual PTXF Duplicate(PGLOBAL g)
+  int  GetNextPos(void) override {return 0;}
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) GZXFAM(this);}
 
   // Methods
-  virtual int  Cardinality(PGLOBAL g);
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
+  int  Cardinality(PGLOBAL g) override;
+  bool AllocateBuffer(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
 
  protected:
   // No additional Members
@@ -140,21 +140,21 @@ class DllExport ZLBFAM : public BLKFAM {
   ZLBFAM(PZLBFAM txfp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_ZLIB;}
-  virtual int  GetPos(void);
-  virtual int  GetNextPos(void);
-  virtual PTXF Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_ZLIB;}
+  int  GetPos(void) override;
+  int  GetNextPos(void) override;
+  PTXF Duplicate(PGLOBAL g) override
                   {return (PTXF)new(g) ZLBFAM(this);}
   inline  void SetOptimized(bool b) {Optimized = b;}
 
   // Methods
-  virtual int  GetFileLength(PGLOBAL g);
-  virtual bool SetPos(PGLOBAL g, int recpos);
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
-  virtual void Rewind(void);
+  int  GetFileLength(PGLOBAL g) override;
+  bool SetPos(PGLOBAL g, int recpos) override;
+  bool AllocateBuffer(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
+  void Rewind(void) override;
 
  protected:
           bool WriteCompressedBuffer(PGLOBAL g);
diff --git a/storage/connect/filamtxt.h b/storage/connect/filamtxt.h
index 353e06ad3bd..e291167fbd8 100644
--- a/storage/connect/filamtxt.h
+++ b/storage/connect/filamtxt.h
@@ -134,35 +134,35 @@ class DllExport DOSFAM : public TXTFAM {
   DOSFAM(PBLKFAM tdfp, PDOSDEF tdp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_DOS;}
-  virtual bool  GetUseTemp(void) {return UseTemp;}
-  virtual int   GetPos(void);
-  virtual int   GetNextPos(void);
-  virtual PTXF  Duplicate(PGLOBAL g)
+  AMT   GetAmType(void) override {return TYPE_AM_DOS;}
+  bool  GetUseTemp(void) override {return UseTemp;}
+  int   GetPos(void) override;
+  int   GetNextPos(void) override;
+  PTXF  Duplicate(PGLOBAL g) override
                   {return (PTXF)new(g) DOSFAM(this);}
 
   // Methods
-  virtual void  Reset(void);
-  virtual int   GetFileLength(PGLOBAL g);
-  virtual int   Cardinality(PGLOBAL g);
-  virtual int   MaxBlkSize(PGLOBAL g, int s);
-  virtual bool  AllocateBuffer(PGLOBAL g);
-  virtual int   GetRowID(void);
-  virtual bool  RecordPos(PGLOBAL g);
-  virtual bool  SetPos(PGLOBAL g, int recpos);
-  virtual int   SkipRecord(PGLOBAL g, bool header);
-  virtual bool  OpenTableFile(PGLOBAL g);
-  virtual int   ReadBuffer(PGLOBAL g);
-  virtual int   WriteBuffer(PGLOBAL g);
-  virtual int   DeleteRecords(PGLOBAL g, int irc);
-  virtual void  CloseTableFile(PGLOBAL g, bool abort);
-  virtual void  Rewind(void);
+  void  Reset(void) override;
+  int   GetFileLength(PGLOBAL g) override;
+  int   Cardinality(PGLOBAL g) override;
+  int   MaxBlkSize(PGLOBAL g, int s) override;
+  bool  AllocateBuffer(PGLOBAL g) override;
+  int   GetRowID(void) override;
+  bool  RecordPos(PGLOBAL g) override;
+  bool  SetPos(PGLOBAL g, int recpos) override;
+  int   SkipRecord(PGLOBAL g, bool header) override;
+  bool  OpenTableFile(PGLOBAL g) override;
+  int   ReadBuffer(PGLOBAL g) override;
+  int   WriteBuffer(PGLOBAL g) override;
+  int   DeleteRecords(PGLOBAL g, int irc) override;
+  void  CloseTableFile(PGLOBAL g, bool abort) override;
+  void  Rewind(void) override;
 
  protected:
   virtual bool  OpenTempFile(PGLOBAL g);
   virtual bool  MoveIntermediateLines(PGLOBAL g, bool *b);
   virtual int   RenameTempFile(PGLOBAL g);
-  virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
+  int   InitDelete(PGLOBAL g, int fpos, int spos) override;
 
   // Members
   FILE   *Stream;             // Points to Dos file structure
@@ -183,25 +183,25 @@ class DllExport BLKFAM : public DOSFAM {
   BLKFAM(PBLKFAM txfp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_BLK;}
-  virtual int   GetPos(void);
-  virtual int   GetNextPos(void);
-  virtual PTXF  Duplicate(PGLOBAL g)
+  AMT   GetAmType(void) override {return TYPE_AM_BLK;}
+  int   GetPos(void) override;
+  int   GetNextPos(void) override;
+  PTXF  Duplicate(PGLOBAL g) override
                   {return (PTXF)new(g) BLKFAM(this);}
 
   // Methods
-  virtual void  Reset(void);
-  virtual int   Cardinality(PGLOBAL g);
-  virtual int   MaxBlkSize(PGLOBAL g, int s);
-  virtual bool  AllocateBuffer(PGLOBAL g);
-  virtual int   GetRowID(void);
-  virtual bool  RecordPos(PGLOBAL g);
-  virtual bool  SetPos(PGLOBAL g, int recpos);
-  virtual int   SkipRecord(PGLOBAL g, bool header);
-  virtual int   ReadBuffer(PGLOBAL g);
-  virtual int   WriteBuffer(PGLOBAL g);
-  virtual void  CloseTableFile(PGLOBAL g, bool abort);
-  virtual void  Rewind(void);
+  void  Reset(void) override;
+  int   Cardinality(PGLOBAL g) override;
+  int   MaxBlkSize(PGLOBAL g, int s) override;
+  bool  AllocateBuffer(PGLOBAL g) override;
+  int   GetRowID(void) override;
+  bool  RecordPos(PGLOBAL g) override;
+  bool  SetPos(PGLOBAL g, int recpos) override;
+  int   SkipRecord(PGLOBAL g, bool header) override;
+  int   ReadBuffer(PGLOBAL g) override;
+  int   WriteBuffer(PGLOBAL g) override;
+  void  CloseTableFile(PGLOBAL g, bool abort) override;
+  void  Rewind(void) override;
 
  protected:
   // Members
@@ -222,24 +222,24 @@ public:
 	BINFAM(PBINFAM txfp) : DOSFAM(txfp) {Recsize = txfp->Recsize;}
 
 	// Implementation
-	virtual AMT   GetAmType(void) {return TYPE_AM_BIN;}
+	AMT   GetAmType(void) override {return TYPE_AM_BIN;}
 //virtual int   GetPos(void);
 //virtual int   GetNextPos(void);
-	virtual PTXF  Duplicate(PGLOBAL g) { return (PTXF)new(g) BINFAM(this); }
+	PTXF  Duplicate(PGLOBAL g) override { return (PTXF)new(g) BINFAM(this); }
 
 	// Methods
 //virtual void  Reset(void) {TXTFAM::Reset();}
 //virtual int   GetFileLength(PGLOBAL g);
 //virtual int   Cardinality(PGLOBAL g);
-	virtual int   MaxBlkSize(PGLOBAL g, int s) {return s;}
-	virtual bool  AllocateBuffer(PGLOBAL g);
+	int   MaxBlkSize(PGLOBAL g, int s) override {return s;}
+	bool  AllocateBuffer(PGLOBAL g) override;
 //virtual int   GetRowID(void);
 //virtual bool  RecordPos(PGLOBAL g);
 //virtual bool  SetPos(PGLOBAL g, int recpos);
-	virtual int   SkipRecord(PGLOBAL g, bool header) {return RC_OK;}
+	int   SkipRecord(PGLOBAL g, bool header) override {return RC_OK;}
 //virtual bool  OpenTableFile(PGLOBAL g);
-	virtual int   ReadBuffer(PGLOBAL g);
-	virtual int   WriteBuffer(PGLOBAL g);
+	int   ReadBuffer(PGLOBAL g) override;
+	int   WriteBuffer(PGLOBAL g) override;
 //virtual int   DeleteRecords(PGLOBAL g, int irc);
 //virtual void  CloseTableFile(PGLOBAL g, bool abort);
 //virtual void  Rewind(void);
diff --git a/storage/connect/filamvct.h b/storage/connect/filamvct.h
index 85982403270..2b730e5c66c 100644
--- a/storage/connect/filamvct.h
+++ b/storage/connect/filamvct.h
@@ -34,27 +34,27 @@ class DllExport VCTFAM : public FIXFAM {
   VCTFAM(PVCTFAM txfp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_VCT;}
-  virtual PTXF Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_VCT;}
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) VCTFAM(this);}
-  virtual int  GetFileLength(PGLOBAL g);
+  int  GetFileLength(PGLOBAL g) override;
 
   // Methods
-  virtual void Reset(void);
-  virtual int  MaxBlkSize(PGLOBAL g, int s);
-  virtual bool AllocateBuffer(PGLOBAL g);
+  void Reset(void) override;
+  int  MaxBlkSize(PGLOBAL g, int s) override;
+  bool AllocateBuffer(PGLOBAL g) override;
   virtual bool InitInsert(PGLOBAL g);
-  virtual void ResetBuffer(PGLOBAL g) {}
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  GetRowID(void);
+  void ResetBuffer(PGLOBAL g) override {}
+  int  Cardinality(PGLOBAL g) override;
+  int  GetRowID(void) override;
 
   // Database routines
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
-  virtual void Rewind(void);
+  bool OpenTableFile(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
+  void Rewind(void) override;
 
   // Specific functions
   virtual bool ReadBlock(PGLOBAL g, PVCTCOL colp);
@@ -62,9 +62,9 @@ class DllExport VCTFAM : public FIXFAM {
 
  protected:
   virtual bool MakeEmptyFile(PGLOBAL g, PCSZ fn);
-  virtual bool OpenTempFile(PGLOBAL g);
+  bool OpenTempFile(PGLOBAL g) override;
   virtual bool MoveLines(PGLOBAL g) {return false;}
-  virtual bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL);
+  bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL) override;
   virtual bool CleanUnusedSpace(PGLOBAL g);
   virtual int  GetBlockInfo(PGLOBAL g);
   virtual bool SetBlockInfo(PGLOBAL g);
@@ -98,25 +98,25 @@ class DllExport VCMFAM : public VCTFAM {
   VCMFAM(PVCMFAM txfp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_VMP;}
-  virtual PTXF Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_VMP;}
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) VCMFAM(this);}
 
   // Methods
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual bool InitInsert(PGLOBAL g);
+  bool AllocateBuffer(PGLOBAL g) override;
+  bool InitInsert(PGLOBAL g) override;
 
   // Database routines
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
+  bool OpenTableFile(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
 
  protected:
   // Specific functions
-  virtual bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL);
-  virtual bool ReadBlock(PGLOBAL g, PVCTCOL colp);
-  virtual bool WriteBlock(PGLOBAL g, PVCTCOL colp);
+  bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL) override;
+  bool ReadBlock(PGLOBAL g, PVCTCOL colp) override;
+  bool WriteBlock(PGLOBAL g, PVCTCOL colp) override;
 
   // Members
   char*   Memory;               // Pointer on file mapping view.
@@ -137,29 +137,29 @@ class DllExport VECFAM : public VCTFAM {
   VECFAM(PVECFAM txfp);
 
   // Implementation
-  virtual PTXF Duplicate(PGLOBAL g)
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) VECFAM(this);}
 
   // Methods
-  virtual bool AllocateBuffer(PGLOBAL g);
-  virtual bool InitInsert(PGLOBAL g);
-  virtual void ResetBuffer(PGLOBAL g);
+  bool AllocateBuffer(PGLOBAL g) override;
+  bool InitInsert(PGLOBAL g) override;
+  void ResetBuffer(PGLOBAL g) override;
 
   // Database routines
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
+  bool OpenTableFile(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
 
   // Specific functions
-  virtual bool ReadBlock(PGLOBAL g, PVCTCOL colp);
-  virtual bool WriteBlock(PGLOBAL g, PVCTCOL colp);
+  bool ReadBlock(PGLOBAL g, PVCTCOL colp) override;
+  bool WriteBlock(PGLOBAL g, PVCTCOL colp) override;
 
  protected:
-  virtual bool OpenTempFile(PGLOBAL g);
-  virtual bool MoveLines(PGLOBAL g);
-  virtual bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL);
-  virtual int  RenameTempFile(PGLOBAL g);
+  bool OpenTempFile(PGLOBAL g) override;
+  bool MoveLines(PGLOBAL g) override;
+  bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL) override;
+  int  RenameTempFile(PGLOBAL g) override;
           bool OpenColumnFile(PGLOBAL g, PCSZ opmode, int i);
 
   // Members
@@ -184,16 +184,16 @@ class DllExport VMPFAM : public VCMFAM {
   VMPFAM(PVMPFAM txfp);
 
   // Implementation
-  virtual PTXF Duplicate(PGLOBAL g)
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) VMPFAM(this);}
 
   // Methods
-  virtual bool AllocateBuffer(PGLOBAL g);
+  bool AllocateBuffer(PGLOBAL g) override;
 
   // Database routines
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
+  bool OpenTableFile(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
 
  protected:
           bool MapColumnFile(PGLOBAL g, MODE mode, int i);
@@ -214,33 +214,33 @@ class BGVFAM : public VCTFAM {
   BGVFAM(PBGVFAM txfp);
 
   // Implementation
-  virtual PTXF Duplicate(PGLOBAL g)
+  PTXF Duplicate(PGLOBAL g) override
                 {return (PTXF)new(g) BGVFAM(this);}
 
   // Methods
-  virtual bool AllocateBuffer(PGLOBAL g);
+  bool AllocateBuffer(PGLOBAL g) override;
 
   // Database routines
-  virtual bool OpenTableFile(PGLOBAL g);
-  virtual int  WriteBuffer(PGLOBAL g);
-  virtual int  DeleteRecords(PGLOBAL g, int irc);
-  virtual void CloseTableFile(PGLOBAL g, bool abort);
-  virtual void Rewind(void);
+  bool OpenTableFile(PGLOBAL g) override;
+  int  WriteBuffer(PGLOBAL g) override;
+  int  DeleteRecords(PGLOBAL g, int irc) override;
+  void CloseTableFile(PGLOBAL g, bool abort) override;
+  void Rewind(void) override;
 
   // Specific functions
-  virtual bool ReadBlock(PGLOBAL g, PVCTCOL colp);
-  virtual bool WriteBlock(PGLOBAL g, PVCTCOL colp);
+  bool ReadBlock(PGLOBAL g, PVCTCOL colp) override;
+  bool WriteBlock(PGLOBAL g, PVCTCOL colp) override;
 
  protected:
           bool BigSeek(PGLOBAL g, HANDLE h, BIGINT pos, bool b = false);
           bool BigRead(PGLOBAL g, HANDLE h, void *inbuf, int req);
           bool BigWrite(PGLOBAL g, HANDLE h, void *inbuf, int req);
-  virtual bool MakeEmptyFile(PGLOBAL g, PCSZ fn);
-  virtual bool OpenTempFile(PGLOBAL g);
-  virtual bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL);
-  virtual bool CleanUnusedSpace(PGLOBAL g);
-  virtual bool SetBlockInfo(PGLOBAL g);
-  virtual int  GetBlockInfo(PGLOBAL g);
+  bool MakeEmptyFile(PGLOBAL g, PCSZ fn) override;
+  bool OpenTempFile(PGLOBAL g) override;
+  bool MoveIntermediateLines(PGLOBAL g, bool *b = NULL) override;
+  bool CleanUnusedSpace(PGLOBAL g) override;
+  bool SetBlockInfo(PGLOBAL g) override;
+  int  GetBlockInfo(PGLOBAL g) override;
 
   // Members
   HANDLE  Hfile;                // Handle to big file
diff --git a/storage/connect/filamzip.h b/storage/connect/filamzip.h
index 7ff1fb0a543..e46e38d320d 100644
--- a/storage/connect/filamzip.h
+++ b/storage/connect/filamzip.h
@@ -97,16 +97,16 @@ class DllExport UNZFAM : public MAPFAM {
 	UNZFAM(PUNZFAM txfp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) {return TYPE_AM_ZIP;}
-	virtual PTXF Duplicate(PGLOBAL g) {return (PTXF) new(g) UNZFAM(this);}
+	AMT  GetAmType(void) override {return TYPE_AM_ZIP;}
+	PTXF Duplicate(PGLOBAL g) override {return (PTXF) new(g) UNZFAM(this);}
 
 	// Methods
-	virtual int  Cardinality(PGLOBAL g);
-	virtual int  GetFileLength(PGLOBAL g);
+	int  Cardinality(PGLOBAL g) override;
+	int  GetFileLength(PGLOBAL g) override;
 	//virtual int  MaxBlkSize(PGLOBAL g, int s) {return s;}
-	virtual bool OpenTableFile(PGLOBAL g);
-	virtual bool DeferReading(void) { return false; }
-	virtual int  GetNext(PGLOBAL g);
+	bool OpenTableFile(PGLOBAL g) override;
+	bool DeferReading(void) override { return false; }
+	int  GetNext(PGLOBAL g) override;
 	//virtual int  ReadBuffer(PGLOBAL g);
 	//virtual int  WriteBuffer(PGLOBAL g);
 	//virtual int  DeleteRecords(PGLOBAL g, int irc);
@@ -129,14 +129,14 @@ class DllExport UZXFAM : public MPXFAM {
 	UZXFAM(PUZXFAM txfp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) { return TYPE_AM_ZIP; }
-	virtual PTXF Duplicate(PGLOBAL g) { return (PTXF) new(g)UZXFAM(this); }
+	AMT  GetAmType(void) override { return TYPE_AM_ZIP; }
+	PTXF Duplicate(PGLOBAL g) override { return (PTXF) new(g)UZXFAM(this); }
 
 	// Methods
-	virtual int  GetFileLength(PGLOBAL g);
-	virtual int  Cardinality(PGLOBAL g);
-	virtual bool OpenTableFile(PGLOBAL g);
-	virtual int  GetNext(PGLOBAL g);
+	int  GetFileLength(PGLOBAL g) override;
+	int  Cardinality(PGLOBAL g) override;
+	bool OpenTableFile(PGLOBAL g) override;
+	int  GetNext(PGLOBAL g) override;
 	//virtual int  ReadBuffer(PGLOBAL g);
 
  protected:
@@ -156,14 +156,14 @@ public:
 	UZDFAM(PUZDFAM txfp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) { return TYPE_AM_ZIP; }
-	virtual PTXF Duplicate(PGLOBAL g) { return (PTXF) new(g)UZDFAM(this); }
+	AMT  GetAmType(void) override { return TYPE_AM_ZIP; }
+	PTXF Duplicate(PGLOBAL g) override { return (PTXF) new(g)UZDFAM(this); }
 
 	// Methods
-	virtual int  GetFileLength(PGLOBAL g);
-	virtual int  Cardinality(PGLOBAL g);
-	virtual bool OpenTableFile(PGLOBAL g);
-	virtual int  GetNext(PGLOBAL g);
+	int  GetFileLength(PGLOBAL g) override;
+	int  Cardinality(PGLOBAL g) override;
+	bool OpenTableFile(PGLOBAL g) override;
+	int  GetNext(PGLOBAL g) override;
 	//virtual int  ReadBuffer(PGLOBAL g);
 
 protected:
@@ -184,17 +184,17 @@ class DllExport ZIPFAM : public DOSFAM {
 	ZIPFAM(PDOSDEF tdp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) {return TYPE_AM_ZIP;}
+	AMT  GetAmType(void) override {return TYPE_AM_ZIP;}
 
 	// Methods
-	virtual int  Cardinality(PGLOBAL g) {return 0;}
-	virtual int  GetFileLength(PGLOBAL g) {return g ? 0 : 1;}
+	int  Cardinality(PGLOBAL g) override {return 0;}
+	int  GetFileLength(PGLOBAL g) override {return g ? 0 : 1;}
 	//virtual int  MaxBlkSize(PGLOBAL g, int s) {return s;}
-	virtual bool OpenTableFile(PGLOBAL g);
-	virtual int  ReadBuffer(PGLOBAL g);
-	virtual int  WriteBuffer(PGLOBAL g);
+	bool OpenTableFile(PGLOBAL g) override;
+	int  ReadBuffer(PGLOBAL g) override;
+	int  WriteBuffer(PGLOBAL g) override;
 	//virtual int  DeleteRecords(PGLOBAL g, int irc);
-	virtual void CloseTableFile(PGLOBAL g, bool abort);
+	void CloseTableFile(PGLOBAL g, bool abort) override;
 
  protected:
 	// Members
@@ -213,14 +213,14 @@ class DllExport ZPXFAM : public FIXFAM {
 	ZPXFAM(PDOSDEF tdp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) {return TYPE_AM_ZIP;}
+	AMT  GetAmType(void) override {return TYPE_AM_ZIP;}
 
 	// Methods
-	virtual int  Cardinality(PGLOBAL g) {return 0;}
-	virtual int  GetFileLength(PGLOBAL g) {return g ? 0 : 1;}
-	virtual bool OpenTableFile(PGLOBAL g);
-	virtual int  WriteBuffer(PGLOBAL g);
-	virtual void CloseTableFile(PGLOBAL g, bool abort);
+	int  Cardinality(PGLOBAL g) override {return 0;}
+	int  GetFileLength(PGLOBAL g) override {return g ? 0 : 1;}
+	bool OpenTableFile(PGLOBAL g) override;
+	int  WriteBuffer(PGLOBAL g) override;
+	void CloseTableFile(PGLOBAL g, bool abort) override;
 
  protected:
 	// Members
diff --git a/storage/connect/filter.h b/storage/connect/filter.h
index 0c3fa41046a..8f973b52cd0 100644
--- a/storage/connect/filter.h
+++ b/storage/connect/filter.h
@@ -34,11 +34,11 @@ class DllExport FILTER : public XOBJECT { /* Filter description block  */
   FILTER(PFIL fil1);
 
   // Implementation
-  virtual int    GetType(void) {return TYPE_FILTER;}
-  virtual int    GetResultType(void) {return TYPE_INT;}
-  virtual int    GetLength(void) {return 1;}
-  virtual int    GetLengthEx(void) {assert(FALSE); return 0;}
-  virtual int    GetScale() {return 0;};
+  int    GetType(void) override {return TYPE_FILTER;}
+  int    GetResultType(void) override {return TYPE_INT;}
+  int    GetLength(void) override {return 1;}
+  int    GetLengthEx(void) override {assert(FALSE); return 0;}
+  int    GetScale() override {return 0;};
           PFIL   GetNext(void) {return Next;}
           OPVAL  GetOpc(void) {return Opc;}
           int    GetOpm(void) {return Opm;}
@@ -50,19 +50,19 @@ class DllExport FILTER : public XOBJECT { /* Filter description block  */
           void   SetNext(PFIL filp) {Next = filp;}
 
   // Methods
-  virtual void   Reset(void);
-  virtual bool   Compare(PXOB) {return FALSE;}          // Not used yet
-  virtual bool   Init(PGLOBAL);
-  virtual bool   Eval(PGLOBAL);
-  virtual bool   SetFormat(PGLOBAL, FORMAT&) {return TRUE;}      // NUY
+  void   Reset(void) override;
+  bool   Compare(PXOB) override {return FALSE;}          // Not used yet
+  bool   Init(PGLOBAL) override;
+  bool   Eval(PGLOBAL) override;
+  bool   SetFormat(PGLOBAL, FORMAT&) override {return TRUE;}      // NUY
 //virtual int    CheckColumn(PGLOBAL g, PSQL sqlp, PXOB &xp, int &ag);
 //virtual int    RefNum(PSQL);
 //virtual PXOB   SetSelect(PGLOBAL, PSQL, bool) {return NULL;}   // NUY
 //virtual PXOB   CheckSubQuery(PGLOBAL, PSQL);
 //virtual bool   CheckLocal(PTDB);
 //virtual int    CheckSpcCol(PTDB tdbp, int n);
-	virtual void   Printf(PGLOBAL g, FILE *f, uint n);
-  virtual void   Prints(PGLOBAL g, char *ps, uint z);
+	void   Printf(PGLOBAL g, FILE *f, uint n) override;
+  void   Prints(PGLOBAL g, char *ps, uint z) override;
 //        PFIL   Linearize(bool nosep);
 //        PFIL   Link(PGLOBAL g, PFIL fil2);
 //        PFIL   RemoveLastSep(void);
@@ -102,7 +102,7 @@ class DllExport FILTER : public XOBJECT { /* Filter description block  */
 class FILTERX : public FILTER {
  public:
   // Methods
-  virtual bool Eval(PGLOBAL) = 0; // just to prevent direct FILTERX use
+  bool Eval(PGLOBAL) override = 0; // just to prevent direct FILTERX use
 
   // Fake operator new used to change a filter into a derived filter
   void * operator new(size_t, PFIL filp) {return filp;}
@@ -123,7 +123,7 @@ class FILTERCMP : public FILTERX {
   FILTERCMP(PGLOBAL g);
 
   // Methods
-  virtual bool Eval(PGLOBAL);
+  bool Eval(PGLOBAL) override;
   }; // end of class FILTEREQ
 
 /***********************************************************************/
@@ -132,7 +132,7 @@ class FILTERCMP : public FILTERX {
 class FILTERAND : public FILTERX {
  public:
   // Methods
-  virtual bool Eval(PGLOBAL);
+  bool Eval(PGLOBAL) override;
   }; // end of class FILTERAND
 
 /***********************************************************************/
@@ -141,7 +141,7 @@ class FILTERAND : public FILTERX {
 class FILTEROR : public FILTERX {
  public:
   // Methods
-  virtual bool Eval(PGLOBAL);
+  bool Eval(PGLOBAL) override;
   }; // end of class FILTEROR
 
 /***********************************************************************/
@@ -150,7 +150,7 @@ class FILTEROR : public FILTERX {
 class FILTERNOT : public FILTERX {
  public:
   // Methods
-  virtual bool Eval(PGLOBAL);
+  bool Eval(PGLOBAL) override;
   }; // end of class FILTERNOT
 
 /***********************************************************************/
@@ -159,7 +159,7 @@ class FILTERNOT : public FILTERX {
 class FILTERIN : public FILTERX {
  public:
   // Methods
-  virtual bool Eval(PGLOBAL);
+  bool Eval(PGLOBAL) override;
   }; // end of class FILTERIN
 
 /***********************************************************************/
@@ -171,8 +171,8 @@ class FILTERTRUE : public FILTERX {
   FILTERTRUE(PVAL valp) {Value = valp; Value->SetValue_bool(TRUE);}
 
   // Methods
-  virtual void Reset(void);
-  virtual bool Eval(PGLOBAL);
+  void Reset(void) override;
+  bool Eval(PGLOBAL) override;
   }; // end of class FILTERTRUE
 
 #endif // __FILTER__
diff --git a/storage/connect/ha_connect.h b/storage/connect/ha_connect.h
index c83584a62e4..891e8f49168 100644
--- a/storage/connect/ha_connect.h
+++ b/storage/connect/ha_connect.h
@@ -224,13 +224,13 @@ public:
   /** @brief
     The name that will be used for display purposes.
    */
-  const char *table_type() const {return "CONNECT";}
+  const char *table_type() const override {return "CONNECT";}
 
   /** @brief
     The name of the index type that will be used for display.
     Don't implement this method unless you really have indexes.
    */
-  const char *index_type(uint inx);
+  const char *index_type(uint inx) override;
 
   /** @brief
     The file extensions.
@@ -241,15 +241,15 @@ public:
     Check if a storage engine supports a particular alter table in-place
     @note Called without holding thr_lock.c lock.
  */
- virtual enum_alter_inplace_result
+ enum_alter_inplace_result
  check_if_supported_inplace_alter(TABLE *altered_table,
-                                  Alter_inplace_info *ha_alter_info);
+                                  Alter_inplace_info *ha_alter_info) override;
 
   /** @brief
     This is a list of flags that indicate what functionality the storage engine
     implements. The current table flags are documented in handler.h
   */
-  ulonglong table_flags() const;
+  ulonglong table_flags() const override;
 
   /** @brief
     This is a bitmap of flags that indicates how the storage engine
@@ -261,7 +261,7 @@ public:
     If all_parts is set, MySQL wants to know the flags for the combined
     index, up to and including 'part'.
   */
-  ulong index_flags(uint inx, uint part, bool all_parts) const;
+  ulong index_flags(uint inx, uint part, bool all_parts) const override;
 
   /** @brief
     unireg.cc will call max_supported_record_length(), max_supported_keys(),
@@ -270,7 +270,7 @@ public:
     send. Return *real* limits of your storage engine here; MySQL will do
     min(your_limits, MySQL_limits) automatically.
    */
-  uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
+  uint max_supported_record_length() const override { return HA_MAX_REC_LENGTH; }
 
   /** @brief
     unireg.cc will call this to make sure that the storage engine can handle
@@ -281,7 +281,7 @@ public:
     There is no need to implement ..._key_... methods if your engine doesn't
     support indexes.
    */
-  uint max_supported_keys()          const { return 10; }
+  uint max_supported_keys() const override { return 10; }
 
   /** @brief
     unireg.cc will call this to make sure that the storage engine can handle
@@ -292,7 +292,7 @@ public:
     There is no need to implement ..._key_... methods if your engine doesn't
     support indexes.
    */
-  uint max_supported_key_parts()     const { return 10; }
+  uint max_supported_key_parts() const override { return 10; }
 
   /** @brief
     unireg.cc will call this to make sure that the storage engine can handle
@@ -303,19 +303,19 @@ public:
     There is no need to implement ..._key_... methods if your engine doesn't
     support indexes.
    */
-  uint max_supported_key_length()    const { return 255; }
+  uint max_supported_key_length() const override { return 255; }
 
   /** @brief
     Called in test_quick_select to determine if indexes should be used.
   */
-  virtual IO_AND_CPU_COST scan_time()
+  IO_AND_CPU_COST scan_time() override
   { return { 0, (double) (stats.records+stats.deleted) * DISK_READ_COST }; };
 
   /** @brief
     This method will never be called if you do not implement indexes.
   */
-  virtual IO_AND_CPU_COST keyread_time(uint index, ulong ranges, ha_rows rows,
-                                       ulonglong blocks)
+  IO_AND_CPU_COST keyread_time(uint index, ulong ranges, ha_rows rows,
+                                       ulonglong blocks) override
   {
     return { 0, (double) rows * 0.001 };
   }
@@ -327,7 +327,7 @@ public:
     Most of these methods are not obligatory, skip them and
     MySQL will treat them as not implemented
   */
-  virtual bool get_error_message(int error, String *buf);
+  bool get_error_message(int error, String *buf) override;
 
  /**
    Push condition down to the table handler.
@@ -351,27 +351,27 @@ public:
    Calls to rnd_init/rnd_end, index_init/index_end etc do not affect the
    condition stack.
  */
-virtual const COND *cond_push(const COND *cond);
+const COND *cond_push(const COND *cond) override;
 PCFIL CheckCond(PGLOBAL g, PCFIL filp, const Item *cond);
 const char *GetValStr(OPVAL vop, bool neg);
 PFIL  CondFilter(PGLOBAL g, Item *cond);
 //PFIL  CheckFilter(PGLOBAL g);
 
 /** admin commands - called from mysql_admin_table */
-virtual int check(THD* thd, HA_CHECK_OPT* check_opt);
+int check(THD* thd, HA_CHECK_OPT* check_opt) override;
 
  /**
    Number of rows in table. It will only be called if
    (table_flags() & (HA_HAS_RECORDS | HA_STATS_RECORDS_IS_EXACT)) != 0
  */
- virtual ha_rows records();
+ ha_rows records() override;
 
  /**
    Type of table for caching query
    CONNECT should not use caching because its tables are external
    data prone to me modified out of MariaDB
  */
- virtual uint8 table_cache_type(void)
+ uint8 table_cache_type(void) override
  {
 #if defined(MEMORY_TRACE)
    // Temporary until bug MDEV-4771 is fixed
@@ -384,37 +384,37 @@ virtual int check(THD* thd, HA_CHECK_OPT* check_opt);
  /** @brief
     We implement this in ha_connect.cc; it's a required method.
   */
-  int open(const char *name, int mode, uint test_if_locked);    // required
+  int open(const char *name, int mode, uint test_if_locked) override;    // required
 
   /** @brief
     We implement this in ha_connect.cc; it's a required method.
   */
-  int close(void);                                              // required
+  int close(void) override;                                              // required
 
   /** @brief
     We implement this in ha_connect.cc. It's not an obligatory method;
     skip it and and MySQL will treat it as not implemented.
   */
-  int write_row(const uchar *buf);
+  int write_row(const uchar *buf) override;
 
   /** @brief
     We implement this in ha_connect.cc. It's not an obligatory method;
     skip it and and MySQL will treat it as not implemented.
   */
-  int update_row(const uchar *old_data, const uchar *new_data);
+  int update_row(const uchar *old_data, const uchar *new_data) override;
 
   /** @brief
     We implement this in ha_connect.cc. It's not an obligatory method;
     skip it and and MySQL will treat it as not implemented.
   */
-  int delete_row(const uchar *buf);
+  int delete_row(const uchar *buf) override;
 
   // Added to the connect handler
-  int index_init(uint idx, bool sorted);
-  int index_end();
+  int index_init(uint idx, bool sorted) override;
+  int index_end() override;
   int index_read(uchar * buf, const uchar * key, uint key_len,
-                              enum ha_rkey_function find_flag);
-  int index_next_same(uchar *buf, const uchar *key, uint keylen);
+                              enum ha_rkey_function find_flag) override;
+  int index_next_same(uchar *buf, const uchar *key, uint keylen) override;
 
   /** @brief
     We implement this in ha_connect.cc. It's not an obligatory method;
@@ -427,25 +427,25 @@ virtual int check(THD* thd, HA_CHECK_OPT* check_opt);
     We implement this in ha_connect.cc. It's not an obligatory method;
     skip it and and MySQL will treat it as not implemented.
   */
-  int index_next(uchar *buf);
+  int index_next(uchar *buf) override;
 
   /** @brief
     We implement this in ha_connect.cc. It's not an obligatory method;
     skip it and and MySQL will treat it as not implemented.
   */
-int index_prev(uchar *buf);
+int index_prev(uchar *buf) override;
 
   /** @brief
     We implement this in ha_connect.cc. It's not an obligatory method;
     skip it and and MySQL will treat it as not implemented.
   */
-  int index_first(uchar *buf);
+  int index_first(uchar *buf) override;
 
   /** @brief
     We implement this in ha_connect.cc. It's not an obligatory method;
     skip it and and MySQL will treat it as not implemented.
   */
-  int index_last(uchar *buf);
+  int index_last(uchar *buf) override;
 
   /* Index condition pushdown implementation */
 //Item *idx_cond_push(uint keyno, Item* idx_cond);
@@ -458,58 +458,58 @@ int index_prev(uchar *buf);
     cursor to the start of the table; no need to deallocate and allocate
     it again. This is a required method.
   */
-  int rnd_init(bool scan);                                      //required
-  int rnd_end();
-  int rnd_next(uchar *buf);                                     ///< required
-  int rnd_pos(uchar *buf, uchar *pos);                          ///< required
-  void position(const uchar *record);                           ///< required
-  int info(uint);                                               ///< required
-  int extra(enum ha_extra_function operation);
-  int start_stmt(THD *thd, thr_lock_type lock_type);
-  int external_lock(THD *thd, int lock_type);                   ///< required
-  int delete_all_rows(void);
+  int rnd_init(bool scan) override;                                      //required
+  int rnd_end() override;
+  int rnd_next(uchar *buf) override;                                     ///< required
+  int rnd_pos(uchar *buf, uchar *pos) override;                          ///< required
+  void position(const uchar *record) override;                           ///< required
+  int info(uint) override;                                               ///< required
+  int extra(enum ha_extra_function operation) override;
+  int start_stmt(THD *thd, thr_lock_type lock_type) override;
+  int external_lock(THD *thd, int lock_type) override;                   ///< required
+  int delete_all_rows(void) override;
   ha_rows records_in_range(uint inx, const key_range *start_key,
-                           const key_range *end_key, page_range *pages);
+                           const key_range *end_key, page_range *pages) override;
   /**
     These methods can be overridden, but their default implementation
     provide useful functionality.
   */
-  int rename_table(const char *from, const char *to);
+  int rename_table(const char *from, const char *to) override;
   /**
     Delete a table in the engine. Called for base as well as temporary
     tables.
   */
-  int delete_table(const char *name);
+  int delete_table(const char *name) override;
   /**
     Called by delete_table and rename_table
   */
   int delete_or_rename_table(const char *from, const char *to);
   int create(const char *name, TABLE *form,
-             HA_CREATE_INFO *create_info);                      ///< required
+             HA_CREATE_INFO *create_info) override;                  ///< required
   bool check_if_incompatible_data(HA_CREATE_INFO *info,
-                                  uint table_changes);
+                                  uint table_changes) override;
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type);     ///< required
-  int optimize(THD* thd, HA_CHECK_OPT* check_opt);
+                             enum thr_lock_type lock_type) override; ///< required
+  int optimize(THD* thd, HA_CHECK_OPT* check_opt) override;
 
   /**
    * Multi Range Read interface
    */
   int multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
-                            uint n_ranges, uint mode, HANDLER_BUFFER *buf);
-  int multi_range_read_next(range_id_t *range_info);
+                            uint n_ranges, uint mode, HANDLER_BUFFER *buf) override;
+  int multi_range_read_next(range_id_t *range_info) override;
   ha_rows multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
                                       void *seq_init_param,
                                       uint n_ranges, uint *bufsz,
                                       uint *flags, ha_rows limit,
-                                      Cost_estimate *cost);
+                                      Cost_estimate *cost) override;
   ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys,
                                 uint key_parts, uint *bufsz,
-                                uint *flags, Cost_estimate *cost);
-  int multi_range_read_explain_info(uint mrr_mode, char *str, size_t size);
+                                uint *flags, Cost_estimate *cost) override;
+  int multi_range_read_explain_info(uint mrr_mode, char *str, size_t size) override;
 
-  int reset(void) {ds_mrr.dsmrr_close(); return 0;}
+  int reset(void) override {ds_mrr.dsmrr_close(); return 0;}
 
   /* Index condition pushdown implementation */
 //  Item *idx_cond_push(uint keyno, Item* idx_cond);
diff --git a/storage/connect/jdbconn.h b/storage/connect/jdbconn.h
index 0c36cccadcf..48734caba93 100644
--- a/storage/connect/jdbconn.h
+++ b/storage/connect/jdbconn.h
@@ -23,7 +23,7 @@ public:
 	// Constructor
 	JDBConn(PGLOBAL g, PCSZ wrapper);
 
-	virtual void AddJars(PSTRG jpop, char sep);
+	void AddJars(PSTRG jpop, char sep) override;
 	PQRYRES AllocateResult(PGLOBAL g, PTDB tdbp);
 
 	// Attributes
@@ -34,9 +34,9 @@ public:
 
 public:
 	// Operations
-	virtual bool Connect(PJPARM sop);
-	virtual bool MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options,
-		PCSZ filter, bool pipe) {return true;}
+	bool Connect(PJPARM sop) override;
+	bool MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options,
+                        PCSZ filter, bool pipe) override {return true;}
 	virtual int  GetResultSize(PCSZ sql, PCOL colp);
 	virtual int  ExecuteCommand(PCSZ sql);
 	virtual int  ExecuteQuery(PCSZ sql);
diff --git a/storage/connect/jmgfam.h b/storage/connect/jmgfam.h
index c5d9d1f57e6..818422edfee 100644
--- a/storage/connect/jmgfam.h
+++ b/storage/connect/jmgfam.h
@@ -31,35 +31,35 @@ public:
 	JMGFAM(PJMGFAM txfp);
 
 	// Implementation
-	virtual AMT   GetAmType(void) { return TYPE_AM_MGO; }
-	virtual bool  GetUseTemp(void) { return false; }
-	virtual int   GetPos(void);
-	virtual int   GetNextPos(void);
-	virtual PTXF  Duplicate(PGLOBAL g) { return (PTXF)new(g) JMGFAM(this); }
+	AMT   GetAmType(void) override { return TYPE_AM_MGO; }
+	bool  GetUseTemp(void) override { return false; }
+	int   GetPos(void) override;
+	int   GetNextPos(void) override;
+	PTXF  Duplicate(PGLOBAL g) override { return (PTXF)new(g) JMGFAM(this); }
 	void  SetLrecl(int lrecl) { Lrecl = lrecl; }
 
 	// Methods
-	virtual void  Reset(void);
-	virtual int   GetFileLength(PGLOBAL g);
-	virtual int   Cardinality(PGLOBAL g);
-	virtual int   MaxBlkSize(PGLOBAL g, int s);
-	virtual bool  AllocateBuffer(PGLOBAL g) { return false; }
-	virtual int   GetRowID(void);
-	virtual bool  RecordPos(PGLOBAL g);
-	virtual bool  SetPos(PGLOBAL g, int recpos);
-	virtual int   SkipRecord(PGLOBAL g, bool header);
-	virtual bool  OpenTableFile(PGLOBAL g);
-	virtual int   ReadBuffer(PGLOBAL g);
-	virtual int   WriteBuffer(PGLOBAL g);
-	virtual int   DeleteRecords(PGLOBAL g, int irc);
-	virtual void  CloseTableFile(PGLOBAL g, bool abort);
-	virtual void  Rewind(void);
+	void  Reset(void) override;
+	int   GetFileLength(PGLOBAL g) override;
+	int   Cardinality(PGLOBAL g) override;
+	int   MaxBlkSize(PGLOBAL g, int s) override;
+	bool  AllocateBuffer(PGLOBAL g) override { return false; }
+	int   GetRowID(void) override;
+	bool  RecordPos(PGLOBAL g) override;
+	bool  SetPos(PGLOBAL g, int recpos) override;
+	int   SkipRecord(PGLOBAL g, bool header) override;
+	bool  OpenTableFile(PGLOBAL g) override;
+	int   ReadBuffer(PGLOBAL g) override;
+	int   WriteBuffer(PGLOBAL g) override;
+	int   DeleteRecords(PGLOBAL g, int irc) override;
+	void  CloseTableFile(PGLOBAL g, bool abort) override;
+	void  Rewind(void) override;
 
 protected:
-	virtual bool  OpenTempFile(PGLOBAL g) { return false; }
-	virtual bool  MoveIntermediateLines(PGLOBAL g, bool *b) { return false; }
-	virtual int   RenameTempFile(PGLOBAL g) { return RC_OK; }
-	virtual int   InitDelete(PGLOBAL g, int fpos, int spos);
+	bool  OpenTempFile(PGLOBAL g) override { return false; }
+	bool  MoveIntermediateLines(PGLOBAL g, bool *b) override { return false; }
+	int   RenameTempFile(PGLOBAL g) override { return RC_OK; }
+	int   InitDelete(PGLOBAL g, int fpos, int spos) override;
 	bool  Init(PGLOBAL g);
 //bool  MakeCursor(PGLOBAL g);
 
diff --git a/storage/connect/jmgoconn.h b/storage/connect/jmgoconn.h
index 9fed1907abc..184ff18e0f3 100644
--- a/storage/connect/jmgoconn.h
+++ b/storage/connect/jmgoconn.h
@@ -61,9 +61,9 @@ public:
 
 	// Implementation
 public:
-	virtual void AddJars(PSTRG jpop, char sep);
-	virtual bool Connect(PJPARM sop);
-	virtual bool MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options, PCSZ filter, bool pipe);
+	void AddJars(PSTRG jpop, char sep) override;
+	bool Connect(PJPARM sop) override;
+	bool MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options, PCSZ filter, bool pipe) override;
 //	PQRYRES AllocateResult(PGLOBAL g, TDBEXT *tdbp, int n);
 
 	// Attributes
diff --git a/storage/connect/json.h b/storage/connect/json.h
index 53fc5f65e7b..eeca4780baf 100644
--- a/storage/connect/json.h
+++ b/storage/connect/json.h
@@ -142,14 +142,14 @@ public:
 	JOBJECT(int i) : JSON(i) {}
 
 	// Methods
-	virtual void  Clear(void) {First = Last = NULL;}
+	void  Clear(void) override {First = Last = NULL;}
 //virtual JTYP  GetValType(void) {return TYPE_JOB;}
-  virtual PJPR  GetFirst(void) {return First;}
-	virtual int   GetSize(bool b);
-  virtual PJOB  GetObject(void) {return this;}
-	virtual PSZ   GetText(PGLOBAL g, PSTRG text);
-	virtual bool  Merge(PGLOBAL g, PJSON jsp);
-	virtual bool  IsNull(void);
+  PJPR  GetFirst(void) override {return First;}
+	int   GetSize(bool b) override;
+  PJOB  GetObject(void) override {return this;}
+	PSZ   GetText(PGLOBAL g, PSTRG text) override;
+	bool  Merge(PGLOBAL g, PJSON jsp) override;
+	bool  IsNull(void) override;
 
 	// Specific
 	PJPR  AddPair(PGLOBAL g, PCSZ key);
@@ -174,15 +174,15 @@ class JARRAY : public JSON {
 	JARRAY(int i) : JSON(i) {}
 
 	// Methods
-  virtual void  Clear(void) {First = Last = NULL; Size = 0;}
-	virtual int   size(void) { return Size; }
-  virtual PJAR  GetArray(void) {return this;}
-	virtual int   GetSize(bool b);
-  virtual PJVAL GetArrayValue(int i);
-	virtual PSZ   GetText(PGLOBAL g, PSTRG text);
-	virtual bool  Merge(PGLOBAL g, PJSON jsp);
-  virtual bool  DeleteValue(int n);
-  virtual bool  IsNull(void);
+  void  Clear(void) override {First = Last = NULL; Size = 0;}
+	int   size(void) override { return Size; }
+  PJAR  GetArray(void) override {return this;}
+	int   GetSize(bool b) override;
+  PJVAL GetArrayValue(int i) override;
+	PSZ   GetText(PGLOBAL g, PSTRG text) override;
+	bool  Merge(PGLOBAL g, PJSON jsp) override;
+  bool  DeleteValue(int n) override;
+  bool  IsNull(void) override;
 
 	// Specific
 	PJVAL AddArrayValue(PGLOBAL g, PJVAL jvp = NULL, int* x = NULL);
@@ -221,14 +221,14 @@ public:
   //using JSON::SetVal;
 
 	// Methods
-	virtual void   Clear(void);
+	void   Clear(void) override;
 //virtual JTYP   GetType(void) {return TYPE_JVAL;}
   virtual JTYP   GetValType(void);
-  virtual PJOB   GetObject(void);
-  virtual PJAR   GetArray(void);
-  virtual PJSON  GetJsp(void) {return (DataType == TYPE_JSON ? Jsp : NULL);}
-  virtual PSZ    GetText(PGLOBAL g, PSTRG text);
-	virtual bool   IsNull(void);
+  PJOB   GetObject(void) override;
+  PJAR   GetArray(void) override;
+  PJSON  GetJsp(void) override {return (DataType == TYPE_JSON ? Jsp : NULL);}
+  PSZ    GetText(PGLOBAL g, PSTRG text) override;
+	bool   IsNull(void) override;
 
 	// Specific
 	//inline PVL  GetVal(void) { return Val; }
@@ -239,7 +239,7 @@ public:
 	long long GetBigint(void);
 	double GetFloat(void);
 	PVAL   GetValue(PGLOBAL g);
-	void   SetValue(PJSON jsp);
+	void   SetValue(PJSON jsp) override;
 	void   SetValue(PGLOBAL g, PVAL valp);
 	void   SetString(PGLOBAL g, PSZ s, int ci = 0);
 	void   SetInteger(PGLOBAL g, int n);
@@ -288,9 +288,9 @@ class JOUTSTR : public JOUT {
 public:
 	JOUTSTR(PGLOBAL g);
 
-	virtual bool WriteStr(const char* s);
-	virtual bool WriteChr(const char c);
-	virtual bool Escape(const char* s);
+	bool WriteStr(const char* s) override;
+	bool WriteChr(const char c) override;
+	bool Escape(const char* s) override;
 
 	// Member
 	char* Strp;                         // The serialized string
@@ -305,9 +305,9 @@ class JOUTFILE : public JOUT {
 public:
 	JOUTFILE(PGLOBAL g, FILE* str, int pty) : JOUT(g) { Stream = str; Pretty = pty; }
 
-	virtual bool WriteStr(const char* s);
-	virtual bool WriteChr(const char c);
-	virtual bool Escape(const char* s);
+	bool WriteStr(const char* s) override;
+	bool WriteChr(const char c) override;
+	bool Escape(const char* s) override;
 
 	// Member
 	FILE* Stream;
@@ -320,8 +320,8 @@ class JOUTPRT : public JOUTFILE {
 public:
 	JOUTPRT(PGLOBAL g, FILE* str) : JOUTFILE(g, str, 2) { M = 0; B = false; }
 
-	virtual bool WriteStr(const char* s);
-	virtual bool WriteChr(const char c);
+	bool WriteStr(const char* s) override;
+	bool WriteChr(const char c) override;
 
 	// Member
 	int  M;
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
index ab588dd49a6..8226948f240 100644
--- a/storage/connect/libdoc.cpp
+++ b/storage/connect/libdoc.cpp
@@ -63,23 +63,23 @@ class LIBXMLDOC : public XMLDOCUMENT {
   LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp);
 
   // Properties
-  virtual short  GetDocType(void) {return TYPE_FB_XML2;}
-  virtual void  *GetDocPtr(void) {return Docp;}
-  virtual void   SetNofree(bool b) {Nofreelist = b;}
+  short  GetDocType(void) override {return TYPE_FB_XML2;}
+  void  *GetDocPtr(void) override {return Docp;}
+  void   SetNofree(bool b) override {Nofreelist = b;}
 
   // Methods
-	virtual bool    Initialize(PGLOBAL g, PCSZ entry, bool zipped);
-  virtual bool    ParseFile(PGLOBAL g, char *fn);
-  virtual bool    NewDoc(PGLOBAL g, PCSZ ver);
-  virtual void    AddComment(PGLOBAL g, char *com);
-  virtual PXNODE  GetRoot(PGLOBAL g);
-  virtual PXNODE  NewRoot(PGLOBAL g, char *name);
-  virtual PXNODE  NewPnode(PGLOBAL g, char *name);
-  virtual PXATTR  NewPattr(PGLOBAL g);
-  virtual PXLIST  NewPlist(PGLOBAL g);
-  virtual int     DumpDoc(PGLOBAL g, char *ofn);
-  virtual void    CloseDoc(PGLOBAL g, PFBLOCK xp);
-  virtual PFBLOCK LinkXblock(PGLOBAL g, MODE m, int rc, char *fn);
+	bool    Initialize(PGLOBAL g, PCSZ entry, bool zipped) override;
+  bool    ParseFile(PGLOBAL g, char *fn) override;
+  bool    NewDoc(PGLOBAL g, PCSZ ver) override;
+  void    AddComment(PGLOBAL g, char *com) override;
+  PXNODE  GetRoot(PGLOBAL g) override;
+  PXNODE  NewRoot(PGLOBAL g, char *name) override;
+  PXNODE  NewPnode(PGLOBAL g, char *name) override;
+  PXATTR  NewPattr(PGLOBAL g) override;
+  PXLIST  NewPlist(PGLOBAL g) override;
+  int     DumpDoc(PGLOBAL g, char *ofn) override;
+  void    CloseDoc(PGLOBAL g, PFBLOCK xp) override;
+  PFBLOCK LinkXblock(PGLOBAL g, MODE m, int rc, char *fn) override;
 
  protected:
 //        bool     CheckDocument(FILE *of, xmlNodePtr np);
@@ -105,23 +105,23 @@ class XML2NODE : public XMLNODE {
   friend class XML2NODELIST;
  public:
   // Properties
-  virtual char  *GetName(PGLOBAL g) {return (char*)Nodep->name;}
-  virtual int    GetType(void);
-  virtual PXNODE GetNext(PGLOBAL g);
-  virtual PXNODE GetChild(PGLOBAL g);
+  char  *GetName(PGLOBAL g) override {return (char*)Nodep->name;}
+  int    GetType(void) override;
+  PXNODE GetNext(PGLOBAL g) override;
+  PXNODE GetChild(PGLOBAL g) override;
 
   // Methods
-  virtual RCODE  GetContent(PGLOBAL g, char *buf, int len);
-  virtual bool   SetContent(PGLOBAL g, char *txtp, int len);
-  virtual PXNODE Clone(PGLOBAL g, PXNODE np);
-  virtual PXLIST GetChildElements(PGLOBAL g, char *xp, PXLIST lp);
-  virtual PXLIST SelectNodes(PGLOBAL g, char *xp, PXLIST lp);
-  virtual PXNODE SelectSingleNode(PGLOBAL g, char *xp, PXNODE np);
-  virtual PXATTR GetAttribute(PGLOBAL g, char *name, PXATTR ap);
-  virtual PXNODE AddChildNode(PGLOBAL g, PCSZ name, PXNODE np);
-  virtual PXATTR AddProperty(PGLOBAL g, char *name, PXATTR ap);
-  virtual void   AddText(PGLOBAL g, PCSZ txtp);
-  virtual void   DeleteChild(PGLOBAL g, PXNODE dnp);
+  RCODE  GetContent(PGLOBAL g, char *buf, int len) override;
+  bool   SetContent(PGLOBAL g, char *txtp, int len) override;
+  PXNODE Clone(PGLOBAL g, PXNODE np) override;
+  PXLIST GetChildElements(PGLOBAL g, char *xp, PXLIST lp) override;
+  PXLIST SelectNodes(PGLOBAL g, char *xp, PXLIST lp) override;
+  PXNODE SelectSingleNode(PGLOBAL g, char *xp, PXNODE np) override;
+  PXATTR GetAttribute(PGLOBAL g, char *name, PXATTR ap) override;
+  PXNODE AddChildNode(PGLOBAL g, PCSZ name, PXNODE np) override;
+  PXATTR AddProperty(PGLOBAL g, char *name, PXATTR ap) override;
+  void   AddText(PGLOBAL g, PCSZ txtp) override;
+  void   DeleteChild(PGLOBAL g, PXNODE dnp) override;
 
  protected:
   // Constructor
@@ -141,9 +141,9 @@ class XML2NODELIST : public XMLNODELIST {
   friend class XML2NODE;
  public:
   // Methods
-  virtual int    GetLength(void);
-  virtual PXNODE GetItem(PGLOBAL g, int n, PXNODE np);
-  virtual bool   DropItem(PGLOBAL g, int n);
+  int    GetLength(void) override;
+  PXNODE GetItem(PGLOBAL g, int n, PXNODE np) override;
+  bool   DropItem(PGLOBAL g, int n) override;
 
  protected:
   // Constructor
@@ -161,12 +161,12 @@ class XML2ATTR : public XMLATTRIBUTE {
   friend class XML2NODE;
  public:
   // Properties
-  virtual char  *GetName(PGLOBAL g) {return (char*)Atrp->name;}
-  virtual PXATTR GetNext(PGLOBAL g);
+  char  *GetName(PGLOBAL g) override {return (char*)Atrp->name;}
+  PXATTR GetNext(PGLOBAL g) override;
 
   // Methods
-  virtual RCODE  GetText(PGLOBAL g, char *bufp, int len);
-  virtual bool   SetText(PGLOBAL g, char *txtp, int len);
+  RCODE  GetText(PGLOBAL g, char *bufp, int len) override;
+  bool   SetText(PGLOBAL g, char *txtp, int len) override;
 
  protected:
   // Constructor
diff --git a/storage/connect/mongo.h b/storage/connect/mongo.h
index 7e92a7dc8e9..57652dc534e 100644
--- a/storage/connect/mongo.h
+++ b/storage/connect/mongo.h
@@ -69,11 +69,11 @@ public:
 	MGODEF(void);
 
 	// Implementation
-	virtual const char *GetType(void) { return "MONGO"; }
+	const char *GetType(void) override { return "MONGO"; }
 
 	// Methods
-	virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-	virtual PTDB GetTable(PGLOBAL g, MODE m);
+	bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+	PTDB GetTable(PGLOBAL g, MODE m) override;
 
 protected:
 	// Members
diff --git a/storage/connect/mycat.h b/storage/connect/mycat.h
index 147148f4a57..ab93aa051c6 100644
--- a/storage/connect/mycat.h
+++ b/storage/connect/mycat.h
@@ -101,13 +101,13 @@ class MYCAT : public CATALOG {
   void    SetHandler(PHC hc) {Hc= hc;}
 
   // Methods
-  void    Reset(void);
+  void    Reset(void) override;
   bool    StoreIndex(PGLOBAL, PTABDEF) {return false;}  // Temporary
 	PTABDEF GetTableDesc(PGLOBAL g, PTABLE tablep,
 		                   LPCSTR type, PRELDEF *prp = NULL);
   PTDB    GetTable(PGLOBAL g, PTABLE tablep, 
-                              MODE mode = MODE_READ, LPCSTR type = NULL);
-  void    ClearDB(PGLOBAL g);
+                   MODE mode = MODE_READ, LPCSTR type = NULL) override;
+  void    ClearDB(PGLOBAL g) override;
 
  protected:
 	PTABDEF MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am);
diff --git a/storage/connect/reldef.h b/storage/connect/reldef.h
index 1b81ae9e3b3..64f3a5e0022 100644
--- a/storage/connect/reldef.h
+++ b/storage/connect/reldef.h
@@ -91,20 +91,20 @@ public:
 	RECFM   GetTableFormat(const char* type);
 	bool    SepIndex(void) {return GetBoolCatInfo("SepIndex", false);}
   bool    IsReadOnly(void) {return Read_Only;}
-  virtual AMT    GetDefType(void) {return TYPE_AM_TAB;}
+  AMT    GetDefType(void) override {return TYPE_AM_TAB;}
   virtual PIXDEF GetIndx(void) {return NULL;}
   virtual void   SetIndx(PIXDEF) {}
   virtual bool   IsHuge(void) {return false;}
   const CHARSET_INFO *data_charset() {return m_data_charset;}
-	const   char  *GetCsName(void) {return csname;}
+  const   char  *GetCsName(void) {return csname;}
 
   // Methods
-          int  GetColCatInfo(PGLOBAL g);
-          void SetIndexInfo(void);
-          bool DropTable(PGLOBAL g, PSZ name);
-	virtual bool Define(PGLOBAL g, PCATLG cat,
-						          LPCSTR name, LPCSTR schema, LPCSTR am);
-	virtual bool DefineAM(PGLOBAL, LPCSTR, int) = 0;
+  int  GetColCatInfo(PGLOBAL g);
+  void SetIndexInfo(void);
+  bool DropTable(PGLOBAL g, PSZ name);
+  bool Define(PGLOBAL g, PCATLG cat,
+              LPCSTR name, LPCSTR schema, LPCSTR am) override;
+  virtual bool DefineAM(PGLOBAL, LPCSTR, int) = 0;
 
  protected:
   // Members
@@ -135,12 +135,12 @@ class DllExport OEMDEF : public TABDEF {                  /* OEM table */
   OEMDEF(void) {Hdll = NULL; Pxdef = NULL; Module = Subtype = NULL;}
 
   // Implementation
-  virtual const char *GetType(void) {return "OEM";}
-  virtual AMT  GetDefType(void) {return TYPE_AM_OEM;}
+  const char *GetType(void) override {return "OEM";}
+  AMT  GetDefType(void) override {return TYPE_AM_OEM;}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE mode);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE mode) override;
 
  protected:
   PTABDEF GetXdef(PGLOBAL g);
diff --git a/storage/connect/tabbson.h b/storage/connect/tabbson.h
index 9d5a8b7daf5..3694d05a199 100644
--- a/storage/connect/tabbson.h
+++ b/storage/connect/tabbson.h
@@ -71,11 +71,11 @@ public:
   BSONDEF(void);
 
   // Implementation
-  virtual const char* GetType(void) { return "BSON"; }
+  const char* GetType(void) override { return "BSON"; }
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
 protected:
   // Members
@@ -170,30 +170,30 @@ public:
   TDBBSN(TDBBSN* tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) { return TYPE_AM_JSN; }
-  virtual bool SkipHeader(PGLOBAL g);
-  virtual PTDB Duplicate(PGLOBAL g) { return (PTDB)new(g) TDBBSN(this); }
+  AMT  GetAmType(void) override { return TYPE_AM_JSN; }
+  bool SkipHeader(PGLOBAL g) override;
+  PTDB Duplicate(PGLOBAL g) override { return (PTDB)new(g) TDBBSN(this); }
   PBVAL GetRow(void) { return Row; }
 
   // Methods
-  virtual PTDB Clone(PTABS t);
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual PCOL InsertSpecialColumn(PCOL colp);
-  virtual int  RowNumber(PGLOBAL g, bool b = FALSE) {return (b) ? M : N;}
-  virtual bool CanBeFiltered(void) 
+  PTDB Clone(PTABS t) override;
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  PCOL InsertSpecialColumn(PCOL colp) override;
+  int  RowNumber(PGLOBAL g, bool b = FALSE) override {return (b) ? M : N;}
+  bool CanBeFiltered(void) override 
                {return Txfp->GetAmType() == TYPE_AM_MGO || !Xcol;}
 
   // Database routines
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual bool PrepareWriting(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual void CloseDB(PGLOBAL g);
+  int  Cardinality(PGLOBAL g) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  bool PrepareWriting(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  void CloseDB(PGLOBAL g) override;
 
   // Specific routine
-  virtual int  EstimatedLength(void);
+  int  EstimatedLength(void) override;
 
 protected:
   PBVAL FindRow(PGLOBAL g);
@@ -242,15 +242,15 @@ public:
   BSONCOL(BSONCOL* colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int   GetAmType(void) { return Tbp->GetAmType(); }
-  virtual bool  Stringify(void) { return Sgfy; }
+  int   GetAmType(void) override { return Tbp->GetAmType(); }
+  bool  Stringify(void) override { return Sgfy; }
 
   // Methods
-  virtual bool  SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
+  bool  SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
           bool  ParseJpath(PGLOBAL g);
-  virtual PSZ   GetJpath(PGLOBAL g, bool proj);
-  virtual void  ReadColumn(PGLOBAL g);
-  virtual void  WriteColumn(PGLOBAL g);
+  PSZ   GetJpath(PGLOBAL g, bool proj) override;
+  void  ReadColumn(PGLOBAL g) override;
+  void  WriteColumn(PGLOBAL g) override;
 
 protected:
   bool  CheckExpand(PGLOBAL g, int i, PSZ nm, bool b);
@@ -288,30 +288,30 @@ public:
   TDBBSON(PBTDB tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) { return TYPE_AM_JSON; }
-  virtual PTDB Duplicate(PGLOBAL g) { return (PTDB)new(g) TDBBSON(this); }
+  AMT  GetAmType(void) override { return TYPE_AM_JSON; }
+  PTDB Duplicate(PGLOBAL g) override { return (PTDB)new(g) TDBBSON(this); }
   PBVAL GetDoc(void) { return Docp; }
 
   // Methods
-  virtual PTDB Clone(PTABS t);
+  PTDB Clone(PTABS t) override;
 
   // Database routines
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual void ResetSize(void);
-  virtual int  GetProgCur(void) { return N; }
-  virtual int  GetRecpos(void);
-  virtual bool SetRecpos(PGLOBAL g, int recpos);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual bool PrepareWriting(PGLOBAL g) { return false; }
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
+  int  Cardinality(PGLOBAL g) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  void ResetSize(void) override;
+  int  GetProgCur(void) override { return N; }
+  int  GetRecpos(void) override;
+  bool SetRecpos(PGLOBAL g, int recpos) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  bool PrepareWriting(PGLOBAL g) override { return false; }
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
   int  MakeDocument(PGLOBAL g);
 
   // Optimization routines
-  virtual int  MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add);
+  int  MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add) override;
 
 protected:
   int  MakeNewDoc(PGLOBAL g);
@@ -335,7 +335,7 @@ public:
 
 protected:
   // Specific routines
-  virtual PQRYRES GetResult(PGLOBAL g);
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   PTOS Topt;
diff --git a/storage/connect/tabcmg.h b/storage/connect/tabcmg.h
index 9effe714fdd..a40c0c9e24a 100644
--- a/storage/connect/tabcmg.h
+++ b/storage/connect/tabcmg.h
@@ -17,9 +17,9 @@ public:
 	CMGDISC(PGLOBAL g, int *lg) : MGODISC(g, lg) { drv = "C"; }
 
 	// Methods
-	virtual void GetDoc(void);
-//virtual bool Find(PGLOBAL g, int i, int k, bool b);
-	virtual bool Find(PGLOBAL g);
+	void GetDoc(void) override;
+//bool Find(PGLOBAL g, int i, int k, bool b) override;
+	bool Find(PGLOBAL g) override;
 
 	// BSON Function
 //bool FindInDoc(PGLOBAL g, bson_iter_t *iter, const bson_t *doc,
@@ -49,24 +49,24 @@ public:
 	TDBCMG(TDBCMG *tdbp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) {return TYPE_AM_MGO;}
-	virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBCMG(this);}
+	AMT  GetAmType(void) override {return TYPE_AM_MGO;}
+	PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBCMG(this);}
 
 	// Methods
-	virtual PTDB Clone(PTABS t);
-	virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-	virtual PCOL InsertSpecialColumn(PCOL colp);
-	virtual int  RowNumber(PGLOBAL g, bool b = FALSE) {return N;}
+	PTDB Clone(PTABS t) override;
+	PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+	PCOL InsertSpecialColumn(PCOL colp) override;
+	int  RowNumber(PGLOBAL g, bool b = FALSE) override {return N;}
 
 	// Database routines
-	virtual int  Cardinality(PGLOBAL g);
-	virtual int  GetMaxSize(PGLOBAL g);
-	virtual bool OpenDB(PGLOBAL g);
-	virtual int  ReadDB(PGLOBAL g);
-	virtual int  WriteDB(PGLOBAL g);
-	virtual int  DeleteDB(PGLOBAL g, int irc);
-	virtual void CloseDB(PGLOBAL g);
-	virtual bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr);
+	int  Cardinality(PGLOBAL g) override;
+	int  GetMaxSize(PGLOBAL g) override;
+	bool OpenDB(PGLOBAL g) override;
+	int  ReadDB(PGLOBAL g) override;
+	int  WriteDB(PGLOBAL g) override;
+	int  DeleteDB(PGLOBAL g, int irc) override;
+	void CloseDB(PGLOBAL g) override;
+	bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) override;
 
 protected:
 	bool Init(PGLOBAL g);
@@ -96,13 +96,13 @@ public:
 	MGOCOL(MGOCOL *colp, PTDB tdbp); // Constructor used in copy process
 
 	// Implementation
-	virtual int   GetAmType(void) { return Tmgp->GetAmType(); }
-	virtual bool  Stringify(void) { return Sgfy; }
+	int   GetAmType(void) override { return Tmgp->GetAmType(); }
+	bool  Stringify(void) override { return Sgfy; }
 
 	// Methods
-	virtual PSZ   GetJpath(PGLOBAL g, bool proj);
-	virtual void  ReadColumn(PGLOBAL g);
-	virtual void  WriteColumn(PGLOBAL g);
+	PSZ   GetJpath(PGLOBAL g, bool proj) override;
+	void  ReadColumn(PGLOBAL g) override;
+	void  WriteColumn(PGLOBAL g) override;
 
 protected:
 	// Default constructor not to be used
@@ -124,7 +124,7 @@ public:
 
 protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	virtual PQRYRES GetResult(PGLOBAL g) override;
 
 	// Members
 	PTOS Topt;
diff --git a/storage/connect/tabcol.h b/storage/connect/tabcol.h
index e4657e2f261..973749c18c3 100644
--- a/storage/connect/tabcol.h
+++ b/storage/connect/tabcol.h
@@ -38,8 +38,8 @@ class DllExport XTAB: public BLOCK {  // Table Name-Schema-Srcdef block.
 
   // Methods
   PTABLE Link(PTABLE);
-  void   Printf(PGLOBAL g, FILE *f, uint n);
-  void   Prints(PGLOBAL g, char *ps, uint z);
+  void   Printf(PGLOBAL g, FILE *f, uint n) override;
+  void   Prints(PGLOBAL g, char *ps, uint z) override;
 
  protected:
   // Members
@@ -64,11 +64,11 @@ class DllExport COLUMN: public XOBJECT {  // Column Name/Qualifier block.
   COLUMN(LPCSTR name);
 
   // Implementation
-  virtual int    GetType(void) {return TYPE_COLUMN;}
-  virtual int    GetResultType(void) {assert(false); return TYPE_VOID;}
-  virtual int    GetLength(void) {assert(false); return 0;}
-  virtual int    GetLengthEx(void) {assert(false); return 0;}
-  virtual int    GetScale() {assert(false); return 0;};
+  int    GetType(void) override {return TYPE_COLUMN;}
+  int    GetResultType(void) override {assert(false); return TYPE_VOID;}
+  int    GetLength(void) override {assert(false); return 0;}
+  int    GetLengthEx(void) override {assert(false); return 0;}
+  int    GetScale() override {assert(false); return 0;};
           LPCSTR GetName(void) {return Name;}
           LPCSTR GetQualifier(void) {return Qualifier;}
           PTABLE GetTo_Table(void) {return To_Table;}
@@ -78,13 +78,13 @@ class DllExport COLUMN: public XOBJECT {  // Column Name/Qualifier block.
           void   SetTo_Col(PCOL colp) {To_Col = colp;}
 
   // Methods
-  virtual void   Printf(PGLOBAL g, FILE *f, uint n);
-  virtual void   Prints(PGLOBAL g, char *ps, uint z);
+  void   Printf(PGLOBAL g, FILE *f, uint n) override;
+  void   Prints(PGLOBAL g, char *ps, uint z) override;
   // All methods below should never be used for COLUMN's
-  virtual void   Reset(void) {assert(false);}
-  virtual bool   Compare(PXOB) {assert(false); return false;}
-  virtual bool   SetFormat(PGLOBAL, FORMAT&);
-  virtual bool   Eval(PGLOBAL) {assert(false); return true;}
+  void   Reset(void) override {assert(false);}
+  bool   Compare(PXOB) override {assert(false); return false;}
+  bool   SetFormat(PGLOBAL, FORMAT&) override;
+  bool   Eval(PGLOBAL) override {assert(false); return true;}
 
  private:
   // Members
diff --git a/storage/connect/tabdos.h b/storage/connect/tabdos.h
index 22bb5c63ce3..346aad2dba5 100644
--- a/storage/connect/tabdos.h
+++ b/storage/connect/tabdos.h
@@ -36,11 +36,11 @@ class DllExport DOSDEF : public TABDEF {  /* Logical table description */
   DOSDEF(void);
 
   // Implementation
-  virtual AMT         GetDefType(void) {return TYPE_AM_DOS;}
-  virtual const char *GetType(void) {return "DOS";}
-  virtual PIXDEF      GetIndx(void) {return To_Indx;}
-  virtual void        SetIndx(PIXDEF xdp) {To_Indx = xdp;}
-  virtual bool        IsHuge(void) {return Huge;}
+  AMT         GetDefType(void) override {return TYPE_AM_DOS;}
+  const char *GetType(void) override {return "DOS";}
+  PIXDEF      GetIndx(void) override {return To_Indx;}
+  void        SetIndx(PIXDEF xdp) override {To_Indx = xdp;}
+  bool        IsHuge(void) override {return Huge;}
   PCSZ    GetFn(void) {return Fn;}
   PCSZ    GetOfn(void) {return Ofn;}
 	PCSZ    GetEntry(void) {return Entry;}
@@ -63,11 +63,11 @@ class DllExport DOSDEF : public TABDEF {  /* Logical table description */
   int    *GetTo_Pos(void) {return To_Pos;}
 
   // Methods
-	virtual int  Indexable(void)
+	int  Indexable(void) override
   	{return (!Multiple && !Mulentries && Compressed != 1) ? 1 : 0;}
 	virtual bool DeleteIndexFile(PGLOBAL g, PIXDEF pxdf);
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE mode);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE mode) override;
           bool InvalidateIndex(PGLOBAL g);
           bool GetOptFileName(PGLOBAL g, char *filename);
           void RemoveOptValues(PGLOBAL g);
@@ -133,62 +133,62 @@ class DllExport TDBDOS : public TDBASE {
   inline  PXOB *GetLink(void) {return To_Link;}
 
   // Implementation
-  virtual AMT   GetAmType(void) {return Txfp->GetAmType();}
-  virtual PCSZ  GetFile(PGLOBAL) {return Txfp->To_File;}
-  virtual void  SetFile(PGLOBAL, PCSZ fn) {Txfp->To_File = fn;}
-  virtual void  SetAbort(bool b) {Abort = b;}
-  virtual RECFM GetFtype(void) {return Ftype;}
+  AMT   GetAmType(void) override {return Txfp->GetAmType();}
+  PCSZ  GetFile(PGLOBAL) override {return Txfp->To_File;}
+  void  SetFile(PGLOBAL, PCSZ fn) override {Txfp->To_File = fn;}
+  void  SetAbort(bool b) override {Abort = b;}
+  RECFM GetFtype(void) override {return Ftype;}
   virtual bool  SkipHeader(PGLOBAL) {return false;}
-  virtual void  RestoreNrec(void) {Txfp->SetNrec(1);}
-  virtual PTDB  Duplicate(PGLOBAL g)
+  void  RestoreNrec(void) override {Txfp->SetNrec(1);}
+  PTDB  Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBDOS(g, this);}
 
   // Methods
-  virtual PTDB  Clone(PTABS t);
-  virtual void  ResetDB(void) {Txfp->Reset();}
-  virtual bool  IsUsingTemp(PGLOBAL g);
-  virtual bool  IsIndexed(void) {return Indxd;}
-  virtual void  ResetSize(void) {MaxSize = Cardinal = -1;}
-  virtual int   ResetTableOpt(PGLOBAL g, bool dop, bool dox);
+  PTDB  Clone(PTABS t) override;
+  void  ResetDB(void) override {Txfp->Reset();}
+  bool  IsUsingTemp(PGLOBAL g) override;
+  bool  IsIndexed(void) override {return Indxd;}
+  void  ResetSize(void) override {MaxSize = Cardinal = -1;}
+  int   ResetTableOpt(PGLOBAL g, bool dop, bool dox) override;
   virtual int   MakeBlockValues(PGLOBAL g);
   virtual bool  SaveBlockValues(PGLOBAL g);
-  virtual bool  GetBlockValues(PGLOBAL g);
+  bool  GetBlockValues(PGLOBAL g) override;
   virtual PBF   InitBlockFilter(PGLOBAL g, PFIL filp);
 //virtual PBX   InitBlockIndex(PGLOBAL g);
   virtual int   TestBlock(PGLOBAL g);
-  virtual void  PrintAM(FILE *f, char *m);
+  void  PrintAM(FILE *f, char *m) override;
 
   // Database routines
-  virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
+  PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
   virtual char *GetOpenMode(PGLOBAL, char*) {return NULL;}
   virtual int   GetFileLength(PGLOBAL g) {return Txfp->GetFileLength(g);}
-  virtual int   GetProgMax(PGLOBAL g);
-  virtual int   GetProgCur(void);
+  int   GetProgMax(PGLOBAL g) override;
+  int   GetProgCur(void) override;
 //virtual int   GetAffectedRows(void) {return Txfp->GetDelRows();}
-  virtual int   GetRecpos(void) {return Txfp->GetPos();}
-  virtual bool  SetRecpos(PGLOBAL g, int recpos)
+  int   GetRecpos(void) override {return Txfp->GetPos();}
+  bool  SetRecpos(PGLOBAL g, int recpos) override
                 {return Txfp->SetPos(g, recpos);}
-  virtual int   RowNumber(PGLOBAL g, bool b = false);
-  virtual int   Cardinality(PGLOBAL g);
-  virtual int   GetMaxSize(PGLOBAL g);
-  virtual bool  OpenDB(PGLOBAL g);
-  virtual int   ReadDB(PGLOBAL g);
-  virtual int   WriteDB(PGLOBAL g);
-  virtual int   DeleteDB(PGLOBAL g, int irc);
-  virtual void  CloseDB(PGLOBAL g);
+  int   RowNumber(PGLOBAL g, bool b = false) override;
+  int   Cardinality(PGLOBAL g) override;
+  int   GetMaxSize(PGLOBAL g) override;
+  bool  OpenDB(PGLOBAL g) override;
+  int   ReadDB(PGLOBAL g) override;
+  int   WriteDB(PGLOBAL g) override;
+  int   DeleteDB(PGLOBAL g, int irc) override;
+  void  CloseDB(PGLOBAL g) override;
   virtual int   ReadBuffer(PGLOBAL g) {return Txfp->ReadBuffer(g);}
 
   // Specific routine
   virtual int   EstimatedLength(void);
 
   // Optimization routines
-  virtual int   MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add);
+  int   MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add) override;
           bool  InitialyzeIndex(PGLOBAL g, PIXDEF xdp, bool sorted);
           void  ResetBlockFilter(PGLOBAL g);
           bool  GetDistinctColumnValues(PGLOBAL g, int nrec);
 
  protected:
-  virtual bool  PrepareWriting(PGLOBAL g);
+  bool  PrepareWriting(PGLOBAL g) override;
           PBF   CheckBlockFilari(PGLOBAL g, PXOB *arg, int op, bool *cnv);
 
   // Members
@@ -219,10 +219,10 @@ class DllExport DOSCOL : public COLBLK {
   DOSCOL(DOSCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int    GetAmType(void) {return TYPE_AM_DOS;}
-  virtual void   SetTo_Val(PVAL valp) {To_Val = valp;}
-  virtual int    GetClustered(void) {return Clustered;}
-  virtual int    IsClustered(void) {return (Clustered &&
+  int    GetAmType(void) override {return TYPE_AM_DOS;}
+  void   SetTo_Val(PVAL valp) override {To_Val = valp;}
+  int    GetClustered(void) override {return Clustered;}
+  int    IsClustered(void) override {return (Clustered &&
                  ((PDOSDEF)(((PTDBDOS)To_Tdb)->To_Def))->IsOptimized());}
   virtual int    IsSorted(void) {return Sorted;}
   virtual PVBLK  GetMin(void) {return Min;}
@@ -233,10 +233,10 @@ class DllExport DOSCOL : public COLBLK {
   virtual PVBLK  GetDval(void) {return Dval;}
 
   // Methods
-  virtual bool   VarSize(void);
-  virtual bool   SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void   ReadColumn(PGLOBAL g);
-  virtual void   WriteColumn(PGLOBAL g);
+  bool   VarSize(void) override;
+  bool   SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
+  void   ReadColumn(PGLOBAL g) override;
+  void   WriteColumn(PGLOBAL g) override;
 
  protected:
   virtual bool   SetMinMax(PGLOBAL g);
diff --git a/storage/connect/tabext.h b/storage/connect/tabext.h
index 8a0d6c784a5..01af43c5a4d 100644
--- a/storage/connect/tabext.h
+++ b/storage/connect/tabext.h
@@ -59,7 +59,7 @@ public:
 	EXTDEF(void);                  // Constructor
 
 	// Implementation
-	virtual const char *GetType(void) { return "EXT"; }
+	const char *GetType(void) override { return "EXT"; }
 	inline PCSZ GetTabname(void) { return Tabname; }
 	inline PCSZ GetTabschema(void) { return Tabschema; }
 	inline PCSZ GetUsername(void) { return Username; };
@@ -72,8 +72,8 @@ public:
 	inline int  GetOptions(void) { return Options; }
 
 	// Methods
-	virtual int  Indexable(void) { return 2; }
-	virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
+	int  Indexable(void) override { return 2; }
+	bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
 
 protected:
 	// Members
@@ -115,15 +115,15 @@ public:
 	// Implementation
 
 	// Properties
-	virtual bool IsRemote(void) { return true; }
+	bool IsRemote(void) override { return true; }
 
 	// Methods
-	virtual PCSZ GetServer(void) { return "Remote"; }
-	virtual int  GetRecpos(void);
+	PCSZ GetServer(void) override { return "Remote"; }
+	int  GetRecpos(void) override;
 
 	// Database routines
-	virtual int  GetMaxSize(PGLOBAL g);
-	virtual int  GetProgMax(PGLOBAL g);
+	int  GetMaxSize(PGLOBAL g) override;
+	int  GetProgMax(PGLOBAL g) override;
 
 protected:
 	// Internal functions
@@ -185,9 +185,9 @@ public:
 	inline void  SetCrp(PCOLRES crp) { Crp = crp; }
 
 	// Methods
-	virtual bool   SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-	virtual void   ReadColumn(PGLOBAL) = 0;
-	virtual void   WriteColumn(PGLOBAL) = 0;
+	bool   SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
+	void   ReadColumn(PGLOBAL) override = 0;
+	void   WriteColumn(PGLOBAL) override = 0;
 
 protected:
 	// Constructor for count(*) column
diff --git a/storage/connect/tabfix.h b/storage/connect/tabfix.h
index 1a0d756bfcf..7f3bb929b50 100644
--- a/storage/connect/tabfix.h
+++ b/storage/connect/tabfix.h
@@ -28,30 +28,30 @@ class DllExport TDBFIX : public TDBDOS {
   TDBFIX(PGLOBAL g, PTDBFIX tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_FIX;}
-  virtual void RestoreNrec(void);
-  virtual PTDB Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_FIX;}
+  void RestoreNrec(void) override;
+  PTDB Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBFIX(g, this);}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
-  virtual void ResetDB(void);
-  virtual bool IsUsingTemp(PGLOBAL g);
-  virtual int  RowNumber(PGLOBAL g, bool b = false);
-  virtual int  ResetTableOpt(PGLOBAL g, bool dop, bool dox);
-  virtual void ResetSize(void);
-  virtual int  GetBadLines(void) {return Txfp->GetNerr();}
+  PTDB Clone(PTABS t) override;
+  void ResetDB(void) override;
+  bool IsUsingTemp(PGLOBAL g) override;
+  int  RowNumber(PGLOBAL g, bool b = false) override;
+  int  ResetTableOpt(PGLOBAL g, bool dop, bool dox) override;
+  void ResetSize(void) override;
+  int  GetBadLines(void) override {return Txfp->GetNerr();}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  GetProgMax(PGLOBAL g);
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  GetProgMax(PGLOBAL g) override;
+  int  Cardinality(PGLOBAL g) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
 
  protected:
-  virtual bool PrepareWriting(PGLOBAL g) {return false;}
+  bool PrepareWriting(PGLOBAL g) override {return false;}
 
   // Members
   char Teds;                  /* Binary table default endian setting   */
@@ -69,14 +69,14 @@ class DllExport BINCOL : public DOSCOL {
   BINCOL(BINCOL *colp, PTDB tdbp);  // Constructor used in copy process
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_BIN;}
+  int  GetAmType(void) override {return TYPE_AM_BIN;}
           int  GetDeplac(void) {return Deplac;}
           int  GetFileSize(void) 
                {return N ? N : GetTypeSize(Buf_Type, Long);}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
 
   // Static
   static  void SetEndian(void); 
@@ -105,7 +105,7 @@ public:
 
 protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g)
+	PQRYRES GetResult(PGLOBAL g) override
 	  {return DBFColumns(g, ((PTABDEF)To_Def)->GetPath(), Fn, Topt, false);}
 
 	// Members
diff --git a/storage/connect/tabfmt.h b/storage/connect/tabfmt.h
index 268d00b1724..e71ca998ae7 100644
--- a/storage/connect/tabfmt.h
+++ b/storage/connect/tabfmt.h
@@ -27,13 +27,13 @@ public:
   CSVDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "CSV";}
+  const char *GetType(void) override {return "CSV";}
   char    GetSep(void) {return Sep;}
   char    GetQot(void) {return Qot;}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE mode);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE mode) override;
 
  protected:
   // Members
@@ -60,29 +60,29 @@ public:
   TDBCSV(PGLOBAL g, PTDBCSV tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_CSV;}
-  virtual PTDB Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_CSV;}
+  PTDB Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBCSV(g, this);}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
+  PTDB Clone(PTABS t) override;
 //virtual bool IsUsingTemp(PGLOBAL g);
-  virtual int  GetBadLines(void) {return (int)Nerr;}
+  int  GetBadLines(void) override {return (int)Nerr;}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  CheckWrite(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);        // Physical file read
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  CheckWrite(PGLOBAL g) override;
+  int  ReadBuffer(PGLOBAL g) override;        // Physical file read
 
   // Specific routines
-  virtual int  EstimatedLength(void);
-  virtual bool SkipHeader(PGLOBAL g);
+  int  EstimatedLength(void) override;
+  bool SkipHeader(PGLOBAL g) override;
   virtual bool CheckErr(void);
 
  protected:
-  virtual bool PrepareWriting(PGLOBAL g);
+  bool PrepareWriting(PGLOBAL g) override;
 
   // Members
   PSZ  *Field;             // Field to write to current line
@@ -112,12 +112,12 @@ class DllExport CSVCOL : public DOSCOL {
   CSVCOL(CSVCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int    GetAmType() {return TYPE_AM_CSV;}
+  int    GetAmType() override {return TYPE_AM_CSV;}
 
   // Methods
-  virtual bool   VarSize(void);
-  virtual void   ReadColumn(PGLOBAL g);
-  virtual void   WriteColumn(PGLOBAL g);
+  bool   VarSize(void) override;
+  void   ReadColumn(PGLOBAL g) override;
+  void   WriteColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
@@ -143,26 +143,26 @@ class DllExport TDBFMT : public TDBCSV {
   TDBFMT(PGLOBAL g, PTDBFMT tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_FMT;}
-  virtual PTDB Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_FMT;}
+  PTDB Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBFMT(g, this);}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
+  PTDB Clone(PTABS t) override;
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-//virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+//int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
 //virtual int  CheckWrite(PGLOBAL g);
-  virtual int  ReadBuffer(PGLOBAL g);        // Physical file read
+  int  ReadBuffer(PGLOBAL g) override;        // Physical file read
 
   // Specific routines
-  virtual int  EstimatedLength(void);
+  int  EstimatedLength(void) override;
 
  protected:
-  virtual bool PrepareWriting(PGLOBAL g) 
+  bool PrepareWriting(PGLOBAL g) override 
        {snprintf(g->Message, sizeof(g->Message), MSG(TABLE_READ_ONLY), "FMT"); return true;}
 
   // Members
@@ -182,7 +182,7 @@ class DllExport TDBCCL : public TDBCAT {
 
  protected:
   // Specific routines
-  virtual PQRYRES GetResult(PGLOBAL g);
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
 	PTOS  Topt;
diff --git a/storage/connect/tabjdbc.h b/storage/connect/tabjdbc.h
index 078129a14e3..8e90ada9a7f 100644
--- a/storage/connect/tabjdbc.h
+++ b/storage/connect/tabjdbc.h
@@ -29,11 +29,11 @@ public:
 	JDBCDEF(void);
 
 	// Implementation
-	virtual const char *GetType(void) { return "JDBC"; }
+	const char *GetType(void) override { return "JDBC"; }
 
 	// Methods
-	virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-	virtual PTDB GetTable(PGLOBAL g, MODE m);
+	bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+	PTDB GetTable(PGLOBAL g, MODE m) override;
 	int  ParseURL(PGLOBAL g, char *url, bool b = true);
 	bool SetParms(PJPARM sjp);
 
@@ -60,25 +60,25 @@ public:
   TDBJDBC(PTDBJDBC tdbp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) {return TYPE_AM_JDBC;}
-  virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBJDBC(this);}
+	AMT  GetAmType(void) override {return TYPE_AM_JDBC;}
+  PTDB Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBJDBC(this);}
 
 	// Methods
-  virtual PTDB Clone(PTABS t);
-	virtual bool SetRecpos(PGLOBAL g, int recpos);
-	virtual void ResetSize(void);
-	virtual PCSZ GetServer(void) { return "JDBC"; }
+  PTDB Clone(PTABS t) override;
+	bool SetRecpos(PGLOBAL g, int recpos) override;
+	void ResetSize(void) override;
+	PCSZ GetServer(void) override { return "JDBC"; }
 	virtual int  Indexable(void) { return 2; }
 
 	// Database routines
-	virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-	virtual int  Cardinality(PGLOBAL g);
-	virtual bool OpenDB(PGLOBAL g);
-	virtual int  ReadDB(PGLOBAL g);
-	virtual int  WriteDB(PGLOBAL g);
-	virtual int  DeleteDB(PGLOBAL g, int irc);
-	virtual void CloseDB(PGLOBAL g);
-	virtual bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr);
+	PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+	int  Cardinality(PGLOBAL g) override;
+	bool OpenDB(PGLOBAL g) override;
+	int  ReadDB(PGLOBAL g) override;
+	int  WriteDB(PGLOBAL g) override;
+	int  DeleteDB(PGLOBAL g, int irc) override;
+	void CloseDB(PGLOBAL g) override;
+	bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) override;
 
 protected:
 	// Internal functions
@@ -108,12 +108,12 @@ public:
   JDBCCOL(JDBCCOL *colp, PTDB tdbp); // Constructor used in copy process
 
 	// Implementation
-	virtual int  GetAmType(void) { return TYPE_AM_JDBC; }
+	int  GetAmType(void) override { return TYPE_AM_JDBC; }
 
 	// Methods
 //virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-	virtual void ReadColumn(PGLOBAL g);
-	virtual void WriteColumn(PGLOBAL g);
+	void ReadColumn(PGLOBAL g) override;
+	void WriteColumn(PGLOBAL g) override;
 
 protected:
 	// Constructor for count(*) column
@@ -135,19 +135,19 @@ public:
 	TDBXJDC(PJDBCDEF tdp = NULL);
 
 	// Implementation
-	virtual AMT  GetAmType(void) {return TYPE_AM_XDBC;}
+	AMT  GetAmType(void) override {return TYPE_AM_XDBC;}
 
 	// Methods
 
 	// Database routines
-	virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
+	PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
 	//virtual int  GetProgMax(PGLOBAL g);
-	virtual int  GetMaxSize(PGLOBAL g);
-	virtual bool OpenDB(PGLOBAL g);
-	virtual int  ReadDB(PGLOBAL g);
-	virtual int  WriteDB(PGLOBAL g);
-	virtual int  DeleteDB(PGLOBAL g, int irc);
-	//virtual void CloseDB(PGLOBAL g);
+	int  GetMaxSize(PGLOBAL g) override;
+	bool OpenDB(PGLOBAL g) override;
+	int  ReadDB(PGLOBAL g) override;
+	int  WriteDB(PGLOBAL g) override;
+	int  DeleteDB(PGLOBAL g, int irc) override;
+	//void CloseDB(PGLOBAL g) override;
 
 protected:
 	// Internal functions
@@ -170,11 +170,11 @@ public:
 	JSRCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "JDBC");
 
 	// Implementation
-	virtual int  GetAmType(void) {return TYPE_AM_JDBC;}
+	int  GetAmType(void) override {return TYPE_AM_JDBC;}
 
 	// Methods
-	virtual void ReadColumn(PGLOBAL g);
-	virtual void WriteColumn(PGLOBAL g);
+	void ReadColumn(PGLOBAL g) override;
+	void WriteColumn(PGLOBAL g) override;
 
 protected:
 	// Members
@@ -192,7 +192,7 @@ public:
 
 protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	virtual PQRYRES GetResult(PGLOBAL g) override;
 
 	// Members
 	int      Maxres;            // Returned lines limit
@@ -208,7 +208,7 @@ public:
 
 protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	virtual PQRYRES GetResult(PGLOBAL g) override;
 
 	// Members
 	PCSZ     Schema;            // Points to schema name or NULL
@@ -227,7 +227,7 @@ public:
 
 protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	virtual PQRYRES GetResult(PGLOBAL g) override;
 
 	// Members
 	PCSZ Colpat;            // Points to catalog column pattern
diff --git a/storage/connect/tabjmg.h b/storage/connect/tabjmg.h
index 06c1462d103..6036e73c69f 100644
--- a/storage/connect/tabjmg.h
+++ b/storage/connect/tabjmg.h
@@ -18,9 +18,9 @@ public:
 	JMGDISC(PGLOBAL g, int *lg);
 
 	// Methods
-	virtual bool Init(PGLOBAL g);
-	virtual void GetDoc(void) {}
-	virtual bool Find(PGLOBAL g);
+	bool Init(PGLOBAL g) override;
+	void GetDoc(void) override {}
+	bool Find(PGLOBAL g) override;
 
 protected:
 	// Function
@@ -51,25 +51,25 @@ public:
 	TDBJMG(TDBJMG *tdbp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) { return TYPE_AM_MGO; }
-	virtual PTDB Duplicate(PGLOBAL g) { return (PTDB)new(g) TDBJMG(this); }
+	AMT  GetAmType(void) override { return TYPE_AM_MGO; }
+	PTDB Duplicate(PGLOBAL g) override { return (PTDB)new(g) TDBJMG(this); }
 
 	// Methods
-	virtual PTDB Clone(PTABS t);
-	virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-	virtual PCOL InsertSpecialColumn(PCOL colp);
+	PTDB Clone(PTABS t) override;
+	PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+	PCOL InsertSpecialColumn(PCOL colp) override;
 //virtual void SetFilter(PFIL fp);
-	virtual int  RowNumber(PGLOBAL g, bool b = FALSE) { return N; }
+	int  RowNumber(PGLOBAL g, bool b = FALSE) override { return N; }
 
 	// Database routines
-	virtual int  Cardinality(PGLOBAL g);
-	virtual int  GetMaxSize(PGLOBAL g);
-	virtual bool OpenDB(PGLOBAL g);
-	virtual int  ReadDB(PGLOBAL g);
-	virtual int  WriteDB(PGLOBAL g);
-	virtual int  DeleteDB(PGLOBAL g, int irc);
-	virtual void CloseDB(PGLOBAL g);
-	virtual bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr);
+	int  Cardinality(PGLOBAL g) override;
+	int  GetMaxSize(PGLOBAL g) override;
+	bool OpenDB(PGLOBAL g) override;
+	int  ReadDB(PGLOBAL g) override;
+	int  WriteDB(PGLOBAL g) override;
+	int  DeleteDB(PGLOBAL g, int irc) override;
+	void CloseDB(PGLOBAL g) override;
+	bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) override;
 
 protected:
 	bool Init(PGLOBAL g);
@@ -106,14 +106,14 @@ public:
 	JMGCOL(JMGCOL *colp, PTDB tdbp); // Constructor used in copy process
 
 	// Implementation
-	virtual int   GetAmType(void) {return Tmgp->GetAmType();}
-	virtual bool  Stringify(void) { return Sgfy; }
+	int   GetAmType(void) override {return Tmgp->GetAmType();}
+	bool  Stringify(void) override { return Sgfy; }
 
 	// Methods
 	//virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-	virtual PSZ   GetJpath(PGLOBAL g, bool proj);
-	virtual void  ReadColumn(PGLOBAL g);
-	virtual void  WriteColumn(PGLOBAL g);
+	PSZ   GetJpath(PGLOBAL g, bool proj) override;
+	void  ReadColumn(PGLOBAL g) override;
+	void  WriteColumn(PGLOBAL g) override;
 //bool AddValue(PGLOBAL g, bson_t *doc, char *key, bool upd);
 
 protected:
@@ -138,7 +138,7 @@ public:
 
 protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	virtual PQRYRES GetResult(PGLOBAL g) override;
 
 	// Members
 	PTOS Topt;
diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h
index dcf40620dae..c3328261195 100644
--- a/storage/connect/tabjson.h
+++ b/storage/connect/tabjson.h
@@ -93,11 +93,11 @@ public:
   JSONDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "JSON";}
+  const char *GetType(void) override {return "JSON";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -141,32 +141,32 @@ public:
    TDBJSN(TDBJSN *tdbp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_JSN;}
-  virtual bool  SkipHeader(PGLOBAL g);
-  virtual PTDB  Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBJSN(this);}
+  AMT   GetAmType(void) override {return TYPE_AM_JSN;}
+  bool  SkipHeader(PGLOBAL g) override;
+  PTDB  Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBJSN(this);}
           PJSON GetRow(void) {return Row;}
 					void  SetG(PGLOBAL g) {G = g;}
 
   // Methods
-  virtual PTDB  Clone(PTABS t);
-  virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual PCOL  InsertSpecialColumn(PCOL colp);
-  virtual int   RowNumber(PGLOBAL g, bool b = FALSE)
+  PTDB  Clone(PTABS t) override;
+  PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  PCOL  InsertSpecialColumn(PCOL colp) override;
+  int   RowNumber(PGLOBAL g, bool b = FALSE) override
                  {return (b) ? M : N;}
-	virtual bool  CanBeFiltered(void) 
+	bool  CanBeFiltered(void) override 
 	              {return Txfp->GetAmType() == TYPE_AM_MGO || !Xcol;}
 
   // Database routines
-  //virtual int   Cardinality(PGLOBAL g);
-  //virtual int   GetMaxSize(PGLOBAL g);
-  virtual bool  OpenDB(PGLOBAL g);
-  virtual int   ReadDB(PGLOBAL g);
-	virtual bool  PrepareWriting(PGLOBAL g);
-	virtual int   WriteDB(PGLOBAL g);
-  virtual void  CloseDB(PGLOBAL g);
+  //int   Cardinality(PGLOBAL g) override;
+  //int   GetMaxSize(PGLOBAL g) override;
+  bool  OpenDB(PGLOBAL g) override;
+  int   ReadDB(PGLOBAL g) override;
+	bool  PrepareWriting(PGLOBAL g) override;
+	int   WriteDB(PGLOBAL g) override;
+  void  CloseDB(PGLOBAL g) override;
 
 	// Specific routine
-	virtual int   EstimatedLength(void);
+	int   EstimatedLength(void) override;
 
 protected:
           PJSON FindRow(PGLOBAL g);
@@ -216,15 +216,15 @@ public:
   JSONCOL(JSONCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int   GetAmType(void) {return Tjp->GetAmType();}
-  virtual bool  Stringify(void) { return Sgfy; }
+  int   GetAmType(void) override {return Tjp->GetAmType();}
+  bool  Stringify(void) override { return Sgfy; }
 
   // Methods
-  virtual bool  SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
+  bool  SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
           bool  ParseJpath(PGLOBAL g);
-	virtual PSZ   GetJpath(PGLOBAL g, bool proj);
-	virtual void  ReadColumn(PGLOBAL g);
-  virtual void  WriteColumn(PGLOBAL g);
+	PSZ   GetJpath(PGLOBAL g, bool proj) override;
+	void  ReadColumn(PGLOBAL g) override;
+  void  WriteColumn(PGLOBAL g) override;
 
  protected:
   bool  CheckExpand(PGLOBAL g, int i, PSZ nm, bool b);
@@ -269,30 +269,30 @@ class DllExport TDBJSON : public TDBJSN {
    TDBJSON(PJTDB tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_JSON;}
-  virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBJSON(this);}
+  AMT  GetAmType(void) override {return TYPE_AM_JSON;}
+  PTDB Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBJSON(this);}
           PJAR GetDoc(void) {return Doc;} 
 
   // Methods
-  virtual PTDB Clone(PTABS t);
+  PTDB Clone(PTABS t) override;
 
   // Database routines
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual void ResetSize(void);
-  virtual int  GetProgCur(void) {return N;}
-	virtual int  GetRecpos(void);
-  virtual bool SetRecpos(PGLOBAL g, int recpos);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual bool PrepareWriting(PGLOBAL g) {return false;}
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
+  int  Cardinality(PGLOBAL g) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  void ResetSize(void) override;
+  int  GetProgCur(void) override {return N;}
+	int  GetRecpos(void) override;
+  bool SetRecpos(PGLOBAL g, int recpos) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  bool PrepareWriting(PGLOBAL g) override {return false;}
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
           int  MakeDocument(PGLOBAL g);
 
   // Optimization routines
-  virtual int  MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add);
+  int  MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add) override;
 
  protected:
           int  MakeNewDoc(PGLOBAL g);
@@ -314,7 +314,7 @@ class DllExport TDBJCL : public TDBCAT {
 
  protected:
   // Specific routines
-  virtual PQRYRES GetResult(PGLOBAL g);
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   PTOS Topt;
diff --git a/storage/connect/tabmac.h b/storage/connect/tabmac.h
index 68135edb95f..8ff8fad47bb 100644
--- a/storage/connect/tabmac.h
+++ b/storage/connect/tabmac.h
@@ -48,23 +48,23 @@ class TDBMAC : public TDBASE {
 //TDBMAC(PGLOBAL g, PTDBMAC tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_MAC;}
-//virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBMAC(g, this);}
+  AMT  GetAmType(void) override {return TYPE_AM_MAC;}
+// PTDB Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBMAC(g, this);}
 
   // Methods
-//virtual PTDB Clone(PTABS t);
+//PTDB Clone(PTABS t) override;
   virtual int GetRecpos(void) {return N;}
-  virtual int RowNumber(PGLOBAL g, bool b = false) {return N;}
+  int RowNumber(PGLOBAL g, bool b = false) override {return N;}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  Cardinality(PGLOBAL g) {return GetMaxSize(g);}
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g) {}
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  Cardinality(PGLOBAL g) override {return GetMaxSize(g);}
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override {}
 
  protected:
   // Specific routines
@@ -94,10 +94,10 @@ class MACCOL : public COLBLK {
 //MACCOL(MACCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_MAC;}
+  int  GetAmType(void) override {return TYPE_AM_MAC;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   MACCOL(void) {}              // Default constructor not to be used
diff --git a/storage/connect/tabmul.h b/storage/connect/tabmul.h
index a01e4e7fdf2..e1c42b46658 100644
--- a/storage/connect/tabmul.h
+++ b/storage/connect/tabmul.h
@@ -32,31 +32,31 @@ class DllExport TDBMUL : public TDBASE {
   TDBMUL(PTDBMUL tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return Tdbp->GetAmType();}
-  virtual PTDB Duplicate(PGLOBAL g);
+  AMT  GetAmType(void) override {return Tdbp->GetAmType();}
+  PTDB Duplicate(PGLOBAL g) override;
 
   // Methods
-  virtual void ResetDB(void);
-  virtual PTDB Clone(PTABS t);
-  virtual bool IsSame(PTDB tp) {return tp == (PTDB)Tdbp;}
-  virtual PCSZ GetFile(PGLOBAL g) {return Tdbp->GetFile(g);}
-  virtual int  GetRecpos(void) {return 0;}
-  virtual PCOL ColDB(PGLOBAL g, PSZ name, int num);
+  void ResetDB(void) override;
+  PTDB Clone(PTABS t) override;
+  bool IsSame(PTDB tp) override {return tp == (PTDB)Tdbp;}
+  PCSZ GetFile(PGLOBAL g) override {return Tdbp->GetFile(g);}
+  int  GetRecpos(void) override {return 0;}
+  PCOL ColDB(PGLOBAL g, PSZ name, int num) override;
           bool InitFileNames(PGLOBAL g);
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n)
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override
                 {strcpy(g->Message, MSG(MUL_MAKECOL_ERR)); return NULL;}
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual int  GetProgMax(PGLOBAL g);
-  virtual int  GetProgCur(void);
-  virtual int  RowNumber(PGLOBAL g, bool b = false);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
+  int  Cardinality(PGLOBAL g) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  int  GetProgMax(PGLOBAL g) override;
+  int  GetProgCur(void) override;
+  int  RowNumber(PGLOBAL g, bool b = false) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
 
  protected:
 
@@ -83,10 +83,10 @@ public:
 	TDBMSD(PTDBMSD tdbp) : TDBMUL(tdbp) {}
 
 	// Implementation
-	virtual PTDB Duplicate(PGLOBAL g);
+	PTDB Duplicate(PGLOBAL g);
 
 	// Methods
-	virtual PTDB Clone(PTABS t);
+	PTDB Clone(PTABS t) override;
 	bool InitFileNames(PGLOBAL g);
 
 	// Database routines
@@ -108,11 +108,11 @@ class DllExport DIRDEF : public TABDEF {    /* Directory listing table */
   DIRDEF(void) {Fn = NULL; Incl = false; Huge = false;}
 
   // Implementation
-  virtual const char *GetType(void) {return "DIR";}
+  const char *GetType(void) override {return "DIR";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -137,21 +137,21 @@ public:
 	TDBDIR(PSZ fpat);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_DIR;}
+  AMT  GetAmType(void) override {return TYPE_AM_DIR;}
 
   // Methods
-  virtual int GetRecpos(void) {return iFile;}
+  int GetRecpos(void) override {return iFile;}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual int  GetProgMax(PGLOBAL g) {return GetMaxSize(g);}
-  virtual int  GetProgCur(void) {return iFile;}
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  int  GetProgMax(PGLOBAL g) override {return GetMaxSize(g);}
+  int  GetProgCur(void) override {return iFile;}
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
 
  protected:
 	void Init(void);
@@ -195,11 +195,11 @@ class TDBSDR : public TDBDIR {
 	TDBSDR(PSZ fpat) : TDBDIR(fpat) {Sub = NULL;}
 
   // Database routines
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual int  GetProgMax(PGLOBAL g) {return GetMaxSize(g);}
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-//virtual void CloseDB(PGLOBAL g);
+  int  GetMaxSize(PGLOBAL g) override;
+  int  GetProgMax(PGLOBAL g) override {return GetMaxSize(g);}
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+//void CloseDB(PGLOBAL g) override;
 
  protected:
           int  FindInDir(PGLOBAL g);
@@ -230,10 +230,10 @@ class DIRCOL : public COLBLK {
   DIRCOL(DIRCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int    GetAmType(void) {return TYPE_AM_DIR;}
+  int    GetAmType(void) override {return TYPE_AM_DIR;}
 
   // Methods
-  virtual void   ReadColumn(PGLOBAL g);
+  void   ReadColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
diff --git a/storage/connect/tabmysql.h b/storage/connect/tabmysql.h
index b5af77de50b..7f77eeabcbb 100644
--- a/storage/connect/tabmysql.h
+++ b/storage/connect/tabmysql.h
@@ -28,7 +28,7 @@ class MYSQLDEF : public EXTDEF           {/* Logical table description */
   MYSQLDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "MYSQL";}
+  const char *GetType(void) override {return "MYSQL";}
   inline  PSZ  GetHostname(void) {return Hostname;};
 //inline  PSZ  GetDatabase(void) {return Tabschema;};
 //inline  PSZ  GetTabname(void) {return Tabname;}
@@ -39,8 +39,8 @@ class MYSQLDEF : public EXTDEF           {/* Logical table description */
 
   // Methods
 //virtual int  Indexable(void) {return 2;}
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
           bool ParseURL(PGLOBAL g, char *url, bool b = true);
           bool GetServerInfo(PGLOBAL g, const char *server_name);
 
@@ -77,30 +77,30 @@ class TDBMYSQL : public TDBEXT {
   TDBMYSQL(PTDBMY tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_MYSQL;}
-  virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBMYSQL(this);}
+  AMT  GetAmType(void) override {return TYPE_AM_MYSQL;}
+  PTDB Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBMYSQL(this);}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
+  PTDB Clone(PTABS t) override;
 //virtual int  GetAffectedRows(void) {return AftRows;}
-  virtual int  GetRecpos(void) {return N;}
-  virtual int  GetProgMax(PGLOBAL g);
-  virtual void ResetDB(void) {N = 0;}
-  virtual int  RowNumber(PGLOBAL g, bool b = false);
-  virtual bool IsView(void) {return Isview;}
-  virtual PCSZ GetServer(void) {return Server;}
+  int  GetRecpos(void) override {return N;}
+  int  GetProgMax(PGLOBAL g) override;
+  void ResetDB(void) override {N = 0;}
+  int  RowNumber(PGLOBAL g, bool b = false) override;
+  bool IsView(void) override {return Isview;}
+  PCSZ GetServer(void) override {return Server;}
           void SetDatabase(LPCSTR db) {Schema = (char*)db;}
 
   // Schema routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  Cardinality(PGLOBAL g);
-//virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
-  virtual bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  Cardinality(PGLOBAL g) override;
+//int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
+  bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) override;
 
   // Specific routines
           bool SetColumnRanks(PGLOBAL g);
@@ -112,7 +112,7 @@ class TDBMYSQL : public TDBEXT {
   bool MakeSelect(PGLOBAL g, bool mx);
   bool MakeInsert(PGLOBAL g);
   int  BindColumns(PGLOBAL g __attribute__((unused)));
-  virtual bool MakeCommand(PGLOBAL g);
+  bool MakeCommand(PGLOBAL g) override;
 //int  MakeUpdate(PGLOBAL g);  
 //int  MakeDelete(PGLOBAL g);
   int  SendCommand(PGLOBAL g);
@@ -154,13 +154,13 @@ class MYSQLCOL : public COLBLK {
   MYSQLCOL(MYSQLCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_MYSQL;}
+  int  GetAmType(void) override {return TYPE_AM_MYSQL;}
           void InitBind(PGLOBAL g);
 
   // Methods
-  virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
           bool FindRank(PGLOBAL g);
 
  protected:
@@ -182,19 +182,19 @@ class TDBMYEXC : public TDBMYSQL {
   TDBMYEXC(PTDBMYX tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_MYX;}
-  virtual PTDB Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBMYEXC(this);}
+  AMT  GetAmType(void) override {return TYPE_AM_MYX;}
+  PTDB Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBMYEXC(this);}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
-  virtual bool IsView(void) {return Isview;}
+  PTDB Clone(PTABS t) override;
+  bool IsView(void) override {return Isview;}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
 
  protected:
   // Internal functions
@@ -223,8 +223,8 @@ class MYXCOL : public MYSQLCOL {
   MYXCOL(MYXCOL *colp, PTDB tdbp);   // Constructor used in copy process
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
 
  protected:
   // Members
@@ -242,7 +242,7 @@ class TDBMCL : public TDBCAT {
 
  protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   PCSZ Host;                      // Host machine to use            
diff --git a/storage/connect/taboccur.h b/storage/connect/taboccur.h
index 8cd507acb7d..6f3a809174e 100644
--- a/storage/connect/taboccur.h
+++ b/storage/connect/taboccur.h
@@ -26,11 +26,11 @@ class OCCURDEF : public PRXDEF {          /* Logical table description */
 	OCCURDEF(void) {Pseudo = 3; Colist = Xcol = NULL;}
 
   // Implementation
-  virtual const char *GetType(void) {return "OCCUR";}
+  const char *GetType(void) override {return "OCCUR";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -50,21 +50,21 @@ class TDBOCCUR : public TDBPRX {
   TDBOCCUR(POCCURDEF tdp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_OCCUR;}
+  AMT  GetAmType(void) override {return TYPE_AM_OCCUR;}
   				void SetTdbp(PTDBASE tdbp) {Tdbp = tdbp;}
 
   // Methods
-	virtual void ResetDB(void) {N = 0; Tdbp->ResetDB();}
-	virtual int  RowNumber(PGLOBAL g, bool b = FALSE);
+	void ResetDB(void) override {N = 0; Tdbp->ResetDB();}
+	int  RowNumber(PGLOBAL g, bool b = FALSE) override;
 					bool MakeColumnList(PGLOBAL g);
           bool ViewColumnList(PGLOBAL g);
 
   // Database routines
-	virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual bool InitTable(PGLOBAL g);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
+	PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  bool InitTable(PGLOBAL g) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
 
  protected:
   // Members
@@ -89,12 +89,12 @@ class OCCURCOL : public COLBLK {
   OCCURCOL(PCOLDEF cdp, PTDBOCCUR tdbp, int n);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_OCCUR;}
+  int  GetAmType(void) override {return TYPE_AM_OCCUR;}
 					int  GetI(void) {return I;}
 
   // Methods
-  virtual void Reset(void) {}		// Evaluated only by TDBOCCUR
-  virtual void ReadColumn(PGLOBAL g);
+  void Reset(void) override {}		// Evaluated only by TDBOCCUR
+  void ReadColumn(PGLOBAL g) override;
 					void Xreset(void) {I = 0;};
 
  protected:
@@ -114,10 +114,10 @@ class RANKCOL : public COLBLK {
 	RANKCOL(PCOLDEF cdp, PTDBOCCUR tdbp, int n) : COLBLK(cdp, tdbp, n) {}
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_OCCUR;}
+  int  GetAmType(void) override {return TYPE_AM_OCCUR;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
diff --git a/storage/connect/tabodbc.h b/storage/connect/tabodbc.h
index cedcf0f5f77..e196de8b4df 100644
--- a/storage/connect/tabodbc.h
+++ b/storage/connect/tabodbc.h
@@ -31,14 +31,14 @@ public:
   ODBCDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "ODBC";}
+  const char *GetType(void) override {return "ODBC";}
   PSZ  GetConnect(void) {return Connect;}
   int  GetCatver(void) {return Catver;}
 
   // Methods
-	virtual int  Indexable(void) {return 2;}
-	virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  int  Indexable(void) override {return 2;}
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -63,28 +63,28 @@ class TDBODBC : public TDBEXT {
   TDBODBC(PTDBODBC tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_ODBC;}
-  virtual PTDB Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_ODBC;}
+  PTDB Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBODBC(this);}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
-  virtual bool SetRecpos(PGLOBAL g, int recpos);
-  virtual PCSZ GetFile(PGLOBAL g);
-  virtual void SetFile(PGLOBAL g, PCSZ fn);
-  virtual void ResetSize(void);
-  virtual PCSZ GetServer(void) {return "ODBC";}
+  PTDB Clone(PTABS t) override;
+  bool SetRecpos(PGLOBAL g, int recpos) override;
+  PCSZ GetFile(PGLOBAL g) override;
+  void SetFile(PGLOBAL g, PCSZ fn) override;
+  void ResetSize(void) override;
+  PCSZ GetServer(void) override {return "ODBC";}
   virtual int  Indexable(void) {return 2;}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  Cardinality(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
-	virtual bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  Cardinality(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
+  bool ReadKey(PGLOBAL g, OPVAL op, const key_range *kr) override;
 
  protected:
   // Internal functions
@@ -109,16 +109,16 @@ class ODBCCOL : public EXTCOL {
  public:
   // Constructors
   ODBCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "ODBC");
-  ODBCCOL(ODBCCOL *colp, PTDB tdbp); // Constructor used in copy process
+  ODBCCOL(ODBCCOL *colp, PTDB tdbp); // Constructor used in opy process
 
   // Implementation
-  virtual int     GetAmType(void) {return TYPE_AM_ODBC;}
-          SQLLEN *GetStrLen(void) {return StrLen;}
+  int     GetAmType(void) override {return TYPE_AM_ODBC;}
+  SQLLEN *GetStrLen(void) {return StrLen;}
 
   // Methods
 //virtual bool   SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void   ReadColumn(PGLOBAL g);
-  virtual void   WriteColumn(PGLOBAL g);
+  void   ReadColumn(PGLOBAL g) override;
+  void   WriteColumn(PGLOBAL g) override;
           void   AllocateBuffers(PGLOBAL g, int rows);
           void  *GetBuffer(DWORD rows);
           SWORD  GetBuflen(void);
@@ -146,20 +146,20 @@ class TDBXDBC : public TDBODBC {
   TDBXDBC(PTDBXDBC tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_XDBC;}
-  virtual PTDB Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_XDBC;}
+  PTDB Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBXDBC(this);}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
+  PTDB Clone(PTABS t) override;
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
 
  protected:
   // Internal functions
@@ -185,8 +185,8 @@ class XSRCCOL : public ODBCCOL {
   // Implementation
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
 
  protected:
   // Members
@@ -203,8 +203,8 @@ class TDBDRV : public TDBCAT {
   TDBDRV(PODEF tdp) : TDBCAT(tdp) {Maxres = tdp->Maxres;}
 
  protected:
-	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+  // Specific routines
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   int      Maxres;            // Returned lines limit
@@ -219,8 +219,8 @@ class TDBSRC : public TDBDRV {
   TDBSRC(PODEF tdp) : TDBDRV(tdp) {}
 
  protected:
-	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+  // Specific routines
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // No additional Members
   }; // end of class TDBSRC
@@ -234,8 +234,8 @@ class TDBOTB : public TDBDRV {
   TDBOTB(PODEF tdp);
 
  protected:
-	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+  // Specific routines
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
 	PCSZ     Dsn;               // Points to connection string
@@ -254,8 +254,8 @@ class TDBOCL : public TDBOTB {
 	 TDBOCL(PODEF tdp);
 
  protected:
-	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+  // Specific routines
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
 	char    *Colpat;						// Points to column pattern
diff --git a/storage/connect/tabpivot.h b/storage/connect/tabpivot.h
index 0a37804ff87..71964d74972 100644
--- a/storage/connect/tabpivot.h
+++ b/storage/connect/tabpivot.h
@@ -27,7 +27,7 @@ class PIVAID : public CSORT {
   bool    SkipColumn(PCOLRES crp, char *skc);
 
   // The sorting function
-  virtual int  Qcompare(int *, int *);
+  int  Qcompare(int *, int *) override;
 
  protected:
   // Members
@@ -64,11 +64,11 @@ class PIVOTDEF : public PRXDEF {          /* Logical table description */
   PIVOTDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "PIVOT";}
+  const char *GetType(void) override {return "PIVOT";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -96,22 +96,22 @@ class TDBPIVOT : public TDBPRX {
   TDBPIVOT(PPIVOTDEF tdp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_PIVOT;}
+  AMT  GetAmType(void) override {return TYPE_AM_PIVOT;}
 
   // Methods
-  virtual int  GetRecpos(void) {return N;}
-  virtual void ResetDB(void) {N = 0;}
-  virtual int  RowNumber(PGLOBAL g, bool b = FALSE);
+  int  GetRecpos(void) override {return N;}
+  void ResetDB(void) override {N = 0;}
+  int  RowNumber(PGLOBAL g, bool b = FALSE) override;
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  Cardinality(PGLOBAL g) {return (g) ? 10 : 0;}
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  Cardinality(PGLOBAL g) override {return (g) ? 10 : 0;}
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
 
  protected:
   // Internal routines
@@ -154,10 +154,10 @@ class FNCCOL : public COLBLK {
   FNCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_FNC;}
+  int  GetAmType(void) override {return TYPE_AM_FNC;}
 
   // Methods
-  virtual void Reset(void) {}
+  void Reset(void) override {}
           bool InitColumn(PGLOBAL g);
           bool CompareColumn(void);
 
@@ -177,13 +177,13 @@ class SRCCOL : public PRXCOL {
   SRCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int n);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_SRC;}
+  int  GetAmType(void) override {return TYPE_AM_SRC;}
 
   // Methods
   using PRXCOL::Init;
-  virtual void Reset(void) {}
+  void Reset(void) override {}
           void SetColumn(void);
-  virtual bool Init(PGLOBAL g, PTDB tp);
+  bool Init(PGLOBAL g, PTDB tp) override;
           bool CompareLast(void);
 
  protected:
diff --git a/storage/connect/tabrest.h b/storage/connect/tabrest.h
index 901d9102e95..a04117ca82d 100644
--- a/storage/connect/tabrest.h
+++ b/storage/connect/tabrest.h
@@ -33,11 +33,11 @@ public:
 	RESTDEF(void) { Tdp = NULL; Http = Uri = Fn = NULL; }
 
 	// Implementation
-	virtual const char *GetType(void) { return "REST"; }
+	const char *GetType(void) override { return "REST"; }
 
 	// Methods
-	virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-	virtual PTDB GetTable(PGLOBAL g, MODE m);
+	bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+	PTDB GetTable(PGLOBAL g, MODE m) override;
 
 protected:
 	// Members
diff --git a/storage/connect/tabsys.h b/storage/connect/tabsys.h
index 0a427b12dae..58f0b5677ec 100644
--- a/storage/connect/tabsys.h
+++ b/storage/connect/tabsys.h
@@ -27,11 +27,11 @@ class DllExport INIDEF : public TABDEF {      /* INI table description */
   INIDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "INI";}
+  const char *GetType(void) override {return "INI";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -53,30 +53,30 @@ class TDBINI : public TDBASE {
   TDBINI(PTDBINI tdbp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_INI;}
-  virtual PTDB  Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBINI(this);}
+  AMT   GetAmType(void) override {return TYPE_AM_INI;}
+  PTDB  Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBINI(this);}
 
   // Methods
-  virtual PTDB  Clone(PTABS t);
-  virtual int   GetRecpos(void) {return N;}
-  virtual int   GetProgCur(void) {return N;}
+  PTDB  Clone(PTABS t) override;
+  int   GetRecpos(void) override {return N;}
+  int   GetProgCur(void) override {return N;}
 //virtual int   GetAffectedRows(void) {return 0;}
-  virtual PCSZ  GetFile(PGLOBAL g) {return Ifile;}
-  virtual void  SetFile(PGLOBAL g, PCSZ fn) {Ifile = fn;}
-  virtual void  ResetDB(void) {Seclist = Section = NULL; N = 0;}
-  virtual void  ResetSize(void) {MaxSize = -1; Seclist = NULL;}
-  virtual int   RowNumber(PGLOBAL g, bool b = false) {return N;}
+  PCSZ  GetFile(PGLOBAL g) override {return Ifile;}
+  void  SetFile(PGLOBAL g, PCSZ fn) override {Ifile = fn;}
+  void  ResetDB(void) override {Seclist = Section = NULL; N = 0;}
+  void  ResetSize(void) override {MaxSize = -1; Seclist = NULL;}
+  int   RowNumber(PGLOBAL g, bool b = false) override {return N;}
           char *GetSeclist(PGLOBAL g);
 
   // Database routines
-  virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int   Cardinality(PGLOBAL g);
-  virtual int   GetMaxSize(PGLOBAL g);
-  virtual bool  OpenDB(PGLOBAL g);
-  virtual int   ReadDB(PGLOBAL g);
-  virtual int   WriteDB(PGLOBAL g);
-  virtual int   DeleteDB(PGLOBAL g, int irc);
-  virtual void  CloseDB(PGLOBAL g);
+  PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int   Cardinality(PGLOBAL g) override;
+  int   GetMaxSize(PGLOBAL g) override;
+  bool  OpenDB(PGLOBAL g) override;
+  int   ReadDB(PGLOBAL g) override;
+  int   WriteDB(PGLOBAL g) override;
+  int   DeleteDB(PGLOBAL g, int irc) override;
+  void  CloseDB(PGLOBAL g) override;
 
  protected:
   // Members
@@ -97,13 +97,13 @@ class INICOL : public COLBLK {
   INICOL(INICOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_INI;}
-  virtual void SetTo_Val(PVAL valp) {To_Val = valp;}
+  int  GetAmType(void) override {return TYPE_AM_INI;}
+  void SetTo_Val(PVAL valp) override {To_Val = valp;}
 
   // Methods
-  virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
   virtual void AllocBuf(PGLOBAL g);
 
  protected:
@@ -132,24 +132,24 @@ class TDBXIN : public TDBINI {
   TDBXIN(PTDBXIN tdbp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_INI;}
-  virtual PTDB  Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBXIN(this);}
+  AMT   GetAmType(void) override {return TYPE_AM_INI;}
+  PTDB  Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBXIN(this);}
 
   // Methods
-  virtual PTDB  Clone(PTABS t);
-  virtual int   GetRecpos(void);
-  virtual bool  SetRecpos(PGLOBAL g, int recpos);
-  virtual void  ResetDB(void)
+  PTDB  Clone(PTABS t) override;
+  int   GetRecpos(void) override;
+  bool  SetRecpos(PGLOBAL g, int recpos) override;
+  void  ResetDB(void) override
                 {Seclist = Section = Keycur = NULL; N = 0; Oldsec = -1;}
           char *GetKeylist(PGLOBAL g, char *sec);
 
   // Database routines
-  virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int   Cardinality(PGLOBAL g);
-  virtual bool  OpenDB(PGLOBAL g);
-  virtual int   ReadDB(PGLOBAL g);
-  virtual int   WriteDB(PGLOBAL g);
-  virtual int   DeleteDB(PGLOBAL g, int irc);
+  PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int   Cardinality(PGLOBAL g) override;
+  bool  OpenDB(PGLOBAL g) override;
+  int   ReadDB(PGLOBAL g) override;
+  int   WriteDB(PGLOBAL g) override;
+  int   DeleteDB(PGLOBAL g, int irc) override;
 
  protected:
   // Members
@@ -171,8 +171,8 @@ class XINCOL : public INICOL {
   // Implementation
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
diff --git a/storage/connect/tabtbl.h b/storage/connect/tabtbl.h
index e7a84395787..6e6c8cb438e 100644
--- a/storage/connect/tabtbl.h
+++ b/storage/connect/tabtbl.h
@@ -24,11 +24,11 @@ class DllExport TBLDEF : public PRXDEF {  /* Logical table description */
   TBLDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "TBL";}
+  const char *GetType(void) override {return "TBL";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -48,21 +48,21 @@ class DllExport TDBTBL : public TDBPRX {
   TDBTBL(PTBLDEF tdp = NULL);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_TBL;}
+  AMT  GetAmType(void) override {return TYPE_AM_TBL;}
 
   // Methods
-  virtual void ResetDB(void);
-  virtual int  GetRecpos(void) {return Rows;}
-  virtual int  GetBadLines(void) {return (int)Nbc;}
+  void ResetDB(void) override;
+  int  GetRecpos(void) override {return Rows;}
+  int  GetBadLines(void) override {return (int)Nbc;}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  Cardinality(PGLOBAL g);
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual int  RowNumber(PGLOBAL g, bool b = FALSE);
-  virtual PCOL InsertSpecialColumn(PCOL scp);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  Cardinality(PGLOBAL g) override;
+  int  GetMaxSize(PGLOBAL g) override;
+  int  RowNumber(PGLOBAL g, bool b = FALSE) override;
+  PCOL InsertSpecialColumn(PCOL scp) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
 
  protected:
   // Internal functions
@@ -89,7 +89,7 @@ class TBTBLK : public TIDBLK {
   TBTBLK(PVAL valp) {Value = valp;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
 
   // Fake operator new used to change TIDBLK into SDTBLK
   void * operator new(size_t size, TIDBLK *sp) {return sp;}
@@ -143,11 +143,11 @@ class DllExport TDBTBM : public TDBTBL {
   virtual void ResetDB(void);
 
   // Database routines
-	virtual int  Cardinality(PGLOBAL g) { return 10; }
-	virtual int  GetMaxSize(PGLOBAL g) { return 10; } // Temporary
-  virtual int  RowNumber(PGLOBAL g, bool b = FALSE);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
+	int  Cardinality(PGLOBAL g) override { return 10; }
+	int  GetMaxSize(PGLOBAL g) override { return 10; } // Temporary
+  int  RowNumber(PGLOBAL g, bool b = FALSE) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
 
  protected:
   // Internal functions
diff --git a/storage/connect/tabutil.h b/storage/connect/tabutil.h
index 6cf2b11632b..fc0cef8d6e1 100644
--- a/storage/connect/tabutil.h
+++ b/storage/connect/tabutil.h
@@ -40,11 +40,11 @@ class DllExport PRXDEF : public TABDEF {  /* Logical table description */
 	 PRXDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "PRX";}
+  const char *GetType(void) override {return "PRX";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE mode);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE mode) override;
 
  protected:
   // Members
@@ -63,27 +63,27 @@ class DllExport TDBPRX : public TDBASE {
   TDBPRX(PTDBPRX tdbp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_PRX;}
-  virtual PTDB  Duplicate(PGLOBAL g)
+  AMT   GetAmType(void) override {return TYPE_AM_PRX;}
+  PTDB  Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBPRX(this);}
 
   // Methods
-  virtual PTDB  Clone(PTABS t);
-  virtual int   GetRecpos(void) {return Tdbp->GetRecpos();}
-	virtual void  ResetDB(void) {Tdbp->ResetDB();}
-	virtual int   RowNumber(PGLOBAL g, bool b = FALSE);
-  virtual PCSZ  GetServer(void) {return (Tdbp) ? Tdbp->GetServer() : (PSZ)"?";}
+  PTDB  Clone(PTABS t) override;
+  int   GetRecpos(void) override {return Tdbp->GetRecpos();}
+	void  ResetDB(void) override {Tdbp->ResetDB();}
+	int   RowNumber(PGLOBAL g, bool b = FALSE) override;
+  PCSZ  GetServer(void) override {return (Tdbp) ? Tdbp->GetServer() : (PSZ)"?";}
 
   // Database routines
-	virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
+	PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
   virtual bool  InitTable(PGLOBAL g);
-  virtual int   Cardinality(PGLOBAL g);
-  virtual int   GetMaxSize(PGLOBAL g);
-  virtual bool  OpenDB(PGLOBAL g);
-  virtual int   ReadDB(PGLOBAL g);
-  virtual int   WriteDB(PGLOBAL g);
-  virtual int   DeleteDB(PGLOBAL g, int irc);
-  virtual void  CloseDB(PGLOBAL g) {if (Tdbp) Tdbp->CloseDB(g);}
+  int   Cardinality(PGLOBAL g) override;
+  int   GetMaxSize(PGLOBAL g) override;
+  bool  OpenDB(PGLOBAL g) override;
+  int   ReadDB(PGLOBAL g) override;
+  int   WriteDB(PGLOBAL g) override;
+  int   DeleteDB(PGLOBAL g, int irc) override;
+  void  CloseDB(PGLOBAL g) override {if (Tdbp) Tdbp->CloseDB(g);}
           PTDB  GetSubTable(PGLOBAL g, PTABLE tabp, bool b = false);
           void  RemoveNext(PTABLE tp);
 
@@ -106,16 +106,16 @@ class DllExport PRXCOL : public COLBLK {
   PRXCOL(PRXCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_PRX;}
+  int  GetAmType(void) override {return TYPE_AM_PRX;}
 
   // Methods
   using COLBLK::Init;
-  virtual void Reset(void);
-  virtual bool IsSpecial(void) {return Pseudo;}
-  virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
+  void Reset(void) override;
+  bool IsSpecial(void) override {return Pseudo;}
+  bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override
                 {return false;}
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
   virtual bool Init(PGLOBAL g, PTDB tp);
 
  protected:
@@ -141,7 +141,7 @@ class TDBTBC : public TDBCAT {
 
  protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   PSZ     Db;                    // Database of the table  
diff --git a/storage/connect/tabvct.h b/storage/connect/tabvct.h
index 06ccde71bcb..cd16c16d5e5 100644
--- a/storage/connect/tabvct.h
+++ b/storage/connect/tabvct.h
@@ -29,12 +29,12 @@ class DllExport VCTDEF : public DOSDEF {  /* Logical table description */
   VCTDEF(void) {Split = false; Estimate = Header = 0;}
 
   // Implementation
-  virtual const char *GetType(void) {return "VCT";}
+  const char *GetType(void) override {return "VCT";}
   int  GetEstimate(void) {return Estimate;}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE mode);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE mode) override;
 
  protected:
           int  MakeFnPattern(char *fpat);
@@ -62,20 +62,20 @@ class DllExport TDBVCT : public TDBFIX {
   TDBVCT(PGLOBAL g, PTDBVCT tdbp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_VCT;}
-  virtual PTDB Duplicate(PGLOBAL g)
+  AMT  GetAmType(void) override {return TYPE_AM_VCT;}
+  PTDB Duplicate(PGLOBAL g) override
                 {return (PTDB)new(g) TDBVCT(g, this);}
           bool IsSplit(void) {return ((VCTDEF*)To_Def)->Split;}
 
   // Methods
-  virtual PTDB Clone(PTABS t);
-  virtual bool IsUsingTemp(PGLOBAL g);
+  PTDB Clone(PTABS t) override;
+  bool IsUsingTemp(PGLOBAL g) override;
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual void CloseDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  void CloseDB(PGLOBAL g) override;
 
  protected:
   // Members
@@ -98,13 +98,13 @@ class DllExport VCTCOL : public DOSCOL {
   VCTCOL(VCTCOL *colp, PTDB tdbp); // Constructor used in copy process
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_VCT;}
+  int  GetAmType(void) override {return TYPE_AM_VCT;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
-  virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void SetOk(void);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
+  bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
+  void SetOk(void) override;
 
  protected:
   virtual void ReadBlock(PGLOBAL g);
diff --git a/storage/connect/tabvir.h b/storage/connect/tabvir.h
index b92ca0c50f8..31bbed27c63 100644
--- a/storage/connect/tabvir.h
+++ b/storage/connect/tabvir.h
@@ -24,12 +24,12 @@ class DllExport VIRDEF : public TABDEF {  /* Logical table description */
 	VIRDEF(void) = default;
 
   // Implementation
-  virtual const char *GetType(void) {return "VIRTUAL";}
+  const char *GetType(void) override {return "VIRTUAL";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL, LPCSTR, int) {Pseudo = 3; return false;}
-  virtual int  Indexable(void) {return 3;}
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL, LPCSTR, int) override {Pseudo = 3; return false;}
+  int  Indexable(void) override {return 3;}
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -44,24 +44,24 @@ class DllExport TDBVIR : public TDBASE {
 	TDBVIR(PVIRDEF tdp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_VIR;}
+  AMT  GetAmType(void) override {return TYPE_AM_VIR;}
 
   // Methods
-  virtual int  GetRecpos(void) {return N;}
-  virtual bool SetRecpos(PGLOBAL g, int recpos)
+  int  GetRecpos(void) override {return N;}
+  bool SetRecpos(PGLOBAL g, int recpos) override
                {N = recpos - 2; return false;}
-	virtual int  RowNumber(PGLOBAL g, bool b = false) {return N + 1;}
+	int  RowNumber(PGLOBAL g, bool b = false) override {return N + 1;}
           int  TestFilter(PFIL filp, bool nop);
 
   // Database routines
-	virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  Cardinality(PGLOBAL g) {return (g) ? Size : 1;}
-  virtual int  GetMaxSize(PGLOBAL g) {return Size;}
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-	virtual void CloseDB(PGLOBAL g) {}
+	PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  Cardinality(PGLOBAL g) override {return (g) ? Size : 1;}
+  int  GetMaxSize(PGLOBAL g) override {return Size;}
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+	void CloseDB(PGLOBAL g) override {}
 
  protected:
   // Members
@@ -79,10 +79,10 @@ class VIRCOL : public COLBLK {
   VIRCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "VIRTUAL");
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_VIR;}
+  int  GetAmType(void) override {return TYPE_AM_VIR;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   // Default constructor not to be used
@@ -100,11 +100,11 @@ class TDBVICL : public TDBCAT {
   TDBVICL(PVIRDEF tdp) : TDBCAT(tdp) {}
 
   // Methods
-  virtual int  Cardinality(PGLOBAL g) {return 2;} // Avoid DBUG_ASSERT
+  int  Cardinality(PGLOBAL g) override {return 2;} // Avoid DBUG_ASSERT
 
  protected:
 	// Specific routines
-	virtual PQRYRES GetResult(PGLOBAL g);
+	PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   }; // end of class TDBVICL
diff --git a/storage/connect/tabwmi.h b/storage/connect/tabwmi.h
index 7a18453374e..a43e5c9ff52 100644
--- a/storage/connect/tabwmi.h
+++ b/storage/connect/tabwmi.h
@@ -66,22 +66,22 @@ class TDBWMI : public TDBASE {
   TDBWMI(PWMIDEF tdp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_WMI;}
+  AMT  GetAmType(void) override {return TYPE_AM_WMI;}
 
   // Methods
   virtual int GetRecpos(void);
   virtual int GetProgCur(void) {return N;}
-  virtual int RowNumber(PGLOBAL g, bool b = false) {return N + 1;}
+  int RowNumber(PGLOBAL g, bool b = false) override {return N + 1;}
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int  Cardinality(PGLOBAL g) {return GetMaxSize(g);}
-  virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int  Cardinality(PGLOBAL g) override {return GetMaxSize(g);}
+  int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
 
  protected:
   // Specific routines
@@ -118,10 +118,10 @@ class WMICOL : public COLBLK {
   WMICOL(PCOLDEF cdp, PTDB tdbp, int n);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_WMI;}
+  int  GetAmType(void) override {return TYPE_AM_WMI;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
 
  protected:
   WMICOL(void) {}              // Default constructor not to be used
@@ -143,7 +143,7 @@ class TDBWCL : public TDBCAT {
 
  protected:
   // Specific routines
-  virtual PQRYRES GetResult(PGLOBAL g);
+  virtual PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   char   *Nsp;                         // Name space
diff --git a/storage/connect/tabxcl.h b/storage/connect/tabxcl.h
index 08beb5fe6ac..b2b7eb795a0 100644
--- a/storage/connect/tabxcl.h
+++ b/storage/connect/tabxcl.h
@@ -29,11 +29,11 @@ class XCLDEF : public PRXDEF {            /* Logical table description */
 	 XCLDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "XCL";}
+  const char *GetType(void) override {return "XCL";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE mode);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE mode) override;
 
  protected:
   // Members
@@ -54,17 +54,17 @@ class TDBXCL : public TDBPRX {
   TDBXCL(PXCLDEF tdp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_XCOL;}
+  AMT   GetAmType(void) override {return TYPE_AM_XCOL;}
 
   // Methods
-	virtual void  ResetDB(void) {N = 0; Tdbp->ResetDB();}
-	virtual int   RowNumber(PGLOBAL g, bool b = FALSE);
+	void  ResetDB(void) override {N = 0; Tdbp->ResetDB();}
+	int   RowNumber(PGLOBAL g, bool b = FALSE) override;
 
   // Database routines
-	virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual int   GetMaxSize(PGLOBAL g);
-  virtual bool  OpenDB(PGLOBAL g);
-  virtual int   ReadDB(PGLOBAL g);
+	PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  int   GetMaxSize(PGLOBAL g) override;
+  bool  OpenDB(PGLOBAL g) override;
+  int   ReadDB(PGLOBAL g) override;
 
  protected:
   // Members
@@ -89,9 +89,9 @@ class XCLCOL : public PRXCOL {
 
   // Methods
   using PRXCOL::Init;
-  virtual void Reset(void) {}	  // Evaluated only by TDBXCL
-  virtual void ReadColumn(PGLOBAL g);
-  virtual bool Init(PGLOBAL g, PTDB tp = NULL);
+  void Reset(void) override {}	  // Evaluated only by TDBXCL
+  void ReadColumn(PGLOBAL g) override;
+  bool Init(PGLOBAL g, PTDB tp = NULL) override;
 
  protected:
   // Default constructor not to be used
diff --git a/storage/connect/tabxml.h b/storage/connect/tabxml.h
index 42dbb038b47..252d2f74d85 100644
--- a/storage/connect/tabxml.h
+++ b/storage/connect/tabxml.h
@@ -25,11 +25,11 @@ class DllExport XMLDEF : public TABDEF {  /* Logical table description */
    XMLDEF(void);
 
   // Implementation
-  virtual const char *GetType(void) {return "XML";}
+  const char *GetType(void) override {return "XML";}
 
   // Methods
-  virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-  virtual PTDB GetTable(PGLOBAL g, MODE m);
+  bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+  PTDB GetTable(PGLOBAL g, MODE m) override;
 
  protected:
   // Members
@@ -72,18 +72,18 @@ class DllExport TDBXML : public TDBASE {
   TDBXML(PTDBXML tdbp);
 
   // Implementation
-  virtual AMT   GetAmType(void) {return TYPE_AM_XML;}
-  virtual PTDB  Duplicate(PGLOBAL g) {return (PTDB)new(g) TDBXML(this);}
+  AMT   GetAmType(void) override {return TYPE_AM_XML;}
+  PTDB  Duplicate(PGLOBAL g) override {return (PTDB)new(g) TDBXML(this);}
 
   // Methods
-  virtual PTDB  Clone(PTABS t);
-  virtual int   GetRecpos(void);
-  virtual int   GetProgCur(void) {return N;}
-  virtual PCSZ  GetFile(PGLOBAL g) {return Xfile;}
-  virtual void  SetFile(PGLOBAL g, PCSZ fn) {Xfile = fn;}
-  virtual void  ResetDB(void) {N = 0;}
-  virtual void  ResetSize(void) {MaxSize = -1;}
-  virtual int   RowNumber(PGLOBAL g, bool b = false);
+  PTDB  Clone(PTABS t) override;
+  int   GetRecpos(void) override;
+  int   GetProgCur(void) override {return N;}
+  PCSZ  GetFile(PGLOBAL g) override {return Xfile;}
+  void  SetFile(PGLOBAL g, PCSZ fn) override {Xfile = fn;}
+  void  ResetDB(void) override {N = 0;}
+  void  ResetSize(void) override {MaxSize = -1;}
+  int   RowNumber(PGLOBAL g, bool b = false) override;
           int   LoadTableFile(PGLOBAL g, char *filename);
           bool  Initialize(PGLOBAL g);
           bool  SetTabNode(PGLOBAL g);
@@ -91,19 +91,19 @@ class DllExport TDBXML : public TDBASE {
           bool  CheckRow(PGLOBAL g, bool b);
 
   // Database routines
-  virtual PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-  virtual PCOL  InsertSpecialColumn(PCOL colp);
+  PCOL  MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+  PCOL  InsertSpecialColumn(PCOL colp) override;
 //virtual int   GetMaxSame(PGLOBAL g) {return (Xpand) ? Limit : 1;}
-  virtual int   Cardinality(PGLOBAL g);
-  virtual int   GetMaxSize(PGLOBAL g);
+  int   Cardinality(PGLOBAL g) override;
+  int   GetMaxSize(PGLOBAL g) override;
 //virtual bool  NeedIndexing(PGLOBAL g);
-  virtual bool  OpenDB(PGLOBAL g);
-  virtual int   ReadDB(PGLOBAL g);
-  virtual int   WriteDB(PGLOBAL g);
-  virtual int   DeleteDB(PGLOBAL g, int irc);
-  virtual void  CloseDB(PGLOBAL g);
-  virtual int   CheckWrite(PGLOBAL g) {Checked = true; return 0;}
-	virtual const CHARSET_INFO *data_charset();
+  bool  OpenDB(PGLOBAL g) override;
+  int   ReadDB(PGLOBAL g) override;
+  int   WriteDB(PGLOBAL g) override;
+  int   DeleteDB(PGLOBAL g, int irc) override;
+  void  CloseDB(PGLOBAL g) override;
+  int   CheckWrite(PGLOBAL g) override {Checked = true; return 0;}
+	const CHARSET_INFO *data_charset() override;
 
  protected:
   // Members
@@ -164,14 +164,14 @@ class XMLCOL : public COLBLK {
   XMLCOL(XMLCOL *colp, PTDB tdbp);   // Constructor used in copy process
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_XML;}
-  virtual void SetTo_Val(PVAL valp) {To_Val = valp;}
+  int  GetAmType(void) override {return TYPE_AM_XML;}
+  void SetTo_Val(PVAL valp) override {To_Val = valp;}
           bool ParseXpath(PGLOBAL g, bool mode);
 
   // Methods
-  virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) override;
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
           bool AllocBuf(PGLOBAL g, bool mode);
           void AllocNodes(PGLOBAL g, PXDOC dp);
 
@@ -234,8 +234,8 @@ class XMULCOL : public XMLCOLX {
   XMULCOL(PVAL valp) {Value = valp; Mul = true;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
   }; // end of class XMULCOL
 
 /***********************************************************************/
@@ -248,8 +248,8 @@ class XPOSCOL : public XMLCOLX {
   XPOSCOL(PVAL valp) {Value = valp;}
 
   // Methods
-  virtual void ReadColumn(PGLOBAL g);
-  virtual void WriteColumn(PGLOBAL g);
+  void ReadColumn(PGLOBAL g) override;
+  void WriteColumn(PGLOBAL g) override;
   }; // end of class XPOSCOL
 
 /***********************************************************************/
@@ -262,7 +262,7 @@ class TDBXCT : public TDBCAT {
 
  protected:
   // Specific routines
-  virtual PQRYRES GetResult(PGLOBAL g);
+  PQRYRES GetResult(PGLOBAL g) override;
 
   // Members
   PTOS  Topt;
diff --git a/storage/connect/tabzip.h b/storage/connect/tabzip.h
index 3c16fae99bc..16ad9db7c4a 100644
--- a/storage/connect/tabzip.h
+++ b/storage/connect/tabzip.h
@@ -26,11 +26,11 @@ public:
 	ZIPDEF(void) = default;
 
 	// Implementation
-	virtual const char *GetType(void) {return "ZIP";}
+	const char *GetType(void) override {return "ZIP";}
 
 	// Methods
-	virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
-	virtual PTDB GetTable(PGLOBAL g, MODE m);
+	bool DefineAM(PGLOBAL g, LPCSTR am, int poff) override;
+	PTDB GetTable(PGLOBAL g, MODE m) override;
 
 protected:
 	// Members
@@ -47,22 +47,22 @@ public:
 	TDBZIP(PZIPDEF tdp);
 
 	// Implementation
-	virtual AMT  GetAmType(void) {return TYPE_AM_ZIP;}
-	virtual PCSZ GetFile(PGLOBAL) {return zfn;}
-	virtual void SetFile(PGLOBAL, PCSZ fn) {zfn = fn;}
+	AMT  GetAmType(void) override {return TYPE_AM_ZIP;}
+	PCSZ GetFile(PGLOBAL) override {return zfn;}
+	void SetFile(PGLOBAL, PCSZ fn) override {zfn = fn;}
 
 	// Methods
-	virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-	virtual int  Cardinality(PGLOBAL g);
-	virtual int  GetMaxSize(PGLOBAL g);
-	virtual int  GetRecpos(void) {return 0;}
+	PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+	int  Cardinality(PGLOBAL g) override;
+	int  GetMaxSize(PGLOBAL g) override;
+	int  GetRecpos(void) override {return 0;}
 
 	// Database routines
-	virtual bool OpenDB(PGLOBAL g);
-	virtual int  ReadDB(PGLOBAL g);
-	virtual int  WriteDB(PGLOBAL g);
-	virtual int  DeleteDB(PGLOBAL g, int irc);
-	virtual void CloseDB(PGLOBAL g);
+	bool OpenDB(PGLOBAL g) override;
+	int  ReadDB(PGLOBAL g) override;
+	int  WriteDB(PGLOBAL g) override;
+	int  DeleteDB(PGLOBAL g, int irc) override;
+	void CloseDB(PGLOBAL g) override;
 
 protected:
 	bool open(PGLOBAL g, const char *filename);
@@ -87,10 +87,10 @@ public:
 	ZIPCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "ZIP");
 
 	// Implementation
-	virtual int  GetAmType(void) { return TYPE_AM_ZIP; }
+	int  GetAmType(void) override { return TYPE_AM_ZIP; }
 
 	// Methods
-	virtual void ReadColumn(PGLOBAL g);
+	void ReadColumn(PGLOBAL g) override;
 
 protected:
 	// Default constructor not to be used
diff --git a/storage/connect/valblk.h b/storage/connect/valblk.h
index 537e838c99f..6ac293b734a 100644
--- a/storage/connect/valblk.h
+++ b/storage/connect/valblk.h
@@ -149,54 +149,54 @@ class TYPBLK : public VALBLK {
   TYPBLK(void *mp, int size, int type, int prec = 0, bool un = false);
 
   // Implementation
-  virtual bool   Init(PGLOBAL g, bool check);
-  virtual int    GetVlen(void) {return sizeof(TYPE);}
+  bool   Init(PGLOBAL g, bool check) override;
+  int    GetVlen(void) override {return sizeof(TYPE);}
 
-  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-  virtual char  *GetCharString(char *p, int n);
-  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
+  char   GetTinyValue(int n) override {return (char)UnalignedRead(n);}
+  uchar  GetUTinyValue(int n) override {return (uchar)UnalignedRead(n);}
+  short  GetShortValue(int n) override {return (short)UnalignedRead(n);}
+  ushort GetUShortValue(int n) override {return (ushort)UnalignedRead(n);}
+  int    GetIntValue(int n) override {return (int)UnalignedRead(n);}
+  uint   GetUIntValue(int n) override {return (uint)UnalignedRead(n);}
+  longlong GetBigintValue(int n) override {return (longlong)UnalignedRead(n);}
+  ulonglong GetUBigintValue(int n) override {return (ulonglong)UnalignedRead(n);}
+  double GetFloatValue(int n) override {return (double)UnalignedRead(n);}
+  char  *GetCharString(char *p, int n) override;
+  void   Reset(int n) override {UnalignedWrite(n, 0);}
 
   // Methods
   using VALBLK::SetValue;
-  virtual void   SetValue(PCSZ sp, int n);
-  virtual void   SetValue(const char *sp, uint len, int n);
-  virtual void   SetValue(short sval, int n)
+  void   SetValue(PCSZ sp, int n) override;
+  void   SetValue(const char *sp, uint len, int n) override;
+  void   SetValue(short sval, int n) override
                   {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-  virtual void   SetValue(ushort sval, int n)
+  void   SetValue(ushort sval, int n) override
                   {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-  virtual void   SetValue(int lval, int n)
+  void   SetValue(int lval, int n) override
                   {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-  virtual void   SetValue(uint lval, int n)
+  void   SetValue(uint lval, int n) override
                   {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-  virtual void   SetValue(longlong lval, int n)
+  void   SetValue(longlong lval, int n) override
                   {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-  virtual void   SetValue(ulonglong lval, int n)
+  void   SetValue(ulonglong lval, int n) override
                   {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-  virtual void   SetValue(double fval, int n)
+  void   SetValue(double fval, int n) override
                   {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-  virtual void   SetValue(char cval, int n)
+  void   SetValue(char cval, int n) override
                   {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-  virtual void   SetValue(uchar cval, int n)
+  void   SetValue(uchar cval, int n) override
                   {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-  virtual void   SetValue(PVAL valp, int n);
-  virtual void   SetValue(PVBLK pv, int n1, int n2);
-  virtual void   SetMin(PVAL valp, int n);
-  virtual void   SetMax(PVAL valp, int n);
-  virtual void   Move(int i, int j);
-  virtual int    CompVal(PVAL vp, int n);
-  virtual int    CompVal(int i1, int i2);
-  virtual void  *GetValPtr(int n);
-  virtual void  *GetValPtrEx(int n);
-  virtual int    Find(PVAL vp);
-  virtual int    GetMaxLength(void);
+  void   SetValue(PVAL valp, int n) override;
+  void   SetValue(PVBLK pv, int n1, int n2) override;
+  void   SetMin(PVAL valp, int n) override;
+  void   SetMax(PVAL valp, int n) override;
+  void   Move(int i, int j) override;
+  int    CompVal(PVAL vp, int n) override;
+  int    CompVal(int i1, int i2) override;
+  void  *GetValPtr(int n) override;
+  void  *GetValPtrEx(int n) override;
+  int    Find(PVAL vp) override;
+  int    GetMaxLength(void) override;
 
  protected:
   // Specialized functions
@@ -229,38 +229,38 @@ class CHRBLK : public VALBLK {
   CHRBLK(void *mp, int size, int type, int len, int prec, bool b);
 
   // Implementation
-  virtual bool   Init(PGLOBAL g, bool check);
-  virtual int    GetVlen(void) {return Long;}
-  virtual PSZ    GetCharValue(int n);
-  virtual char   GetTinyValue(int n);
-  virtual uchar  GetUTinyValue(int n);
-  virtual short  GetShortValue(int n);
-  virtual ushort GetUShortValue(int n);
-  virtual int    GetIntValue(int n);
-  virtual uint   GetUIntValue(int n);
-  virtual longlong GetBigintValue(int n);
-  virtual ulonglong GetUBigintValue(int n);
-  virtual double GetFloatValue(int n);
-  virtual char  *GetCharString(char *p, int n);
-  virtual void   Reset(int n);
-  virtual void   SetPrec(int p) {Ci = (p != 0);}
-  virtual bool   IsCi(void) {return Ci;}
+  bool   Init(PGLOBAL g, bool check) override;
+  int    GetVlen(void) override {return Long;}
+  PSZ    GetCharValue(int n) override;
+  char   GetTinyValue(int n) override;
+  uchar  GetUTinyValue(int n) override;
+  short  GetShortValue(int n) override;
+  ushort GetUShortValue(int n) override;
+  int    GetIntValue(int n) override;
+  uint   GetUIntValue(int n) override;
+  longlong GetBigintValue(int n) override;
+  ulonglong GetUBigintValue(int n) override;
+  double GetFloatValue(int n) override;
+  char  *GetCharString(char *p, int n) override;
+  void   Reset(int n) override;
+  void   SetPrec(int p) override {Ci = (p != 0);}
+  bool   IsCi(void) override {return Ci;}
 
   // Methods
   using VALBLK::SetValue;
-  virtual void   SetValue(PCSZ sp, int n);
-  virtual void   SetValue(const char *sp, uint len, int n);
-  virtual void   SetValue(PVAL valp, int n);
-  virtual void   SetValue(PVBLK pv, int n1, int n2);
-  virtual void   SetMin(PVAL valp, int n);
-  virtual void   SetMax(PVAL valp, int n);
-  virtual void   Move(int i, int j);
-  virtual int    CompVal(PVAL vp, int n);
-  virtual int    CompVal(int i1, int i2);
-  virtual void  *GetValPtr(int n);
-  virtual void  *GetValPtrEx(int n);
-  virtual int    Find(PVAL vp);
-  virtual int    GetMaxLength(void);
+  void   SetValue(PCSZ sp, int n) override;
+  void   SetValue(const char *sp, uint len, int n) override;
+  void   SetValue(PVAL valp, int n) override;
+  void   SetValue(PVBLK pv, int n1, int n2) override;
+  void   SetMin(PVAL valp, int n) override;
+  void   SetMax(PVAL valp, int n) override;
+  void   Move(int i, int j) override;
+  int    CompVal(PVAL vp, int n) override;
+  int    CompVal(int i1, int i2) override;
+  void  *GetValPtr(int n) override;
+  void  *GetValPtrEx(int n) override;
+  int    Find(PVAL vp) override;
+  int    GetMaxLength(void) override;
 
  protected:
   // Members
@@ -282,39 +282,39 @@ class STRBLK : public VALBLK {
   STRBLK(PGLOBAL g, void *mp, int size, int type);
 
   // Implementation
-  virtual void   SetNull(int n, bool b) {if (b) {Strp[n] = NULL;}}
-  virtual bool   IsNull(int n) {return Strp[n] == NULL;}
-  virtual void   SetNullable(bool) {}      // Always nullable
-  virtual bool   Init(PGLOBAL g, bool check);
-  virtual int    GetVlen(void) {return sizeof(PSZ);}
-  virtual PSZ    GetCharValue(int n) {return Strp[n];}
-  virtual char   GetTinyValue(int n);
-  virtual uchar  GetUTinyValue(int n);
-  virtual short  GetShortValue(int n);
-  virtual ushort GetUShortValue(int n);
-  virtual int    GetIntValue(int n);
-  virtual uint   GetUIntValue(int n);
-  virtual longlong GetBigintValue(int n);
-  virtual ulonglong GetUBigintValue(int n);
-  virtual double GetFloatValue(int n) {return atof(Strp[n]);}
-  virtual char  *GetCharString(char *, int n) {return Strp[n];}
-  virtual void   Reset(int n) {Strp[n] = NULL;}
+  void   SetNull(int n, bool b) override {if (b) {Strp[n] = NULL;}}
+  bool   IsNull(int n) override {return Strp[n] == NULL;}
+  void   SetNullable(bool) override {}      // Always nullable
+  bool   Init(PGLOBAL g, bool check) override;
+  int    GetVlen(void) override {return sizeof(PSZ);}
+  PSZ    GetCharValue(int n) override {return Strp[n];}
+  char   GetTinyValue(int n) override;
+  uchar  GetUTinyValue(int n) override;
+  short  GetShortValue(int n) override;
+  ushort GetUShortValue(int n) override;
+  int    GetIntValue(int n) override;
+  uint   GetUIntValue(int n) override;
+  longlong GetBigintValue(int n) override;
+  ulonglong GetUBigintValue(int n) override;
+  double GetFloatValue(int n) override {return atof(Strp[n]);}
+  char  *GetCharString(char *, int n) override {return Strp[n];}
+  void   Reset(int n) override {Strp[n] = NULL;}
 
   // Methods
   using VALBLK::SetValue;
-  virtual void   SetValue(PCSZ sp, int n);
-  virtual void   SetValue(const char *sp, uint len, int n);
-  virtual void   SetValue(PVAL valp, int n);
-  virtual void   SetValue(PVBLK pv, int n1, int n2);
-  virtual void   SetMin(PVAL valp, int n);
-  virtual void   SetMax(PVAL valp, int n);
-  virtual void   Move(int i, int j);
-  virtual int    CompVal(PVAL vp, int n);
-  virtual int    CompVal(int i1, int i2);
-  virtual void  *GetValPtr(int n);
-  virtual void  *GetValPtrEx(int n);
-  virtual int    Find(PVAL vp);
-  virtual int    GetMaxLength(void);
+  void   SetValue(PCSZ sp, int n) override;
+  void   SetValue(const char *sp, uint len, int n) override;
+  void   SetValue(PVAL valp, int n) override;
+  void   SetValue(PVBLK pv, int n1, int n2) override;
+  void   SetMin(PVAL valp, int n) override;
+  void   SetMax(PVAL valp, int n) override;
+  void   Move(int i, int j) override;
+  int    CompVal(PVAL vp, int n) override;
+  int    CompVal(int i1, int i2) override;
+  void  *GetValPtr(int n) override;
+  void  *GetValPtrEx(int n) override;
+  int    Find(PVAL vp) override;
+  int    GetMaxLength(void) override;
 
   // Specific
           void   SetSorted(bool b) {Sorted = b;}
@@ -334,12 +334,12 @@ class DATBLK : public TYPBLK<int> {
   DATBLK(void *mp, int size);
 
   // Implementation
-  virtual bool  SetFormat(PGLOBAL g, PCSZ fmt, int len, int year = 0);
-  virtual char *GetCharString(char *p, int n);
+  bool  SetFormat(PGLOBAL g, PCSZ fmt, int len, int year = 0) override;
+  char *GetCharString(char *p, int n) override;
 
   // Methods
   using TYPBLK<int>::SetValue;
-  virtual void  SetValue(PCSZ sp, int n);
+  void  SetValue(PCSZ sp, int n) override;
 
  protected:
   // Members
@@ -364,8 +364,8 @@ class PTRBLK : public STRBLK {
   // Methods
   using STRBLK::SetValue;
   using STRBLK::CompVal;
-  virtual void   SetValue(PCSZ p, int n) {Strp[n] = (char*)p;}
-  virtual int    CompVal(int i1, int i2);
+  void   SetValue(PCSZ p, int n) override {Strp[n] = (char*)p;}
+  int    CompVal(int i1, int i2) override;
 
  protected:
   // Members
diff --git a/storage/connect/value.h b/storage/connect/value.h
index 8c76431ddd0..de6d7f12bc0 100644
--- a/storage/connect/value.h
+++ b/storage/connect/value.h
@@ -126,8 +126,8 @@ public:
   virtual bool   IsEqual(PVAL vp, bool chktype) = 0;
   virtual bool   Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op);
   virtual bool   FormatValue(PVAL vp, PCSZ fmt) = 0;
-	virtual void   Printf(PGLOBAL g, FILE *, uint);
-	virtual void   Prints(PGLOBAL g, char *ps, uint z);
+	void   Printf(PGLOBAL g, FILE *, uint) override;
+	void   Prints(PGLOBAL g, char *ps, uint z) override;
 
 	/**
 	Set value from a non-aligned in-memory value in the machine byte order.
@@ -197,48 +197,48 @@ class DllExport TYPVAL : public VALUE {
   TYPVAL(TYPE n, int type, int prec = 0, bool un = false);
 
   // Implementation
-  virtual bool   IsTypeNum(void) {return true;}
-  virtual bool   IsZero(void) {return Tval == 0;}
-  virtual void   Reset(void) {Tval = 0;}
-  virtual int    GetValLen(void);
-  virtual int    GetValPrec() {return Prec;}
-  virtual int    GetSize(void) {return sizeof(TYPE);}
+  bool   IsTypeNum(void) override {return true;}
+  bool   IsZero(void) override {return Tval == 0;}
+  void   Reset(void) override {Tval = 0;}
+  int    GetValLen(void) override;
+  int    GetValPrec() override {return Prec;}
+  int    GetSize(void) override {return sizeof(TYPE);}
 //virtual PSZ    GetCharValue(void) {return VALUE::GetCharValue();}
-  virtual char   GetTinyValue(void) {return (char)Tval;}
-  virtual uchar  GetUTinyValue(void) {return (uchar)Tval;}
-  virtual short  GetShortValue(void) {return (short)Tval;}
-  virtual ushort GetUShortValue(void) {return (ushort)Tval;}
-  virtual int    GetIntValue(void) {return (int)Tval;}
-  virtual uint   GetUIntValue(void) {return (uint)Tval;}
-  virtual longlong GetBigintValue(void) {return (longlong)Tval;}
-  virtual ulonglong GetUBigintValue(void) {return (ulonglong)Tval;}
-  virtual double GetFloatValue(void) {return (double)Tval;}
-  virtual void  *GetTo_Val(void) {return &Tval;}
+  char   GetTinyValue(void) override {return (char)Tval;}
+  uchar  GetUTinyValue(void) override {return (uchar)Tval;}
+  short  GetShortValue(void) override {return (short)Tval;}
+  ushort GetUShortValue(void) override {return (ushort)Tval;}
+  int    GetIntValue(void) override {return (int)Tval;}
+  uint   GetUIntValue(void) override {return (uint)Tval;}
+  longlong GetBigintValue(void) override {return (longlong)Tval;}
+  ulonglong GetUBigintValue(void) override {return (ulonglong)Tval;}
+  double GetFloatValue(void) override {return (double)Tval;}
+  void  *GetTo_Val(void) override {return &Tval;}
 
   // Methods
-  virtual bool   SetValue_pval(PVAL valp, bool chktype);
-  virtual bool   SetValue_char(const char *p, int n);
-  virtual void   SetValue_psz(PCSZ s);
-  virtual void   SetValue_bool(bool b) {Tval = (b) ? 1 : 0;}
-  virtual int    CompareValue(PVAL vp);
-  virtual void   SetValue(char c) {Tval = (TYPE)c; Null = false;}
-  virtual void   SetValue(uchar c) {Tval = (TYPE)c; Null = false;}
-  virtual void   SetValue(short i) {Tval = (TYPE)i; Null = false;}
-  virtual void   SetValue(ushort i) {Tval = (TYPE)i; Null = false;}
-  virtual void   SetValue(int n) {Tval = (TYPE)n; Null = false;}
-  virtual void   SetValue(uint n) {Tval = (TYPE)n; Null = false;}
-  virtual void   SetValue(longlong n) {Tval = (TYPE)n; Null = false;}
-  virtual void   SetValue(ulonglong n) {Tval = (TYPE)n; Null = false;}
-  virtual void   SetValue(double f) {Tval = (TYPE)f; Null = false;}
-  virtual void   SetValue_pvblk(PVBLK blk, int n);
-  virtual void   SetBinValue(void *p);
-  virtual bool   GetBinValue(void *buf, int buflen, bool go);
-  virtual int    ShowValue(char *buf, int len);
-  virtual char  *GetCharString(char *p);
-  virtual bool   IsEqual(PVAL vp, bool chktype);
-  virtual bool   Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op);
-  virtual bool   SetConstFormat(PGLOBAL, FORMAT&);
-  virtual bool   FormatValue(PVAL vp, PCSZ fmt);
+  bool   SetValue_pval(PVAL valp, bool chktype) override;
+  bool   SetValue_char(const char *p, int n) override;
+  void   SetValue_psz(PCSZ s) override;
+  void   SetValue_bool(bool b) override {Tval = (b) ? 1 : 0;}
+  int    CompareValue(PVAL vp) override;
+  void   SetValue(char c) override {Tval = (TYPE)c; Null = false;}
+  void   SetValue(uchar c) override {Tval = (TYPE)c; Null = false;}
+  void   SetValue(short i) override {Tval = (TYPE)i; Null = false;}
+  void   SetValue(ushort i) override {Tval = (TYPE)i; Null = false;}
+  void   SetValue(int n) override {Tval = (TYPE)n; Null = false;}
+  void   SetValue(uint n) override {Tval = (TYPE)n; Null = false;}
+  void   SetValue(longlong n) override {Tval = (TYPE)n; Null = false;}
+  void   SetValue(ulonglong n) override {Tval = (TYPE)n; Null = false;}
+  void   SetValue(double f) override {Tval = (TYPE)f; Null = false;}
+  void   SetValue_pvblk(PVBLK blk, int n) override;
+  void   SetBinValue(void *p) override;
+  bool   GetBinValue(void *buf, int buflen, bool go) override;
+  int    ShowValue(char *buf, int len) override;
+  char  *GetCharString(char *p) override;
+  bool   IsEqual(PVAL vp, bool chktype) override;
+  bool   Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op) override;
+  bool   SetConstFormat(PGLOBAL, FORMAT&) override;
+  bool   FormatValue(PVAL vp, PCSZ fmt) override;
 
  protected:
   static  TYPE   MinMaxVal(bool b);
@@ -271,49 +271,49 @@ public:
   TYPVAL(PGLOBAL g, PSZ s, int n, int c);
 
   // Implementation
-  virtual bool   IsTypeNum(void) {return false;}
-  virtual bool   IsZero(void) {return *Strp == 0;}
-  virtual void   Reset(void) {*Strp = 0;}
-  virtual int    GetValLen(void) {return Len;};
-  virtual int    GetValPrec() {return (Ci) ? 1 : 0;}
-  virtual int    GetSize(void) {return (Strp) ? (int)strlen(Strp) : 0;}
-  virtual PSZ    GetCharValue(void) {return Strp;}
-  virtual char   GetTinyValue(void);
-  virtual uchar  GetUTinyValue(void);
-  virtual short  GetShortValue(void);
-  virtual ushort GetUShortValue(void);
-  virtual int    GetIntValue(void);
-  virtual uint   GetUIntValue(void);
-  virtual longlong GetBigintValue(void);
-  virtual ulonglong GetUBigintValue(void);
-  virtual double GetFloatValue(void) {return atof(Strp);}
-  virtual void  *GetTo_Val(void) {return Strp;}
-  virtual void   SetPrec(int prec) {Ci = prec != 0;}
+  bool   IsTypeNum(void) override {return false;}
+  bool   IsZero(void) override {return *Strp == 0;}
+  void   Reset(void) override {*Strp = 0;}
+  int    GetValLen(void) override {return Len;};
+  int    GetValPrec() override {return (Ci) ? 1 : 0;}
+  int    GetSize(void) override {return (Strp) ? (int)strlen(Strp) : 0;}
+  PSZ    GetCharValue(void) override {return Strp;}
+  char   GetTinyValue(void) override;
+  uchar  GetUTinyValue(void) override;
+  short  GetShortValue(void) override;
+  ushort GetUShortValue(void) override;
+  int    GetIntValue(void) override;
+  uint   GetUIntValue(void) override;
+  longlong GetBigintValue(void) override;
+  ulonglong GetUBigintValue(void) override;
+  double GetFloatValue(void) override {return atof(Strp);}
+  void  *GetTo_Val(void) override {return Strp;}
+  void   SetPrec(int prec) override {Ci = prec != 0;}
 
   // Methods
-  virtual bool   SetValue_pval(PVAL valp, bool chktype);
-  virtual bool   SetValue_char(const char *p, int n);
-  virtual void   SetValue_psz(PCSZ s);
-  virtual void   SetValue_pvblk(PVBLK blk, int n);
-  virtual void   SetValue(char c);
-  virtual void   SetValue(uchar c);
-  virtual void   SetValue(short i);
-  virtual void   SetValue(ushort i);
-  virtual void   SetValue(int n);
-  virtual void   SetValue(uint n);
-  virtual void   SetValue(longlong n);
-  virtual void   SetValue(ulonglong n);
-  virtual void   SetValue(double f);
-  virtual void   SetBinValue(void *p);
-  virtual int    CompareValue(PVAL vp);
-  virtual bool   GetBinValue(void *buf, int buflen, bool go);
-  virtual int    ShowValue(char *buf, int len);
-  virtual char  *GetCharString(char *p);
-  virtual bool   IsEqual(PVAL vp, bool chktype);
-  virtual bool   Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op);
-  virtual bool   FormatValue(PVAL vp, PCSZ fmt);
-  virtual bool   SetConstFormat(PGLOBAL, FORMAT&);
-	virtual void   Prints(PGLOBAL g, char *ps, uint z);
+  bool   SetValue_pval(PVAL valp, bool chktype) override;
+  bool   SetValue_char(const char *p, int n) override;
+  void   SetValue_psz(PCSZ s) override;
+  void   SetValue_pvblk(PVBLK blk, int n) override;
+  void   SetValue(char c) override;
+  void   SetValue(uchar c) override;
+  void   SetValue(short i) override;
+  void   SetValue(ushort i) override;
+  void   SetValue(int n) override;
+  void   SetValue(uint n) override;
+  void   SetValue(longlong n) override;
+  void   SetValue(ulonglong n) override;
+  void   SetValue(double f) override;
+  void   SetBinValue(void *p) override;
+  int    CompareValue(PVAL vp) override;
+  bool   GetBinValue(void *buf, int buflen, bool go) override;
+  int    ShowValue(char *buf, int len) override;
+  char  *GetCharString(char *p) override;
+  bool   IsEqual(PVAL vp, bool chktype) override;
+  bool   Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op) override;
+  bool   FormatValue(PVAL vp, PCSZ fmt) override;
+  bool   SetConstFormat(PGLOBAL, FORMAT&) override;
+	void   Prints(PGLOBAL g, char *ps, uint z) override;
 
  protected:
   // Members
@@ -332,16 +332,16 @@ class DllExport DECVAL: public TYPVAL<PSZ> {
   DECVAL(PGLOBAL g, PSZ s, int n, int prec, bool uns);
 
   // Implementation
-  virtual bool   IsTypeNum(void) {return true;}
-  virtual bool   IsZero(void);
-  virtual void   Reset(void);
-  virtual int    GetValPrec() {return Prec;}
+  bool   IsTypeNum(void) override {return true;}
+  bool   IsZero(void) override;
+  void   Reset(void) override;
+  int    GetValPrec() override {return Prec;}
 
   // Methods
-  virtual bool   GetBinValue(void *buf, int buflen, bool go);
-  virtual int    ShowValue(char *buf, int len);
-  virtual bool   IsEqual(PVAL vp, bool chktype);
-  virtual int    CompareValue(PVAL vp);
+  bool   GetBinValue(void *buf, int buflen, bool go) override;
+  int    ShowValue(char *buf, int len) override;
+  bool   IsEqual(PVAL vp, bool chktype) override;
+  int    CompareValue(PVAL vp) override;
 
  protected:
   // Members
@@ -358,47 +358,47 @@ public:
   BINVAL(PGLOBAL g, void *p, int cl, int n);
 
   // Implementation
-  virtual bool   IsTypeNum(void) {return false;}
-  virtual bool   IsZero(void);
-  virtual void   Reset(void);
-  virtual int    GetValLen(void) {return Clen;};
-  virtual int    GetValPrec() {return 0;}
-  virtual int    GetSize(void) {return Len;}
-  virtual PSZ    GetCharValue(void) {return (PSZ)Binp;}
-  virtual char   GetTinyValue(void);
-  virtual uchar  GetUTinyValue(void);
-  virtual short  GetShortValue(void);
-  virtual ushort GetUShortValue(void);
-  virtual int    GetIntValue(void);
-  virtual uint   GetUIntValue(void);
-  virtual longlong GetBigintValue(void);
-  virtual ulonglong GetUBigintValue(void);
-  virtual double GetFloatValue(void);
-  virtual void  *GetTo_Val(void) {return Binp;}
+  bool   IsTypeNum(void) override {return false;}
+  bool   IsZero(void) override;
+  void   Reset(void) override;
+  int    GetValLen(void) override {return Clen;};
+  int    GetValPrec() override {return 0;}
+  int    GetSize(void) override {return Len;}
+  PSZ    GetCharValue(void) override {return (PSZ)Binp;}
+  char   GetTinyValue(void) override;
+  uchar  GetUTinyValue(void) override;
+  short  GetShortValue(void) override;
+  ushort GetUShortValue(void) override;
+  int    GetIntValue(void) override;
+  uint   GetUIntValue(void) override;
+  longlong GetBigintValue(void) override;
+  ulonglong GetUBigintValue(void) override;
+  double GetFloatValue(void) override;
+  void  *GetTo_Val(void) override {return Binp;}
 
   // Methods
-  virtual bool   SetValue_pval(PVAL valp, bool chktype);
-  virtual bool   SetValue_char(const char *p, int n);
-  virtual void   SetValue_psz(PCSZ s);
-  virtual void   SetValue_pvblk(PVBLK blk, int n);
-  virtual void   SetValue(char c);
-  virtual void   SetValue(uchar c);
-  virtual void   SetValue(short i);
-  virtual void   SetValue(ushort i);
-  virtual void   SetValue(int n);
-  virtual void   SetValue(uint n);
-  virtual void   SetValue(longlong n);
-  virtual void   SetValue(ulonglong n);
-  virtual void   SetValue(double f);
-  virtual void   SetBinValue(void *p);
+  bool   SetValue_pval(PVAL valp, bool chktype) override;
+  bool   SetValue_char(const char *p, int n) override;
+  void   SetValue_psz(PCSZ s) override;
+  void   SetValue_pvblk(PVBLK blk, int n) override;
+  void   SetValue(char c) override;
+  void   SetValue(uchar c) override;
+  void   SetValue(short i) override;
+  void   SetValue(ushort i) override;
+  void   SetValue(int n) override;
+  void   SetValue(uint n) override;
+  void   SetValue(longlong n) override;
+  void   SetValue(ulonglong n) override;
+  void   SetValue(double f) override;
+  void   SetBinValue(void *p) override;
 	virtual void   SetBinValue(void* p, ulong len);
-	virtual bool   GetBinValue(void *buf, int buflen, bool go);
-  virtual int    CompareValue(PVAL) {assert(false); return 0;}
-  virtual int    ShowValue(char *buf, int len);
-  virtual char  *GetCharString(char *p);
-  virtual bool   IsEqual(PVAL vp, bool chktype);
-  virtual bool   FormatValue(PVAL vp, PCSZ fmt);
-  virtual bool   SetConstFormat(PGLOBAL, FORMAT&);
+	bool   GetBinValue(void *buf, int buflen, bool go) override;
+  int    CompareValue(PVAL) override {assert(false); return 0;}
+  int    ShowValue(char *buf, int len) override;
+  char  *GetCharString(char *p) override;
+  bool   IsEqual(PVAL vp, bool chktype) override;
+  bool   FormatValue(PVAL vp, PCSZ fmt) override;
+  bool   SetConstFormat(PGLOBAL, FORMAT&) override;
 
  protected:
   // Members
@@ -419,17 +419,17 @@ class DllExport DTVAL : public TYPVAL<dtval_timestamp_t> {
   using TYPVAL<dtval_timestamp_t>::SetValue;
 
   // Implementation
-  virtual bool   SetValue_pval(PVAL valp, bool chktype);
-  virtual bool   SetValue_char(const char *p, int n);
-  virtual void   SetValue_psz(PCSZ s);
-  virtual void   SetValue_pvblk(PVBLK blk, int n);
-  virtual void   SetValue(dtval_timestamp_t n);
-  virtual void   SetBinValue(void* p);
-  virtual bool   GetBinValue(void *buf, int buflen, bool go);
-  virtual PSZ    GetCharValue(void) { return Sdate; }
-  virtual char  *GetCharString(char *p);
-  virtual int    ShowValue(char *buf, int len);
-  virtual bool   FormatValue(PVAL vp, PCSZ fmt);
+  bool   SetValue_pval(PVAL valp, bool chktype) override;
+  bool   SetValue_char(const char *p, int n) override;
+  void   SetValue_psz(PCSZ s) override;
+  void   SetValue_pvblk(PVBLK blk, int n) override;
+  void   SetValue(dtval_timestamp_t n) override;
+  void   SetBinValue(void* p) override;
+  bool   GetBinValue(void *buf, int buflen, bool go) override;
+  PSZ    GetCharValue(void) override { return Sdate; }
+  char  *GetCharString(char *p) override;
+  int    ShowValue(char *buf, int len) override;
+  bool   FormatValue(PVAL vp, PCSZ fmt) override;
           bool   SetFormat(PGLOBAL g, PCSZ fmt, int len, int year = 0);
           bool   SetFormat(PGLOBAL g, PVAL valp);
           bool   IsFormatted(void) {return Pdtp != NULL;}
diff --git a/storage/connect/xindex.h b/storage/connect/xindex.h
index ce62f0591c1..dcd98582e2d 100644
--- a/storage/connect/xindex.h
+++ b/storage/connect/xindex.h
@@ -200,8 +200,8 @@ class DllExport XXBASE : public CSORT, public BLOCK {
           void FreeIndex(void) {PlgDBfree(Index);}
 
   // Methods
-  virtual void Printf(PGLOBAL g, FILE *f, uint n);
-  virtual void Prints(PGLOBAL g, char *ps, uint z);
+  void Printf(PGLOBAL g, FILE *f, uint n) override;
+  void Prints(PGLOBAL g, char *ps, uint z) override;
   virtual bool Init(PGLOBAL g) = 0;
   virtual bool Make(PGLOBAL g, PIXDEF sxp) = 0;
 #if defined(XMAP)
@@ -214,7 +214,7 @@ class DllExport XXBASE : public CSORT, public BLOCK {
   virtual int  FastFind(void) = 0;
   virtual bool Reorder(PGLOBAL) {return true;}
   virtual int  Range(PGLOBAL, int = 0, bool = true) {return -1;} // Means error
-  virtual int  Qcompare(int *, int *) = 0;
+  int  Qcompare(int *, int *) override = 0;
   virtual int  GroupSize(void) {return 1;}
   virtual void Close(void) = 0;
 
@@ -254,32 +254,32 @@ class DllExport XINDEX : public XXBASE {
                        PCOL *cp, PXOB *xp = NULL, int k = 0);
 
   // Implementation
-  virtual IDT  GetType(void) {return TYPE_IDX_INDX;}
-  virtual bool IsMul(void) {return (Nval < Nk) ? true : Mul;}
+  IDT  GetType(void) override {return TYPE_IDX_INDX;}
+  bool IsMul(void) override {return (Nval < Nk) ? true : Mul;}
 //virtual bool HaveSame(void) {return Op == OP_SAME;}
-  virtual int  GetCurPos(void) {return (Pex) ? Pex[Cur_K] : Cur_K;}
-  virtual void SetNval(int n) {Nval = n;}
+  int  GetCurPos(void) override {return (Pex) ? Pex[Cur_K] : Cur_K;}
+  void SetNval(int n) override {Nval = n;}
           int  GetMaxSame(void) {return MaxSame;}
 
   // Methods
-  virtual void Reset(void);
-  virtual bool Init(PGLOBAL g);
+  void Reset(void) override;
+  bool Init(PGLOBAL g) override;
 #if defined(XMAP)
-  virtual bool MapInit(PGLOBAL g);
+  bool MapInit(PGLOBAL g) override;
 #endif   // XMAP
-  virtual int  Qcompare(int *, int *);
-  virtual int  Fetch(PGLOBAL g);
-  virtual int  FastFind(void);
-  virtual int  GroupSize(void);
-  virtual int  Range(PGLOBAL g, int limit = 0, bool incl = true);
-  virtual int  MaxRange(void) {return MaxSame;}
+  int  Qcompare(int *, int *) override;
+  int  Fetch(PGLOBAL g) override;
+  int  FastFind(void) override;
+  int  GroupSize(void) override;
+  int  Range(PGLOBAL g, int limit = 0, bool incl = true) override;
+  int  MaxRange(void) override {return MaxSame;}
   virtual int  ColMaxSame(PXCOL kp);
-  virtual void Close(void);
-  virtual bool NextVal(bool eq);
-  virtual bool PrevVal(void);
-  virtual bool Make(PGLOBAL g, PIXDEF sxp);
+  void Close(void) override;
+  bool NextVal(bool eq) override;
+  bool PrevVal(void) override;
+  bool Make(PGLOBAL g, PIXDEF sxp) override;
   virtual bool SaveIndex(PGLOBAL g, PIXDEF sxp);
-  virtual bool Reorder(PGLOBAL g);
+  bool Reorder(PGLOBAL g) override;
           bool GetAllSizes(PGLOBAL g,/* int &ndif,*/ int &numk);
 
  protected:
@@ -310,16 +310,16 @@ class DllExport XINDXS : public XINDEX {
   XINDXS(PTDBDOS tdbp, PIXDEF xdp, PXLOAD pxp, PCOL *cp, PXOB *xp = NULL);
 
   // Implementation
-  virtual void SetNval(int n) {assert(n == 1);}
+  void SetNval(int n) override {assert(n == 1);}
 
   // Methods
-  virtual int  Qcompare(int *, int *);
-  virtual int  Fetch(PGLOBAL g);
-  virtual int  FastFind(void);
-  virtual bool NextVal(bool eq);
-  virtual bool PrevVal(void);
-  virtual int  Range(PGLOBAL g, int limit = 0, bool incl = true);
-  virtual int  GroupSize(void);
+  int  Qcompare(int *, int *) override;
+  int  Fetch(PGLOBAL g) override;
+  int  FastFind(void) override;
+  bool NextVal(bool eq) override;
+  bool PrevVal(void) override;
+  int  Range(PGLOBAL g, int limit = 0, bool incl = true) override;
+  int  GroupSize(void) override;
 
  protected:
   // Members
@@ -367,14 +367,14 @@ class DllExport XFILE : public XLOAD {
   XFILE(void);
 
   // Methods
-  virtual bool  Open(PGLOBAL g, char *filename, int id, MODE mode);
-  virtual bool  Seek(PGLOBAL g, int low, int high, int origin);
-  virtual bool  Read(PGLOBAL g, void *buf, int n, int size);
-  virtual int   Write(PGLOBAL g, void *buf, int n, int size, bool& rc);
-  virtual void  Close(char *fn, int id);
-  virtual void  Close(void);
+  bool  Open(PGLOBAL g, char *filename, int id, MODE mode) override;
+  bool  Seek(PGLOBAL g, int low, int high, int origin) override;
+  bool  Read(PGLOBAL g, void *buf, int n, int size) override;
+  int   Write(PGLOBAL g, void *buf, int n, int size, bool& rc) override;
+  void  Close(char *fn, int id) override;
+  void  Close(void) override;
 #if defined(XMAP)
-  virtual void *FileView(PGLOBAL g, char *fn);
+  void *FileView(PGLOBAL g, char *fn) override;
 #endif   // XMAP
 
  protected:
@@ -395,13 +395,13 @@ class DllExport XHUGE : public XLOAD {
 
   // Methods
   using XLOAD::Close;
-  virtual bool  Open(PGLOBAL g, char *filename, int id, MODE mode);
-  virtual bool  Seek(PGLOBAL g, int low, int high, int origin);
-  virtual bool  Read(PGLOBAL g, void *buf, int n, int size);
-  virtual int   Write(PGLOBAL g, void *buf, int n, int size, bool& rc);
-  virtual void  Close(char *fn, int id);
+  bool  Open(PGLOBAL g, char *filename, int id, MODE mode) override;
+  bool  Seek(PGLOBAL g, int low, int high, int origin) override;
+  bool  Read(PGLOBAL g, void *buf, int n, int size) override;
+  int   Write(PGLOBAL g, void *buf, int n, int size, bool& rc) override;
+  void  Close(char *fn, int id) override;
 #if defined(XMAP)
-  virtual void *FileView(PGLOBAL g, char *fn);
+  void *FileView(PGLOBAL g, char *fn) override;
 #endif   // XMAP
 
  protected:
@@ -418,21 +418,21 @@ class DllExport XXROW : public XXBASE {
   XXROW(PTDBDOS tbxp);
 
   // Implementation
-  virtual IDT  GetType(void) {return TYPE_IDX_XROW;}
-  virtual void Reset(void);
+  IDT  GetType(void) override {return TYPE_IDX_XROW;}
+  void Reset(void) override;
 
   // Methods
-  virtual bool Init(PGLOBAL g);
+  bool Init(PGLOBAL g) override;
 #if defined(XMAP)
-  virtual bool MapInit(PGLOBAL) {return true;}
+  bool MapInit(PGLOBAL) override {return true;}
 #endif   // XMAP
-  virtual int  Fetch(PGLOBAL g);
-  virtual int  FastFind(void);
-  virtual int  MaxRange(void) {return 1;}
-  virtual int  Range(PGLOBAL g, int limit = 0, bool incl = true);
-  virtual int  Qcompare(int *, int *) {assert(false); return 0;}
-  virtual bool Make(PGLOBAL, PIXDEF) {return false;}
-  virtual void Close(void) {}
+  int  Fetch(PGLOBAL g) override;
+  int  FastFind(void) override;
+  int  MaxRange(void) override {return 1;}
+  int  Range(PGLOBAL g, int limit = 0, bool incl = true) override;
+  int  Qcompare(int *, int *) override {assert(false); return 0;}
+  bool Make(PGLOBAL, PIXDEF) override {return false;}
+  void Close(void) override {}
 
  protected:
   // Members
diff --git a/storage/connect/xobject.h b/storage/connect/xobject.h
index 5b50e9320f5..9d8651a3b87 100644
--- a/storage/connect/xobject.h
+++ b/storage/connect/xobject.h
@@ -75,17 +75,17 @@ class DllExport XVOID : public XOBJECT {
   XVOID(void) {Constant = true;}
 
   // Implementation
-  virtual int    GetType(void) {return TYPE_VOID;}
-  virtual int    GetLength(void) {return 0;}
-  virtual int    GetLengthEx(void) {return 0;}
-  virtual PSZ    GetCharValue(void) {return NULL;}
-  virtual int    GetIntValue(void) {return 0;}
-  virtual double GetFloatValue(void) {return 0.0;}
-  virtual int    GetScale() {return 0;}
+  int    GetType(void) override {return TYPE_VOID;}
+  int    GetLength(void) override {return 0;}
+  int    GetLengthEx(void) override {return 0;}
+  PSZ    GetCharValue(void) override {return NULL;}
+  int    GetIntValue(void) override {return 0;}
+  double GetFloatValue(void) override {return 0.0;}
+  int    GetScale() override {return 0;}
 
   // Methods
-  virtual bool   Compare(PXOB xp) {return xp->GetType() == TYPE_VOID;}
-  virtual bool   SetFormat(PGLOBAL, FORMAT&) {return true;}
+  bool   Compare(PXOB xp) override {return xp->GetType() == TYPE_VOID;}
+  bool   SetFormat(PGLOBAL, FORMAT&) override {return true;}
   }; // end of class XVOID
 
 
@@ -100,20 +100,20 @@ class DllExport CONSTANT : public XOBJECT {
   CONSTANT(PVAL valp) {Value = valp; Constant = true;}
 
   // Implementation
-  virtual int    GetType(void) {return TYPE_CONST;}
-  virtual int    GetResultType(void) {return Value->Type;}
-  virtual int    GetLength(void) {return Value->GetValLen();}
-  virtual int    GetScale() {return Value->GetValPrec();}
-  virtual int    GetLengthEx(void);
+  int    GetType(void) override {return TYPE_CONST;}
+  int    GetResultType(void) override {return Value->Type;}
+  int    GetLength(void) override {return Value->GetValLen();}
+  int    GetScale() override {return Value->GetValPrec();}
+  int    GetLengthEx(void) override;
 
   // Methods
-  virtual bool   Compare(PXOB xp);
-  virtual bool   SetFormat(PGLOBAL g, FORMAT& fmt)
+  bool   Compare(PXOB xp) override;
+  bool   SetFormat(PGLOBAL g, FORMAT& fmt) override
                  {return Value->SetConstFormat(g, fmt);}
           void   Convert(PGLOBAL g, int newtype);
           void   SetValue(PVAL vp) {Value = vp;}
-  virtual void   Printf(PGLOBAL g, FILE *, uint);
-  virtual void   Prints(PGLOBAL g, char *, uint);
+  void   Printf(PGLOBAL g, FILE *, uint) override;
+  void   Prints(PGLOBAL g, char *, uint) override;
   }; // end of class CONSTANT
 
 /***********************************************************************/
diff --git a/storage/connect/xtable.h b/storage/connect/xtable.h
index 58acf550a0b..a96b5c6b3c6 100644
--- a/storage/connect/xtable.h
+++ b/storage/connect/xtable.h
@@ -109,8 +109,8 @@ class DllExport TDB: public BLOCK {     // Table Descriptor Block.
   virtual PTDB   Copy(PTABS t);
   virtual void   PrintAM(FILE *f, char *m)
                   {fprintf(f, "%s AM(%d)\n",  m, GetAmType());}
-  virtual void   Printf(PGLOBAL g, FILE *f, uint n);
-  virtual void   Prints(PGLOBAL g, char *ps, uint z);
+  void   Printf(PGLOBAL g, FILE *f, uint n) override;
+  void   Prints(PGLOBAL g, char *ps, uint z) override;
   virtual PCSZ   GetServer(void) = 0;
   virtual int    GetBadLines(void) {return 0;}
 	virtual CHARSET_INFO *data_charset(void);
@@ -173,7 +173,7 @@ class DllExport TDBASE : public TDB {
   inline  void    SetKindex(PKXBASE kxp) {To_Kindex = kxp;}
 
   // Properties
-	PKXBASE GetKindex(void) {return To_Kindex;}
+	PKXBASE GetKindex(void) override {return To_Kindex;}
 	PXOB   *GetLink(void) {return To_Link;}
 	PIXDEF  GetXdp(void) {return To_Xdp;}
 	void    ResetKindex(PGLOBAL g, PKXBASE kxp);
@@ -182,17 +182,17 @@ class DllExport TDBASE : public TDB {
 
   // Methods
   virtual bool   IsUsingTemp(PGLOBAL) {return false;}
-  virtual PCATLG GetCat(void);
-  virtual void   PrintAM(FILE *f, char *m);
-  virtual int    GetProgMax(PGLOBAL g) {return GetMaxSize(g);}
+  PCATLG GetCat(void) override;
+  void   PrintAM(FILE *f, char *m) override;
+  int    GetProgMax(PGLOBAL g) override {return GetMaxSize(g);}
   virtual void   RestoreNrec(void) {}
   virtual int    ResetTableOpt(PGLOBAL g, bool dop, bool dox);
-  virtual PCSZ   GetServer(void) {return "Current";}
+  PCSZ   GetServer(void) override {return "Current";}
 
   // Database routines
   virtual int  MakeIndex(PGLOBAL g, PIXDEF, bool)
                 {strcpy(g->Message, "Remote index"); return RC_INFO;}
-  virtual bool ReadKey(PGLOBAL, OPVAL, const key_range *)
+  bool ReadKey(PGLOBAL, OPVAL, const key_range *) override
                       {assert(false); return true;}
 
  protected:
@@ -218,23 +218,23 @@ class DllExport TDBCAT : public TDBASE {
   TDBCAT(PTABDEF tdp);
 
   // Implementation
-  virtual AMT  GetAmType(void) {return TYPE_AM_CAT;}
+  AMT  GetAmType(void) override {return TYPE_AM_CAT;}
 
   // Methods
-  virtual int  GetRecpos(void) {return N;}
-  virtual int  GetProgCur(void) {return N;}
-  virtual int  RowNumber(PGLOBAL, bool = false) {return N + 1;}
-  virtual bool SetRecpos(PGLOBAL g, int recpos);
+  int  GetRecpos(void) override {return N;}
+  int  GetProgCur(void) override {return N;}
+  int  RowNumber(PGLOBAL, bool = false) override {return N + 1;}
+  bool SetRecpos(PGLOBAL g, int recpos) override;
 
   // Database routines
-  virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
-	virtual int  Cardinality(PGLOBAL) {return 10;}	 // To avoid assert
-	virtual int  GetMaxSize(PGLOBAL g);
-  virtual bool OpenDB(PGLOBAL g);
-  virtual int  ReadDB(PGLOBAL g);
-  virtual int  WriteDB(PGLOBAL g);
-  virtual int  DeleteDB(PGLOBAL g, int irc);
-  virtual void CloseDB(PGLOBAL g);
+  PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n) override;
+	int  Cardinality(PGLOBAL) override {return 10;}	 // To avoid assert
+	int  GetMaxSize(PGLOBAL g) override;
+  bool OpenDB(PGLOBAL g) override;
+  int  ReadDB(PGLOBAL g) override;
+  int  WriteDB(PGLOBAL g) override;
+  int  DeleteDB(PGLOBAL g, int irc) override;
+  void CloseDB(PGLOBAL g) override;
 
  protected:
   // Specific routines
@@ -258,10 +258,10 @@ class DllExport CATCOL : public COLBLK {
   CATCOL(PCOLDEF cdp, PTDB tdbp, int n);
 
   // Implementation
-  virtual int  GetAmType(void) {return TYPE_AM_ODBC;}
+  int  GetAmType(void) override {return TYPE_AM_ODBC;}
 
   // Methods
-	virtual void ReadColumn(PGLOBAL g);
+	void ReadColumn(PGLOBAL g) override;
 
  protected:
   CATCOL(void) = default;              // Default constructor not to be used
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 856bb789320..4b59f5c4d48 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.h
@@ -102,14 +102,14 @@ public:
       delete file_buff;
     free_root(&blobroot, MYF(0));
   }
-  const char *index_type(uint inx) { return "NONE"; }
-  ulonglong table_flags() const
+  const char *index_type(uint inx) override { return "NONE"; }
+  ulonglong table_flags() const override
   {
     return (HA_NO_TRANSACTIONS | HA_REC_NOT_IN_SEQ | HA_NO_AUTO_INCREMENT |
             HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_CAN_EXPORT |
             HA_CAN_REPAIR | HA_SLOW_RND_POS);
   }
-  ulong index_flags(uint idx, uint part, bool all_parts) const
+  ulong index_flags(uint idx, uint part, bool all_parts) const override
   {
     /*
       We will never have indexes so this will never be called(AKA we return
@@ -124,7 +124,7 @@ public:
   /*
      Called in test_quick_select to determine if indexes should be used.
    */
-  virtual IO_AND_CPU_COST scan_time()
+  IO_AND_CPU_COST scan_time() override
   {
     return
     { (double) ((share->saved_data_file_length + IO_SIZE-1))/ IO_SIZE,
@@ -137,38 +137,38 @@ public:
     (e.g. save number of records seen on full table scan and/or use file size
     as upper bound)
   */
-  ha_rows estimate_rows_upper_bound() { return HA_POS_ERROR; }
+  ha_rows estimate_rows_upper_bound() override { return HA_POS_ERROR; }
 
-  int open(const char *name, int mode, uint open_options);
-  int close(void);
-  int write_row(const uchar * buf);
-  int update_row(const uchar * old_data, const uchar * new_data);
-  int delete_row(const uchar * buf);
-  int rnd_init(bool scan=1);
-  int rnd_next(uchar *buf);
-  int rnd_pos(uchar * buf, uchar *pos);
-  bool check_and_repair(THD *thd);
-  int check(THD* thd, HA_CHECK_OPT* check_opt);
-  bool is_crashed() const;
-  int rnd_end();
-  int repair(THD* thd, HA_CHECK_OPT* check_opt);
+  int open(const char *name, int mode, uint open_options) override;
+  int close(void) override;
+  int write_row(const uchar * buf) override;
+  int update_row(const uchar * old_data, const uchar * new_data) override;
+  int delete_row(const uchar * buf) override;
+  int rnd_init(bool scan=1) override;
+  int rnd_next(uchar *buf) override;
+  int rnd_pos(uchar * buf, uchar *pos) override;
+  bool check_and_repair(THD *thd) override;
+  int check(THD* thd, HA_CHECK_OPT* check_opt) override;
+  bool is_crashed() const override;
+  int rnd_end() override;
+  int repair(THD* thd, HA_CHECK_OPT* check_opt) override;
   /* This is required for SQL layer to know that we support autorepair */
-  bool auto_repair(int error) const
+  bool auto_repair(int error) const override
   { return error == HA_ERR_CRASHED_ON_USAGE; }
   bool auto_repair() const { return 1; }
-  void position(const uchar *record);
-  int info(uint);
-  int reset();
-  int extra(enum ha_extra_function operation);
-  int delete_all_rows(void);
-  int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info);
+  void position(const uchar *record) override;
+  int info(uint) override;
+  int reset() override;
+  int extra(enum ha_extra_function operation) override;
+  int delete_all_rows(void) override;
+  int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info) override;
   bool check_if_incompatible_data(HA_CREATE_INFO *info,
-                                  uint table_changes);
+                                  uint table_changes) override;
 
-  int external_lock(THD *thd, int lock_type);
+  int external_lock(THD *thd, int lock_type) override;
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-      enum thr_lock_type lock_type);
+      enum thr_lock_type lock_type) override;
 
   /*
     These functions used to get/update status of the handler.
diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h
index 1797031fc1f..95cf50de813 100644
--- a/storage/example/ha_example.h
+++ b/storage/example/ha_example.h
@@ -74,13 +74,13 @@ public:
     The name of the index type that will be used for display.
     Don't implement this method unless you really have indexes.
    */
-  const char *index_type(uint inx) { return "HASH"; }
+  const char *index_type(uint inx) override { return "HASH"; }
 
   /** @brief
     This is a list of flags that indicate what functionality the storage engine
     implements. The current table flags are documented in handler.h
   */
-  ulonglong table_flags() const
+  ulonglong table_flags() const override
   {
     /*
       We are saying that this engine is just statement capable to have
@@ -100,7 +100,7 @@ public:
     If all_parts is set, MariaDB wants to know the flags for the combined
     index, up to and including 'part'.
   */
-  ulong index_flags(uint inx, uint part, bool all_parts) const
+  ulong index_flags(uint inx, uint part, bool all_parts) const override
   {
     return 0;
   }
@@ -112,7 +112,7 @@ public:
     send. Return *real* limits of your storage engine here; MariaDB will do
     min(your_limits, MySQL_limits) automatically.
    */
-  uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
+  uint max_supported_record_length() const override { return HA_MAX_REC_LENGTH; }
 
   /** @brief
     unireg.cc will call this to make sure that the storage engine can handle
@@ -123,7 +123,7 @@ public:
     There is no need to implement ..._key_... methods if your engine doesn't
     support indexes.
    */
-  uint max_supported_keys()          const { return 0; }
+  uint max_supported_keys() const override { return 0; }
 
   /** @brief
     unireg.cc will call this to make sure that the storage engine can handle
@@ -134,7 +134,7 @@ public:
     There is no need to implement ..._key_... methods if your engine doesn't
     support indexes.
    */
-  uint max_supported_key_parts()     const { return 0; }
+  uint max_supported_key_parts() const override { return 0; }
 
   /** @brief
     unireg.cc will call this to make sure that the storage engine can handle
@@ -145,12 +145,12 @@ public:
     There is no need to implement ..._key_... methods if your engine doesn't
     support indexes.
    */
-  uint max_supported_key_length()    const { return 0; }
+  uint max_supported_key_length() const override { return 0; }
 
   /** @brief
     Called in test_quick_select to determine cost of table scan
   */
-  virtual IO_AND_CPU_COST scan_time()
+  virtual IO_AND_CPU_COST scan_time() override
   {
     IO_AND_CPU_COST cost;
     /* 0 blocks,  0.001 ms / row */
@@ -162,8 +162,8 @@ public:
   /** @brief
     This method will never be called if you do not implement indexes.
   */
-  virtual IO_AND_CPU_COST keyread_time(uint, ulong, ha_rows rows,
-                                       ulonglong blocks)
+  IO_AND_CPU_COST keyread_time(uint, ulong, ha_rows rows,
+                                       ulonglong blocks) override
   {
     IO_AND_CPU_COST cost;
     cost.io= blocks * DISK_READ_COST;
@@ -174,7 +174,7 @@ public:
   /** @brief
     Cost of fetching 'rows' records through rnd_pos()
   */
-  virtual IO_AND_CPU_COST rnd_pos_time(ha_rows rows)
+  IO_AND_CPU_COST rnd_pos_time(ha_rows rows) override
   {
    IO_AND_CPU_COST cost;
     /* 0 blocks,  0.001 ms / row */
@@ -192,61 +192,61 @@ public:
   /** @brief
     We implement this in ha_example.cc; it's a required method.
   */
-  int open(const char *name, int mode, uint test_if_locked);    // required
+  int open(const char *name, int mode, uint test_if_locked) override;    // required
 
   /** @brief
     We implement this in ha_example.cc; it's a required method.
   */
-  int close(void);                                              // required
+  int close(void) override;                                              // required
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
-  int write_row(const uchar *buf);
+  int write_row(const uchar *buf) override;
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
-  int update_row(const uchar *old_data, const uchar *new_data);
+  int update_row(const uchar *old_data, const uchar *new_data) override;
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
-  int delete_row(const uchar *buf);
+  int delete_row(const uchar *buf) override;
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
   int index_read_map(uchar *buf, const uchar *key,
-                     key_part_map keypart_map, enum ha_rkey_function find_flag);
+                     key_part_map keypart_map, enum ha_rkey_function find_flag) override;
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
-  int index_next(uchar *buf);
+  int index_next(uchar *buf) override;
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
-  int index_prev(uchar *buf);
+  int index_prev(uchar *buf) override;
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
-  int index_first(uchar *buf);
+  int index_first(uchar *buf) override;
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
     skip it and and MariaDB will treat it as not implemented.
   */
-  int index_last(uchar *buf);
+  int index_last(uchar *buf) override;
 
   /** @brief
     Unlike index_init(), rnd_init() can be called two consecutive times
@@ -256,24 +256,24 @@ public:
     cursor to the start of the table; no need to deallocate and allocate
     it again. This is a required method.
   */
-  int rnd_init(bool scan);                                      //required
-  int rnd_end();
-  int rnd_next(uchar *buf);                                     ///< required
-  int rnd_pos(uchar *buf, uchar *pos);                          ///< required
-  void position(const uchar *record);                           ///< required
-  int info(uint);                                               ///< required
-  int extra(enum ha_extra_function operation);
-  int external_lock(THD *thd, int lock_type);                   ///< required
-  int delete_all_rows(void);
+  int rnd_init(bool scan) override;                                      //required
+  int rnd_end() override;
+  int rnd_next(uchar *buf) override;                                     ///< required
+  int rnd_pos(uchar *buf, uchar *pos) override;                          ///< required
+  void position(const uchar *record) override;                           ///< required
+  int info(uint) override;                                               ///< required
+  int extra(enum ha_extra_function operation) override;
+  int external_lock(THD *thd, int lock_type) override;                   ///< required
+  int delete_all_rows(void) override;
   ha_rows records_in_range(uint inx, const key_range *min_key,
-                           const key_range *max_key, page_range *pages);
-  int delete_table(const char *from);
+                           const key_range *max_key, page_range *pages) override;
+  int delete_table(const char *from) override;
   int create(const char *name, TABLE *form,
-             HA_CREATE_INFO *create_info);                      ///< required
+             HA_CREATE_INFO *create_info) override;                      ///< required
   enum_alter_inplace_result
   check_if_supported_inplace_alter(TABLE* altered_table,
-                                   Alter_inplace_info* ha_alter_info);
+                                   Alter_inplace_info* ha_alter_info) override;
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type);     ///< required
+                             enum thr_lock_type lock_type) override;     ///< required
 };
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 7fc88ba0ab1..ad5aa864f5b 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -1670,7 +1670,7 @@ public:
 public:
   bool handle_condition(THD *thd, uint sql_errno, const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
-                        const char* msg, Sql_condition ** cond_hdl)
+                        const char* msg, Sql_condition ** cond_hdl) override
   {
     return sql_errno >= ER_ABORTING_CONNECTION &&
            sql_errno <= ER_NET_WRITE_INTERRUPTED;
diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
index b5ee49755cb..524b033f613 100644
--- a/storage/federated/ha_federated.h
+++ b/storage/federated/ha_federated.h
@@ -131,13 +131,13 @@ public:
     don't implement this method unless you really have indexes
    */
   // perhaps get index type
-  const char *index_type(uint inx) { return "REMOTE"; }
+  const char *index_type(uint inx) override { return "REMOTE"; }
   /*
     This is a list of flags that says what the storage engine
     implements. The current table flags are documented in
     handler.h
   */
-  ulonglong table_flags() const
+  ulonglong table_flags() const override
   {
     /* fix server to be able to get remote server table flags */
     return (HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED
@@ -160,15 +160,15 @@ public:
     index up to and including 'part'.
   */
     /* fix server to be able to get remote server index flags */
-  ulong index_flags(uint inx, uint part, bool all_parts) const
+  ulong index_flags(uint inx, uint part, bool all_parts) const override
   {
     return (HA_READ_NEXT | HA_READ_RANGE | HA_READ_AFTER_KEY);
   }
-  uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
-  uint max_supported_keys()          const { return MAX_KEY; }
-  uint max_supported_key_parts()     const { return MAX_REF_PARTS; }
-  uint max_supported_key_length()    const { return FEDERATED_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length() const { return FEDERATED_MAX_KEY_LENGTH; }
+  uint max_supported_record_length() const override { return HA_MAX_REC_LENGTH; }
+  uint max_supported_keys() const       override { return MAX_KEY; }
+  uint max_supported_key_parts() const  override { return MAX_REF_PARTS; }
+  uint max_supported_key_length() const override { return FEDERATED_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length() const override { return FEDERATED_MAX_KEY_LENGTH; }
   /*
     Called in test_quick_select to determine if indexes should be used.
     Normally, we need to know number of blocks . For federated we need to
@@ -181,7 +181,7 @@ public:
     this to use indexes "
   */
 
-  IO_AND_CPU_COST scan_time()
+  IO_AND_CPU_COST scan_time() override
   {
     DBUG_PRINT("info", ("records %lu", (ulong) stats.records));
     return
@@ -192,41 +192,41 @@ public:
     };
   }
   IO_AND_CPU_COST keyread_time(uint index, ulong ranges, ha_rows rows,
-                               ulonglong blocks)
+                               ulonglong blocks) override
   {
     return {0, (double) (ranges + rows) * DISK_READ_COST };
   }
-  IO_AND_CPU_COST rnd_pos_time(ha_rows rows)
+  IO_AND_CPU_COST rnd_pos_time(ha_rows rows) override
   {
     return {0, (double) rows * DISK_READ_COST };
   }
-  const key_map *keys_to_use_for_scanning() { return &key_map_full; }
+  const key_map *keys_to_use_for_scanning() override { return &key_map_full; }
   /*
     Everything below are methods that we implment in ha_federated.cc.
 
     Most of these methods are not obligatory, skip them and
     MySQL will treat them as not implemented
   */
-  int open(const char *name, int mode, uint test_if_locked);    // required
-  int close(void);                                              // required
+  int open(const char *name, int mode, uint test_if_locked) override;    // required
+  int close(void) override;                                              // required
 
-  void start_bulk_insert(ha_rows rows, uint flags);
-  int end_bulk_insert();
-  int write_row(const uchar *buf);
-  int update_row(const uchar *old_data, const uchar *new_data);
-  int delete_row(const uchar *buf);
-  int index_init(uint keynr, bool sorted);
-  ha_rows estimate_rows_upper_bound();
+  void start_bulk_insert(ha_rows rows, uint flags) override;
+  int end_bulk_insert() override;
+  int write_row(const uchar *buf) override;
+  int update_row(const uchar *old_data, const uchar *new_data) override;
+  int delete_row(const uchar *buf) override;
+  int index_init(uint keynr, bool sorted) override;
+  ha_rows estimate_rows_upper_bound() override;
   int index_read(uchar *buf, const uchar *key,
-                 uint key_len, enum ha_rkey_function find_flag);
+                 uint key_len, enum ha_rkey_function find_flag) override;
   int index_read_idx(uchar *buf, uint idx, const uchar *key,
                      uint key_len, enum ha_rkey_function find_flag);
-  int index_next(uchar *buf);
-  int index_end();
+  int index_next(uchar *buf) override;
+  int index_end() override;
   int read_range_first(const key_range *start_key,
                                const key_range *end_key,
-                               bool eq_range, bool sorted);
-  int read_range_next();
+                               bool eq_range, bool sorted) override;
+  int read_range_next() override;
   /*
     unlike index_init(), rnd_init() can be called two times
     without rnd_end() in between (it only makes sense if scan=1).
@@ -235,51 +235,51 @@ public:
     position it to the start of the table, no need to deallocate
     and allocate it again
   */
-  int rnd_init(bool scan);                                      //required
-  int rnd_end();
-  int rnd_next(uchar *buf);                                      //required
+  int rnd_init(bool scan) override;                                      //required
+  int rnd_end() override;
+  int rnd_next(uchar *buf) override;                                      //required
   int rnd_next_int(uchar *buf);
-  int rnd_pos(uchar *buf, uchar *pos);                            //required
-  void position(const uchar *record);                            //required
+  int rnd_pos(uchar *buf, uchar *pos) override;                            //required
+  void position(const uchar *record) override;                            //required
   /*
     A ref is a pointer inside a local buffer. It is not comparable to
     other ref's.
   */
-  int cmp_ref(const uchar *ref1, const uchar *ref2)
+  int cmp_ref(const uchar *ref1, const uchar *ref2) override
   {
     return handler::cmp_ref(ref1,ref2);    /* Works if table scan is used */
   }
-  int info(uint);                                              //required
-  int extra(ha_extra_function operation);
+  int info(uint) override;                                              //required
+  int extra(ha_extra_function operation) override;
 
   void update_auto_increment(void);
-  int repair(THD* thd, HA_CHECK_OPT* check_opt);
-  int optimize(THD* thd, HA_CHECK_OPT* check_opt);
-  int delete_table(const char *name)
+  int repair(THD* thd, HA_CHECK_OPT* check_opt) override;
+  int optimize(THD* thd, HA_CHECK_OPT* check_opt) override;
+  int delete_table(const char *name) override
   {
     return 0;
   }
-  int delete_all_rows(void);
-  int truncate();
+  int delete_all_rows(void) override;
+  int truncate() override;
   int create(const char *name, TABLE *form,
-             HA_CREATE_INFO *create_info);                      //required
+             HA_CREATE_INFO *create_info) override;                      //required
   ha_rows records_in_range(uint inx,
                            const key_range *start_key,
                            const key_range *end_key,
-                           page_range *pages);
-  uint8 table_cache_type() { return HA_CACHE_TBL_NOCACHE; }
+                           page_range *pages) override;
+  uint8 table_cache_type() override { return HA_CACHE_TBL_NOCACHE; }
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type);     //required
-  bool get_error_message(int error, String *buf);
+                             enum thr_lock_type lock_type) override;     //required
+  bool get_error_message(int error, String *buf) override;
   
   MYSQL_RES *store_result(MYSQL *mysql);
   void free_result();
   
-  int external_lock(THD *thd, int lock_type);
+  int external_lock(THD *thd, int lock_type) override;
   int connection_commit();
   int connection_rollback();
   int connection_autocommit(bool state);
   int execute_simple_query(const char *query, int len);
-  int reset(void);
+  int reset(void) override;
 };
diff --git a/storage/federatedx/federatedx_io_mysql.cc b/storage/federatedx/federatedx_io_mysql.cc
index 72b902987b5..b20873094da 100644
--- a/storage/federatedx/federatedx_io_mysql.cc
+++ b/storage/federatedx/federatedx_io_mysql.cc
@@ -73,55 +73,55 @@ class federatedx_io_mysql :public federatedx_io
   bool test_all_restrict() const;
 public:
   federatedx_io_mysql(FEDERATEDX_SERVER *);
-  ~federatedx_io_mysql();
+  ~federatedx_io_mysql() override;
 
   int simple_query(const char *fmt, ...);
-  int query(const char *buffer, size_t length);
-  virtual FEDERATEDX_IO_RESULT *store_result();
+  int query(const char *buffer, size_t length) override;
+  FEDERATEDX_IO_RESULT *store_result() override;
 
-  virtual size_t max_query_size() const;
+  size_t max_query_size() const override;
 
-  virtual my_ulonglong affected_rows() const;
-  virtual my_ulonglong last_insert_id() const;
+  my_ulonglong affected_rows() const override;
+  my_ulonglong last_insert_id() const override;
 
-  virtual int error_code();
-  virtual const char *error_str();
+  int error_code() override;
+  const char *error_str() override;
 
-  void reset();
-  int commit();
-  int rollback();
+  void reset() override;
+  int commit() override;
+  int rollback() override;
 
-  int savepoint_set(ulong sp);
-  ulong savepoint_release(ulong sp);
-  ulong savepoint_rollback(ulong sp);
-  void savepoint_restrict(ulong sp);
+  int savepoint_set(ulong sp) override;
+  ulong savepoint_release(ulong sp) override;
+  ulong savepoint_rollback(ulong sp) override;
+  void savepoint_restrict(ulong sp) override;
 
-  ulong last_savepoint() const;
-  ulong actual_savepoint() const;
-  bool is_autocommit() const;
+  ulong last_savepoint() const override;
+  ulong actual_savepoint() const override;
+  bool is_autocommit() const override;
 
   bool table_metadata(ha_statistics *stats, const char *table_name,
-                      uint table_name_length, uint flag);
+                      uint table_name_length, uint flag) override;
 
   /* resultset operations */
 
-  virtual void free_result(FEDERATEDX_IO_RESULT *io_result);
-  virtual unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result);
-  virtual my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result);
-  virtual FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
-                                       FEDERATEDX_IO_ROWS **current= NULL);
-  virtual ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result);
-  virtual const char *get_column_data(FEDERATEDX_IO_ROW *row,
-                                      unsigned int column);
-  virtual bool is_column_null(const FEDERATEDX_IO_ROW *row,
-                              unsigned int column) const;
+  void free_result(FEDERATEDX_IO_RESULT *io_result) override;
+  unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result) override;
+  my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result) override;
+  FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
+                                       FEDERATEDX_IO_ROWS **current= NULL) override;
+  ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result) override;
+  const char *get_column_data(FEDERATEDX_IO_ROW *row,
+                                      unsigned int column) override;
+  bool is_column_null(const FEDERATEDX_IO_ROW *row,
+                              unsigned int column) const override;
 
-  virtual size_t get_ref_length() const;
-  virtual void mark_position(FEDERATEDX_IO_RESULT *io_result,
-                             void *ref, FEDERATEDX_IO_ROWS *current);
-  virtual int seek_position(FEDERATEDX_IO_RESULT **io_result,
-                            const void *ref);
-  virtual void set_thd(void *thd);
+  size_t get_ref_length() const override;
+  void mark_position(FEDERATEDX_IO_RESULT *io_result,
+                             void *ref, FEDERATEDX_IO_ROWS *current) override;
+  int seek_position(FEDERATEDX_IO_RESULT **io_result,
+                            const void *ref) override;
+  void set_thd(void *thd) override;
 };
 
 
diff --git a/storage/federatedx/federatedx_io_null.cc b/storage/federatedx/federatedx_io_null.cc
index 8a2394f2150..24e499e4ba4 100644
--- a/storage/federatedx/federatedx_io_null.cc
+++ b/storage/federatedx/federatedx_io_null.cc
@@ -56,52 +56,52 @@ class federatedx_io_null :public federatedx_io
 {
 public:
   federatedx_io_null(FEDERATEDX_SERVER *);
-  ~federatedx_io_null();
+  ~federatedx_io_null() override;
 
-  int query(const char *buffer, size_t length);
-  virtual FEDERATEDX_IO_RESULT *store_result();
+  int query(const char *buffer, size_t length) override;
+  FEDERATEDX_IO_RESULT *store_result() override;
 
-  virtual size_t max_query_size() const;
+  size_t max_query_size() const override;
 
-  virtual my_ulonglong affected_rows() const;
-  virtual my_ulonglong last_insert_id() const;
+  my_ulonglong affected_rows() const override;
+  my_ulonglong last_insert_id() const override;
 
-  virtual int error_code();
-  virtual const char *error_str();
+  int error_code() override;
+  const char *error_str() override;
   
-  void reset();
-  int commit();
-  int rollback();
+  void reset() override;
+  int commit() override;
+  int rollback() override;
   
-  int savepoint_set(ulong sp);
-  ulong savepoint_release(ulong sp);
-  ulong savepoint_rollback(ulong sp);
-  void savepoint_restrict(ulong sp);
+  int savepoint_set(ulong sp) override;
+  ulong savepoint_release(ulong sp) override;
+  ulong savepoint_rollback(ulong sp) override;
+  void savepoint_restrict(ulong sp) override;
   
-  ulong last_savepoint() const;
-  ulong actual_savepoint() const;
-  bool is_autocommit() const;
+  ulong last_savepoint() const override;
+  ulong actual_savepoint() const override;
+  bool is_autocommit() const override;
 
   bool table_metadata(ha_statistics *stats, const char *table_name,
-                      uint table_name_length, uint flag);
+                      uint table_name_length, uint flag) override;
   
   /* resultset operations */
   
-  virtual void free_result(FEDERATEDX_IO_RESULT *io_result);
-  virtual unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result);
-  virtual my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result);
-  virtual FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
-                                       FEDERATEDX_IO_ROWS **current= NULL);
-  virtual ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result);
-  virtual const char *get_column_data(FEDERATEDX_IO_ROW *row,
-                                      unsigned int column);
-  virtual bool is_column_null(const FEDERATEDX_IO_ROW *row,
-                              unsigned int column) const;
-  virtual size_t get_ref_length() const;
-  virtual void mark_position(FEDERATEDX_IO_RESULT *io_result,
-                             void *ref, FEDERATEDX_IO_ROWS *current);
-  virtual int seek_position(FEDERATEDX_IO_RESULT **io_result,
-                            const void *ref);
+  void free_result(FEDERATEDX_IO_RESULT *io_result) override;
+  unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result) override;
+  my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result) override;
+  FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
+                                       FEDERATEDX_IO_ROWS **current= NULL) override;
+  ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result) override;
+  const char *get_column_data(FEDERATEDX_IO_ROW *row,
+                                      unsigned int column) override;
+  bool is_column_null(const FEDERATEDX_IO_ROW *row,
+                              unsigned int column) const override;
+  size_t get_ref_length() const override;
+  void mark_position(FEDERATEDX_IO_RESULT *io_result,
+                             void *ref, FEDERATEDX_IO_ROWS *current) override;
+  int seek_position(FEDERATEDX_IO_RESULT **io_result,
+                            const void *ref) override;
 };
 
 
diff --git a/storage/federatedx/federatedx_pushdown.h b/storage/federatedx/federatedx_pushdown.h
index 1d5bdab1378..cea1192b919 100644
--- a/storage/federatedx/federatedx_pushdown.h
+++ b/storage/federatedx/federatedx_pushdown.h
@@ -48,9 +48,9 @@ private:
 public:
   ha_federatedx_derived_handler(THD* thd_arg, TABLE_LIST *tbl, TABLE *tbl_arg);
   ~ha_federatedx_derived_handler();
-  int init_scan() { return federatedx_handler_base::init_scan_(); }
-  int next_row() { return federatedx_handler_base::next_row_(table); }
-  int end_scan() { return federatedx_handler_base::end_scan_(); }
+  int init_scan() override { return federatedx_handler_base::init_scan_(); }
+  int next_row() override { return federatedx_handler_base::next_row_(table); }
+  int end_scan() override { return federatedx_handler_base::end_scan_(); }
 };
 
 
@@ -67,9 +67,9 @@ public:
   ha_federatedx_select_handler(THD *thd_arg, SELECT_LEX *sel_lex,
                                SELECT_LEX_UNIT *sel_unit, TABLE *tbl);
   ~ha_federatedx_select_handler();
-  int init_scan() { return federatedx_handler_base::init_scan_(); }
-  int next_row() { return federatedx_handler_base::next_row_(table); }
-  int end_scan();
+  int init_scan() override { return federatedx_handler_base::init_scan_(); }
+  int next_row() override { return federatedx_handler_base::next_row_(table); }
+  int end_scan() override;
 
 private:
   static constexpr auto PRINT_QUERY_TYPE=
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index e3ae71335a1..85fe079b4eb 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -1836,7 +1836,7 @@ public:
 public:
   bool handle_condition(THD *thd, uint sql_errno, const char* sqlstate,
                         Sql_condition::enum_warning_level *level,
-                        const char* msg, Sql_condition ** cond_hdl)
+                        const char* msg, Sql_condition ** cond_hdl) override
   {
     return sql_errno >= ER_ABORTING_CONNECTION &&
            sql_errno <= ER_NET_WRITE_INTERRUPTED;
diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h
index cefd8859859..fce761540b3 100644
--- a/storage/federatedx/ha_federatedx.h
+++ b/storage/federatedx/ha_federatedx.h
@@ -321,13 +321,13 @@ public:
     don't implement this method unless you really have indexes
    */
   // perhaps get index type
-  const char *index_type(uint inx) { return "REMOTE"; }
+  const char *index_type(uint inx) override { return "REMOTE"; }
   /*
     This is a list of flags that says what the storage engine
     implements. The current table flags are documented in
     handler.h
   */
-  ulonglong table_flags() const
+  ulonglong table_flags() const override
   {
     /* fix server to be able to get remote server table flags */
     return (HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED
@@ -347,15 +347,15 @@ public:
     index up to and including 'part'.
   */
     /* fix server to be able to get remote server index flags */
-  ulong index_flags(uint inx, uint part, bool all_parts) const
+  ulong index_flags(uint inx, uint part, bool all_parts) const override
   {
     return (HA_READ_NEXT | HA_READ_RANGE);
   }
-  uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
-  uint max_supported_keys()          const { return MAX_KEY; }
-  uint max_supported_key_parts()     const { return MAX_REF_PARTS; }
-  uint max_supported_key_length()    const { return FEDERATEDX_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length() const { return FEDERATEDX_MAX_KEY_LENGTH; }
+  uint max_supported_record_length() const override { return HA_MAX_REC_LENGTH; }
+  uint max_supported_keys() const       override { return MAX_KEY; }
+  uint max_supported_key_parts() const  override { return MAX_REF_PARTS; }
+  uint max_supported_key_length() const override { return FEDERATEDX_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length() const override { return FEDERATEDX_MAX_KEY_LENGTH; }
   /*
     Called in test_quick_select to determine if indexes should be used.
     Normally, we need to know number of blocks . For federatedx we need to
@@ -366,7 +366,7 @@ public:
     disk scan time on other side (block size, size of the row) + network time ...
     The reason for "1000" is that such a large number forces this to use indexes "
   */
-  IO_AND_CPU_COST scan_time()
+  IO_AND_CPU_COST scan_time() override
   {
     DBUG_PRINT("info", ("records %lu", (ulong) stats.records));
     return
@@ -377,42 +377,42 @@ public:
     };
   }
   IO_AND_CPU_COST keyread_time(uint index, ulong ranges, ha_rows rows,
-                               ulonglong blocks)
+                               ulonglong blocks) override
   {
     return {0, (double) (ranges + rows) * DISK_READ_COST };
   }
-  IO_AND_CPU_COST rnd_pos_time(ha_rows rows)
+  IO_AND_CPU_COST rnd_pos_time(ha_rows rows) override
   {
     return {0, (double) rows * DISK_READ_COST };
   }
 
-  const key_map *keys_to_use_for_scanning() { return &key_map_full; }
+  const key_map *keys_to_use_for_scanning() override { return &key_map_full; }
   /*
     Everything below are methods that we implement in ha_federatedx.cc.
 
     Most of these methods are not obligatory, skip them and
     MySQL will treat them as not implemented
   */
-  int open(const char *name, int mode, uint test_if_locked);    // required
-  int close(void);                                              // required
+  int open(const char *name, int mode, uint test_if_locked) override;    // required
+  int close(void) override;                                              // required
 
-  void start_bulk_insert(ha_rows rows, uint flags);
-  int end_bulk_insert();
-  int write_row(const uchar *buf);
-  int update_row(const uchar *old_data, const uchar *new_data);
-  int delete_row(const uchar *buf);
-  int index_init(uint keynr, bool sorted);
-  ha_rows estimate_rows_upper_bound();
+  void start_bulk_insert(ha_rows rows, uint flags) override;
+  int end_bulk_insert() override;
+  int write_row(const uchar *buf) override;
+  int update_row(const uchar *old_data, const uchar *new_data) override;
+  int delete_row(const uchar *buf) override;
+  int index_init(uint keynr, bool sorted) override;
+  ha_rows estimate_rows_upper_bound() override;
   int index_read(uchar *buf, const uchar *key,
-                 uint key_len, enum ha_rkey_function find_flag);
+                 uint key_len, enum ha_rkey_function find_flag) override;
   int index_read_idx(uchar *buf, uint idx, const uchar *key,
                      uint key_len, enum ha_rkey_function find_flag);
-  int index_next(uchar *buf);
-  int index_end();
+  int index_next(uchar *buf) override;
+  int index_end() override;
   int read_range_first(const key_range *start_key,
                                const key_range *end_key,
-                               bool eq_range, bool sorted);
-  int read_range_next();
+                               bool eq_range, bool sorted) override;
+  int read_range_next() override;
   /*
     unlike index_init(), rnd_init() can be called two times
     without rnd_end() in between (it only makes sense if scan=1).
@@ -421,16 +421,16 @@ public:
     position it to the start of the table, no need to deallocate
     and allocate it again
   */
-  int rnd_init(bool scan);                                      //required
-  int rnd_end();
-  int rnd_next(uchar *buf);                                      //required
-  int rnd_pos(uchar *buf, uchar *pos);                            //required
-  void position(const uchar *record);                            //required
+  int rnd_init(bool scan) override;                                      //required
+  int rnd_end() override;
+  int rnd_next(uchar *buf) override;                                      //required
+  int rnd_pos(uchar *buf, uchar *pos) override;                            //required
+  void position(const uchar *record) override;                            //required
   /*
     A ref is a pointer inside a local buffer. It is not comparable to
     other ref's. This is never called as HA_NON_COMPARABLE_ROWID is set.
   */
-  int cmp_ref(const uchar *ref1, const uchar *ref2)
+  int cmp_ref(const uchar *ref1, const uchar *ref2) override
   {
 #ifdef NOT_YET
     DBUG_ASSERT(0);
@@ -439,29 +439,29 @@ public:
     return handler::cmp_ref(ref1,ref2);         /* Works if table scan is used */
 #endif
   }
-  int info(uint);                                              //required
-  int extra(ha_extra_function operation);
+  int info(uint) override;                                              //required
+  int extra(ha_extra_function operation) override;
 
   void update_auto_increment(void);
-  int repair(THD* thd, HA_CHECK_OPT* check_opt);
-  int optimize(THD* thd, HA_CHECK_OPT* check_opt);
-  int delete_table(const char *name)
+  int repair(THD* thd, HA_CHECK_OPT* check_opt) override;
+  int optimize(THD* thd, HA_CHECK_OPT* check_opt) override;
+  int delete_table(const char *name) override
   {
     return 0;
   }
-  int delete_all_rows(void);
+  int delete_all_rows(void) override;
   int create(const char *name, TABLE *form,
-             HA_CREATE_INFO *create_info);                      //required
+             HA_CREATE_INFO *create_info) override;                      //required
   ha_rows records_in_range(uint inx, const key_range *start_key,
-                           const key_range *end_key, page_range *pages);
-  uint8 table_cache_type() { return HA_CACHE_TBL_NOCACHE; }
+                           const key_range *end_key, page_range *pages) override;
+  uint8 table_cache_type() override { return HA_CACHE_TBL_NOCACHE; }
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type);     //required
-  bool get_error_message(int error, String *buf);
-  int start_stmt(THD *thd, thr_lock_type lock_type);
-  int external_lock(THD *thd, int lock_type);
-  int reset(void);
+                             enum thr_lock_type lock_type) override;     //required
+  bool get_error_message(int error, String *buf) override;
+  int start_stmt(THD *thd, thr_lock_type lock_type) override;
+  int external_lock(THD *thd, int lock_type) override;
+  int reset(void) override;
   int free_result(void);
 
   const FEDERATEDX_SHARE *get_federatedx_share() const { return share; }
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
index 45207d9d02d..44e9db84be4 100644
--- a/storage/innobase/btr/btr0btr.cc
+++ b/storage/innobase/btr/btr0btr.cc
@@ -1126,7 +1126,7 @@ void btr_drop_temporary_table(const dict_table_t &table)
   {
     if (buf_block_t *block= buf_page_get_gen({SRV_TMP_SPACE_ID, index->page},
                                              0, RW_X_LATCH, nullptr, BUF_GET,
-                                             &mtr, nullptr))
+                                             &mtr, nullptr, nullptr))
     {
       btr_free_but_not_root(block, MTR_LOG_NO_REDO);
       mtr.set_log_mode(MTR_LOG_NO_REDO);
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
index f0ba346dd0e..2d5756b0dbf 100644
--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@@ -959,12 +959,21 @@ static int btr_latch_prev(buf_block_t *block, page_id_t page_id,
   buffer-fixes on both blocks will prevent eviction. */
 
  retry:
-  buf_block_t *prev= buf_page_get_gen(page_id, zip_size, RW_NO_LATCH, nullptr,
-                                      BUF_GET, mtr, err);
-  if (UNIV_UNLIKELY(!prev))
-    return 0;
-
+  /* Pass no_wait pointer to ensure that we don't wait on the current page
+  latch while holding the next page latch to avoid latch ordering violation. */
+  bool no_wait= false;
   int ret= 1;
+
+  buf_block_t *prev= buf_page_get_gen(page_id, zip_size, RW_NO_LATCH, nullptr,
+                                      BUF_GET, mtr, err,  &no_wait);
+  if (UNIV_UNLIKELY(!prev))
+  {
+    /* Check if we had to return because we couldn't wait on latch. */
+    if (no_wait)
+      goto ordered_latch;
+    return 0;
+  }
+
   static_assert(MTR_MEMO_PAGE_S_FIX == mtr_memo_type_t(BTR_SEARCH_LEAF), "");
   static_assert(MTR_MEMO_PAGE_X_FIX == mtr_memo_type_t(BTR_MODIFY_LEAF), "");
 
@@ -984,6 +993,7 @@ static int btr_latch_prev(buf_block_t *block, page_id_t page_id,
   {
     ut_ad(mtr->at_savepoint(mtr->get_savepoint() - 1)->page.id() == page_id);
     mtr->release_last_page();
+ordered_latch:
     if (rw_latch == RW_S_LATCH)
       block->page.lock.s_unlock();
     else
@@ -1220,7 +1230,7 @@ dberr_t btr_cur_t::search_leaf(const dtuple_t *tuple, page_cur_mode_t mode,
           ut_ad(rw_lock_type_t(latch_mode & ~12) == RW_X_LATCH);
           goto relatch_x;
         }
-        if (latch_mode != BTR_MODIFY_PREV)
+        else
         {
           if (!latch_by_caller)
             /* Release the tree s-latch */
@@ -1292,8 +1302,6 @@ dberr_t btr_cur_t::search_leaf(const dtuple_t *tuple, page_cur_mode_t mode,
 
     switch (latch_mode) {
     case BTR_SEARCH_PREV:
-    case BTR_MODIFY_PREV:
-      static_assert(BTR_MODIFY_PREV & BTR_MODIFY_LEAF, "");
       static_assert(BTR_SEARCH_PREV & BTR_SEARCH_LEAF, "");
       ut_ad(!latch_by_caller);
       ut_ad(rw_latch ==
@@ -1470,7 +1478,6 @@ release_tree:
     case BTR_MODIFY_ROOT_AND_LEAF:
       rw_latch= RW_X_LATCH;
       break;
-    case BTR_MODIFY_PREV: /* btr_pcur_move_to_prev() */
     case BTR_SEARCH_PREV: /* btr_pcur_move_to_prev() */
       ut_ad(rw_latch == RW_S_LATCH || rw_latch == RW_X_LATCH);
 
@@ -1854,7 +1861,6 @@ dberr_t btr_cur_t::open_leaf(bool first, dict_index_t *index,
     ut_ad(!(latch_mode & 8));
     /* This function doesn't need to lock left page of the leaf page */
     static_assert(int{BTR_SEARCH_PREV} == (4 | BTR_SEARCH_LEAF), "");
-    static_assert(int{BTR_MODIFY_PREV} == (4 | BTR_MODIFY_LEAF), "");
     latch_mode= btr_latch_mode(latch_mode & (RW_S_LATCH | RW_X_LATCH));
     ut_ad(!latch_by_caller ||
           mtr->memo_contains_flagged(&index->lock,
diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc
index 61afa3c9132..527ecfe354a 100644
--- a/storage/innobase/btr/btr0pcur.cc
+++ b/storage/innobase/btr/btr0pcur.cc
@@ -215,24 +215,18 @@ static bool btr_pcur_optimistic_latch_leaves(btr_pcur_t *pcur,
                                              btr_latch_mode *latch_mode,
                                              mtr_t *mtr)
 {
-  static_assert(BTR_SEARCH_PREV & BTR_SEARCH_LEAF, "");
-  static_assert(BTR_MODIFY_PREV & BTR_MODIFY_LEAF, "");
-  static_assert((BTR_SEARCH_PREV ^ BTR_MODIFY_PREV) ==
-                (RW_S_LATCH ^ RW_X_LATCH), "");
-
   buf_block_t *const block=
     buf_page_optimistic_fix(pcur->btr_cur.page_cur.block, pcur->old_page_id);
 
   if (!block)
     return false;
 
-  if (*latch_mode == BTR_SEARCH_LEAF || *latch_mode == BTR_MODIFY_LEAF)
+  if (*latch_mode != BTR_SEARCH_PREV)
+  {
+    ut_ad(*latch_mode == BTR_SEARCH_LEAF || *latch_mode == BTR_MODIFY_LEAF);
     return buf_page_optimistic_get(block, rw_lock_type_t(*latch_mode),
                                    pcur->modify_clock, mtr);
-
-  ut_ad(*latch_mode == BTR_SEARCH_PREV || *latch_mode == BTR_MODIFY_PREV);
-  const rw_lock_type_t mode=
-    rw_lock_type_t(*latch_mode & (RW_X_LATCH | RW_S_LATCH));
+  }
 
   uint64_t modify_clock;
   uint32_t left_page_no;
@@ -258,7 +252,7 @@ static bool btr_pcur_optimistic_latch_leaves(btr_pcur_t *pcur,
   {
     prev= buf_page_get_gen(page_id_t(pcur->old_page_id.space(),
                                      left_page_no), block->zip_size(),
-                           mode, nullptr, BUF_GET_POSSIBLY_FREED, mtr);
+                           RW_S_LATCH, nullptr, BUF_GET_POSSIBLY_FREED, mtr);
     if (!prev ||
         page_is_comp(prev->page.frame) != page_is_comp(block->page.frame) ||
         memcmp_aligned<2>(block->page.frame, prev->page.frame, 2) ||
@@ -269,7 +263,7 @@ static bool btr_pcur_optimistic_latch_leaves(btr_pcur_t *pcur,
   else
     prev= nullptr;
 
-  mtr->upgrade_buffer_fix(savepoint, mode);
+  mtr->upgrade_buffer_fix(savepoint, RW_S_LATCH);
 
   if (UNIV_UNLIKELY(block->modify_clock != modify_clock) ||
       UNIV_UNLIKELY(block->page.is_freed()) ||
@@ -343,11 +337,9 @@ btr_pcur_t::restore_position(btr_latch_mode restore_latch_mode, mtr_t *mtr)
 	ut_a(old_n_fields);
 
 	static_assert(BTR_SEARCH_PREV == (4 | BTR_SEARCH_LEAF), "");
-	static_assert(BTR_MODIFY_PREV == (4 | BTR_MODIFY_LEAF), "");
 
 	switch (restore_latch_mode | 4) {
 	case BTR_SEARCH_PREV:
-	case BTR_MODIFY_PREV:
 		/* Try optimistic restoration. */
 		if (btr_pcur_optimistic_latch_leaves(this, &restore_latch_mode,
 						     mtr)) {
@@ -579,7 +571,6 @@ btr_pcur_move_backward_from_page(
 	mtr_start(mtr);
 
 	static_assert(BTR_SEARCH_PREV == (4 | BTR_SEARCH_LEAF), "");
-	static_assert(BTR_MODIFY_PREV == (4 | BTR_MODIFY_LEAF), "");
 
 	if (UNIV_UNLIKELY(cursor->restore_position(
 				  btr_latch_mode(4 | latch_mode), mtr)
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 436ac5ece32..0832aefe364 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -2579,6 +2579,9 @@ err_exit:
 or BUF_PEEK_IF_IN_POOL
 @param[in]	mtr			mini-transaction
 @param[out]	err			DB_SUCCESS or error code
+@param[in,out]	no_wait			If not NULL on input, then we must not
+wait for current page latch. On output, the value is set to true if we had to
+return because we could not wait on page latch.
 @return pointer to the block or NULL */
 TRANSACTIONAL_TARGET
 buf_block_t*
@@ -2589,7 +2592,8 @@ buf_page_get_gen(
 	buf_block_t*		guess,
 	ulint			mode,
 	mtr_t*			mtr,
-	dberr_t*		err)
+	dberr_t*		err,
+        bool*			no_wait)
 {
 	ulint		retries = 0;
 
@@ -2598,9 +2602,12 @@ buf_page_get_gen(
 	recovery may be in progress. The only case when it may be
 	invoked outside recovery is when dict_create() has initialized
 	a new database and is invoking dict_boot(). In this case, the
-	LSN will be small. */
+	LSN will be small. At the end of a bootstrap, the shutdown LSN
+	would typically be around 60000 with the default
+	innodb_undo_tablespaces=3, and less than 110000 with the maximum
+	innodb_undo_tablespaces=127. */
 	ut_ad(mode == BUF_GET_RECOVER
-	      ? recv_recovery_is_on() || log_sys.get_lsn() < 50000
+	      ? recv_recovery_is_on() || log_sys.get_lsn() < 120000
 	      : !recv_recovery_is_on() || recv_sys.after_apply);
 	ut_ad(!mtr || mtr->is_active());
 	ut_ad(mtr || mode == BUF_PEEK_IF_IN_POOL);
@@ -2737,14 +2744,17 @@ ignore_unfixed:
 		in buf_page_t::read_complete() or
 		buf_pool_t::corrupted_evict(), or
 		after buf_zip_decompress() in this function. */
-		if (rw_latch != RW_NO_LATCH) {
+		if (!no_wait) {
 			block->page.lock.s_lock();
 		} else if (!block->page.lock.s_lock_try()) {
-			/* For RW_NO_LATCH, we should not try to acquire S or X
-			latch directly as we could be violating the latching
-			order resulting in deadlock. Instead we try latching the
-			page and retry in case of a failure. */
-			goto wait_for_read;
+			ut_ad(rw_latch == RW_NO_LATCH);
+			/* We should not wait trying to acquire S latch for
+			current page while holding latch for the next page.
+			It would violate the latching order resulting in
+			possible deadlock. Caller must handle the failure. */
+			block->page.unfix();
+			*no_wait= true;
+			return nullptr;
 		}
 		state = block->page.state();
 		ut_ad(state < buf_page_t::READ_FIX
@@ -2753,15 +2763,15 @@ ignore_unfixed:
 		block->page.lock.s_unlock();
 
 		if (UNIV_UNLIKELY(state < buf_page_t::UNFIXED)) {
+			block->page.unfix();
 			if (UNIV_UNLIKELY(id == page_id)) {
 				/* The page read was completed, and
 				another thread marked the page as free
 				while we were waiting. */
-				goto ignore_block;
+				goto ignore_unfixed;
 			}
 
 			ut_ad(id == page_id_t{~0ULL});
-			block->page.unfix();
 
 			if (++retries < BUF_PAGE_READ_MAX_RETRIES) {
 				goto loop;
@@ -2800,7 +2810,6 @@ free_unfixed_block:
 	if (UNIV_UNLIKELY(!block->page.frame)) {
 		if (!block->page.lock.x_lock_try()) {
 wait_for_unzip:
-wait_for_read:
 			/* The page is being read or written, or
 			another thread is executing buf_zip_decompress()
 			in buf_page_get_gen() on it. */
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
index 494486d3ba2..8149f1017fe 100644
--- a/storage/innobase/buf/buf0flu.cc
+++ b/storage/innobase/buf/buf0flu.cc
@@ -1794,15 +1794,18 @@ inline void log_t::write_checkpoint(lsn_t end_lsn) noexcept
     log_write_and_flush_prepare();
     resizing= resize_lsn.load(std::memory_order_relaxed);
     /* FIXME: issue an asynchronous write */
-    log.write(offset, {c, get_block_size()});
+    ut_ad(ut_is_2pow(write_size));
+    ut_ad(write_size >= 512);
+    ut_ad(write_size <= 4096);
+    log.write(offset, {c, write_size});
     if (resizing > 1 && resizing <= next_checkpoint_lsn)
     {
+      resize_log.write(CHECKPOINT_1, {c, write_size});
       byte *buf= static_cast<byte*>(aligned_malloc(4096, 4096));
       memset_aligned<4096>(buf, 0, 4096);
       header_write(buf, resizing, is_encrypted());
       resize_log.write(0, {buf, 4096});
       aligned_free(buf);
-      resize_log.write(CHECKPOINT_1, {c, get_block_size()});
     }
 
     if (!log_write_through)
diff --git a/storage/innobase/buf/buf0rea.cc b/storage/innobase/buf/buf0rea.cc
index bb51fca6ef7..0671d7bb0ed 100644
--- a/storage/innobase/buf/buf0rea.cc
+++ b/storage/innobase/buf/buf0rea.cc
@@ -382,6 +382,7 @@ read_ahead:
 
   if (count)
   {
+    mariadb_increment_pages_prefetched(count);
     DBUG_PRINT("ib_buf", ("random read-ahead %zu pages from %s: %u",
 			  count, space->chain.start->name,
 			  low.page_no()));
@@ -677,6 +678,7 @@ failed:
 
   if (count)
   {
+    mariadb_increment_pages_prefetched(count);
     DBUG_PRINT("ib_buf", ("random read-ahead %zu pages from %s: %u",
                           count, space->chain.start->name,
                           new_low.page_no()));
diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc
index 84b8f8603b5..be985291d7d 100644
--- a/storage/innobase/dict/dict0boot.cc
+++ b/storage/innobase/dict/dict0boot.cc
@@ -222,6 +222,9 @@ dberr_t dict_boot()
 
 	dberr_t err;
 	const buf_block_t *d = recv_sys.recover(hdr_page_id, &mtr ,&err);
+	DBUG_EXECUTE_IF("hdr_page_corrupt",
+			err= DB_CORRUPTION;
+			d= nullptr;);
 	if (!d) {
 		mtr.commit();
 		return err;
diff --git a/storage/innobase/gis/gis0sea.cc b/storage/innobase/gis/gis0sea.cc
index 10a12a785df..7d4c7730499 100644
--- a/storage/innobase/gis/gis0sea.cc
+++ b/storage/innobase/gis/gis0sea.cc
@@ -604,7 +604,6 @@ dberr_t rtr_search_to_nth_level(btr_cur_t *cur, que_thr_t *thr,
     upper_rw_latch= RW_X_LATCH;
     break;
   default:
-    ut_ad(latch_mode != BTR_MODIFY_PREV);
     ut_ad(latch_mode != BTR_SEARCH_PREV);
     if (!latch_by_caller)
       mtr_s_lock_index(index, mtr);
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 7541c1f6f05..af9a24ea084 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1212,11 +1212,8 @@ struct
 }
 log_requests;
 
-/** @brief Adjust some InnoDB startup parameters based on file contents
-or innodb_page_size. */
-static
-void
-innodb_params_adjust();
+/** Adjust some InnoDB startup parameters based on the data directory */
+static void innodb_params_adjust();
 
 /*******************************************************************//**
 This function is used to prepare an X/Open XA distributed transaction.
@@ -2797,10 +2794,6 @@ innobase_trx_init(
 		thd, OPTION_RELAXED_UNIQUE_CHECKS);
 	trx->snapshot_isolation = THDVAR(thd, snapshot_isolation) & 1;
 
-#ifdef WITH_WSREP
-	trx->wsrep = wsrep_on(thd);
-#endif
-
 	DBUG_VOID_RETURN;
 }
 
@@ -3172,9 +3165,9 @@ static bool innobase_query_caching_table_check_low(
 	}
 #endif
 
-	table->lock_mutex_lock();
+	table->lock_shared_lock();
 	auto len= UT_LIST_GET_LEN(table->locks);
-	table->lock_mutex_unlock();
+	table->lock_shared_unlock();
 	return len == 0;
 }
 
@@ -3661,6 +3654,11 @@ static MYSQL_SYSVAR_ULONGLONG(buffer_pool_size, innobase_buffer_pool_size,
   2ULL << 20,
   LLONG_MAX, 1024*1024L);
 
+static MYSQL_SYSVAR_UINT(log_write_ahead_size, log_sys.write_size,
+  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
+  "Redo log write size to avoid read-on-write; must be a power of two",
+  nullptr, nullptr, 512, 512, 4096, 1);
+
 /****************************************************************//**
 Gives the file extension of an InnoDB single-table tablespace. */
 static const char* ha_innobase_exts[] = {
@@ -3782,6 +3780,13 @@ static int innodb_init_params()
 		DBUG_RETURN(HA_ERR_INITIALIZATION);
 	}
 
+	if (!ut_is_2pow(log_sys.write_size)) {
+		sql_print_error("InnoDB: innodb_log_write_ahead_size=%u"
+				" is not a power of two",
+				log_sys.write_size);
+		DBUG_RETURN(HA_ERR_INITIALIZATION);
+	}
+
         if (compression_algorithm_is_not_loaded(innodb_compression_algorithm, ME_ERROR_LOG))
           DBUG_RETURN(HA_ERR_INITIALIZATION);
 
@@ -4315,9 +4320,6 @@ innobase_commit_low(
 		trx_commit_for_mysql(trx);
 	} else {
 		trx->will_lock = false;
-#ifdef WITH_WSREP
-		trx->wsrep = false;
-#endif /* WITH_WSREP */
 	}
 
 #ifdef WITH_WSREP
@@ -5515,15 +5517,13 @@ is done when the table first opened.
 @param[in]	ib_table	InnoDB dict_table_t
 @param[in,out]	s_templ		InnoDB template structure
 @param[in]	add_v		new virtual columns added along with
-				add index call
-@param[in]	locked		true if dict_sys.latch is held */
+				add index call */
 void
 innobase_build_v_templ(
 	const TABLE*		table,
 	const dict_table_t*	ib_table,
 	dict_vcol_templ_t*	s_templ,
-	const dict_add_v_col_t*	add_v,
-	bool			locked)
+	const dict_add_v_col_t*	add_v)
 {
 	ulint	ncol = unsigned(ib_table->n_cols) - DATA_N_SYS_COLS;
 	ulint	n_v_col = ib_table->n_v_cols;
@@ -5531,6 +5531,7 @@ innobase_build_v_templ(
 
 	DBUG_ENTER("innobase_build_v_templ");
 	ut_ad(ncol < REC_MAX_N_FIELDS);
+	ut_ad(ib_table->lock_mutex_is_owner());
 
 	if (add_v != NULL) {
 		n_v_col += add_v->n_v_col;
@@ -5538,20 +5539,7 @@ innobase_build_v_templ(
 
 	ut_ad(n_v_col > 0);
 
-	if (!locked) {
-		dict_sys.lock(SRW_LOCK_CALL);
-	}
-
-#if 0
-	/* This does not (need to) hold for ctx->new_table in
-	alter_rebuild_apply_log() */
-	ut_ad(dict_sys.locked());
-#endif
-
 	if (s_templ->vtempl) {
-		if (!locked) {
-			dict_sys.unlock();
-		}
 		DBUG_VOID_RETURN;
 	}
 
@@ -5652,12 +5640,9 @@ innobase_build_v_templ(
 		j++;
 	}
 
-	if (!locked) {
-		dict_sys.unlock();
-	}
-
 	s_templ->db_name = table->s->db.str;
 	s_templ->tb_name = table->s->table_name.str;
+
 	DBUG_VOID_RETURN;
 }
 
@@ -5950,15 +5935,15 @@ ha_innobase::open(const char* name, int, uint)
 	key_used_on_scan = m_primary_key;
 
 	if (ib_table->n_v_cols) {
-		dict_sys.lock(SRW_LOCK_CALL);
+		ib_table->lock_mutex_lock();
+
 		if (ib_table->vc_templ == NULL) {
 			ib_table->vc_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
 			innobase_build_v_templ(
-				table, ib_table, ib_table->vc_templ, NULL,
-				true);
+				table, ib_table, ib_table->vc_templ);
 		}
 
-		dict_sys.unlock();
+		ib_table->lock_mutex_unlock();
 	}
 
 	if (!check_index_consistency(table, ib_table)) {
@@ -8623,7 +8608,10 @@ func_exit:
 	}
 
 #ifdef WITH_WSREP
-	if (error == DB_SUCCESS && trx->is_wsrep()
+	if (error == DB_SUCCESS &&
+	    /* For sequences, InnoDB transaction may not have been started yet.
+	    Check THD-level wsrep state in that case. */
+	    (trx->is_wsrep() || (!trx_is_started(trx) && wsrep_on(m_user_thd)))
 	    && wsrep_thd_is_local(m_user_thd)
 	    && !wsrep_thd_ignore_table(m_user_thd)) {
 		DBUG_PRINT("wsrep", ("update row key"));
@@ -14676,7 +14664,7 @@ fsp_get_available_space_in_free_extents(const fil_space_t& space)
 Returns statistics information of the table to the MySQL interpreter,
 in various fields of the handle object.
 @return HA_ERR_* error code or 0 */
-
+TRANSACTIONAL_TARGET
 int
 ha_innobase::info_low(
 /*==================*/
@@ -14757,19 +14745,37 @@ ha_innobase::info_low(
 		ulint	stat_clustered_index_size;
 		ulint	stat_sum_of_other_index_sizes;
 
-		ib_table->stats_mutex_lock();
-
 		ut_a(ib_table->stat_initialized);
 
-		n_rows = ib_table->stat_n_rows;
+#if !defined NO_ELISION && !defined SUX_LOCK_GENERIC
+		if (xbegin()) {
+			if (ib_table->stats_mutex_is_locked())
+				xabort();
 
-		stat_clustered_index_size
-			= ib_table->stat_clustered_index_size;
+			n_rows = ib_table->stat_n_rows;
 
-		stat_sum_of_other_index_sizes
-			= ib_table->stat_sum_of_other_index_sizes;
+			stat_clustered_index_size
+				= ib_table->stat_clustered_index_size;
 
-		ib_table->stats_mutex_unlock();
+			stat_sum_of_other_index_sizes
+				= ib_table->stat_sum_of_other_index_sizes;
+
+			xend();
+		} else
+#endif
+		{
+			ib_table->stats_shared_lock();
+
+			n_rows = ib_table->stat_n_rows;
+
+			stat_clustered_index_size
+				= ib_table->stat_clustered_index_size;
+
+			stat_sum_of_other_index_sizes
+				= ib_table->stat_sum_of_other_index_sizes;
+
+			ib_table->stats_shared_unlock();
+		}
 
 		/*
 		The MySQL optimizer seems to assume in a left join that n_rows
@@ -14812,11 +14818,13 @@ ha_innobase::info_low(
 			stats.index_file_length
 				= ulonglong(stat_sum_of_other_index_sizes)
 				* size;
-			space->s_lock();
-			stats.delete_length = 1024
-				* fsp_get_available_space_in_free_extents(
+			if (flag & HA_STATUS_VARIABLE_EXTRA) {
+				space->s_lock();
+				stats.delete_length = 1024
+					* fsp_get_available_space_in_free_extents(
 					*space);
-			space->s_unlock();
+				space->s_unlock();
+			}
 		}
 		stats.check_time = 0;
 		stats.mrr_length_per_rec= (uint)ref_length +  8; // 8 = max(sizeof(void *));
@@ -14887,9 +14895,9 @@ ha_innobase::info_low(
 			stats.create_time = (ulong) stat_info.ctime;
 		}
 
-		ib_table->stats_mutex_lock();
+		ib_table->stats_shared_lock();
 		auto _ = make_scope_exit([ib_table]() {
-			ib_table->stats_mutex_unlock(); });
+			ib_table->stats_shared_unlock(); });
 
 		ut_a(ib_table->stat_initialized);
 
@@ -18209,13 +18217,28 @@ static my_bool	innodb_buf_flush_list_now = TRUE;
 static uint	innodb_merge_threshold_set_all_debug
 	= DICT_INDEX_MERGE_THRESHOLD_DEFAULT;
 
+/** Force an InnoDB log checkpoint. */
 /** Force an InnoDB log checkpoint. */
 static
 void
-checkpoint_now_set(THD*, st_mysql_sys_var*, void*, const void *save)
+checkpoint_now_set(THD* thd, st_mysql_sys_var*, void*, const void *save)
 {
   if (!*static_cast<const my_bool*>(save))
     return;
+
+  if (srv_read_only_mode)
+  {
+    push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                        HA_ERR_UNSUPPORTED,
+                        "InnoDB doesn't force checkpoint "
+                        "when %s",
+                        (srv_force_recovery
+                         == SRV_FORCE_NO_LOG_REDO)
+                        ? "innodb-force-recovery=6."
+                        : "innodb-read-only=1.");
+    return;
+  }
+
   const auto size= log_sys.is_encrypted()
     ? SIZE_OF_FILE_CHECKPOINT + 8 : SIZE_OF_FILE_CHECKPOINT;
   mysql_mutex_unlock(&LOCK_global_system_variables);
@@ -18417,7 +18440,8 @@ static void innodb_data_file_write_through_update(THD *, st_mysql_sys_var*,
 static void innodb_doublewrite_update(THD *, st_mysql_sys_var*,
                                       void *, const void *save)
 {
-  fil_system.set_use_doublewrite(*static_cast<const ulong*>(save));
+  if (!srv_read_only_mode)
+    fil_system.set_use_doublewrite(*static_cast<const ulong*>(save));
 }
 
 static void innodb_log_file_size_update(THD *thd, st_mysql_sys_var*,
@@ -18663,6 +18687,25 @@ void lock_wait_wsrep_kill(trx_t *bf_trx, ulong thd_id, trx_id_t trx_id)
     wsrep_thd_UNLOCK(vthd);
     wsrep_thd_kill_UNLOCK(vthd);
   }
+
+#ifdef ENABLED_DEBUG_SYNC
+    DBUG_EXECUTE_IF(
+        "wsrep_after_kill",
+        {const char act[]=
+             "now "
+             "SIGNAL wsrep_after_kill_reached "
+             "WAIT_FOR wsrep_after_kill_continue";
+          DBUG_ASSERT(!debug_sync_set_action(bf_thd, STRING_WITH_LEN(act)));
+        };);
+    DBUG_EXECUTE_IF(
+        "wsrep_after_kill_2",
+        {const char act2[]=
+             "now "
+             "SIGNAL wsrep_after_kill_reached_2 "
+             "WAIT_FOR wsrep_after_kill_continue_2";
+          DBUG_ASSERT(!debug_sync_set_action(bf_thd, STRING_WITH_LEN(act2)));
+        };);
+#endif /* ENABLED_DEBUG_SYNC*/
 }
 
 /** This function forces the victim transaction to abort. Aborting the
@@ -19722,6 +19765,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
   MYSQL_SYSVAR(data_file_buffering),
   MYSQL_SYSVAR(data_file_write_through),
   MYSQL_SYSVAR(log_file_size),
+  MYSQL_SYSVAR(log_write_ahead_size),
   MYSQL_SYSVAR(log_spin_wait_delay),
   MYSQL_SYSVAR(log_group_home_dir),
   MYSQL_SYSVAR(max_dirty_pages_pct),
@@ -19877,20 +19921,32 @@ i_s_innodb_sys_virtual,
 i_s_innodb_tablespaces_encryption
 maria_declare_plugin_end;
 
-/** @brief Adjust some InnoDB startup parameters based on file contents
-or innodb_page_size. */
-static
-void
-innodb_params_adjust()
+/** Adjust some InnoDB startup parameters based on the data directory */
+static void innodb_params_adjust()
 {
-	MYSQL_SYSVAR_NAME(max_undo_log_size).max_val
-		= 1ULL << (32U + srv_page_size_shift);
-	MYSQL_SYSVAR_NAME(max_undo_log_size).min_val
-		= MYSQL_SYSVAR_NAME(max_undo_log_size).def_val
-		= ulonglong(SRV_UNDO_TABLESPACE_SIZE_IN_PAGES)
-		<< srv_page_size_shift;
-	MYSQL_SYSVAR_NAME(max_undo_log_size).max_val
-		= 1ULL << (32U + srv_page_size_shift);
+  MYSQL_SYSVAR_NAME(max_undo_log_size).max_val=
+    1ULL << (32U + srv_page_size_shift);
+  MYSQL_SYSVAR_NAME(max_undo_log_size).min_val=
+    MYSQL_SYSVAR_NAME(max_undo_log_size).def_val=
+    ulonglong{SRV_UNDO_TABLESPACE_SIZE_IN_PAGES} << srv_page_size_shift;
+  MYSQL_SYSVAR_NAME(max_undo_log_size).max_val=
+    1ULL << (32U + srv_page_size_shift);
+#if 0 /* FIXME: INFORMATION_SCHEMA.SYSTEM_VARIABLES won't reflect this. */
+  /* plugin_opt_set_limits() would have copied all MYSQL_SYSVAR
+  before innodb_init() was invoked. Therefore, changing the
+  min_val, def_val, max_val will have no observable effect. */
+# if defined __linux__ || defined _WIN32
+  uint &min_val= MYSQL_SYSVAR_NAME(log_write_ahead_size).min_val;
+  if (min_val < log_sys.write_size)
+  {
+    min_val= log_sys.write_size;
+    MYSQL_SYSVAR_NAME(log_write_ahead_size).def_val= log_sys.write_size;
+  }
+# endif
+  ut_ad(MYSQL_SYSVAR_NAME(log_write_ahead_size).min_val <=
+        log_sys.write_size);
+#endif
+  ut_ad(MYSQL_SYSVAR_NAME(log_write_ahead_size).max_val == 4096);
 }
 
 /****************************************************************************
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index d54e0c10f8b..3c88f74fe49 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -883,15 +883,13 @@ innodb_rec_per_key(
 @param[in]	ib_table	InnoDB dict_table_t
 @param[in,out]	s_templ		InnoDB template structure
 @param[in]	add_v		new virtual columns added along with
-				add index call
-@param[in]	locked		true if innobase_share_mutex is held */
+				add index call */
 void
 innobase_build_v_templ(
 	const TABLE*		table,
 	const dict_table_t*	ib_table,
 	dict_vcol_templ_t*	s_templ,
-	const dict_add_v_col_t*	add_v,
-	bool			locked);
+	const dict_add_v_col_t*	add_v = nullptr);
 
 /** callback used by MySQL server layer to initialized
 the table virtual columns' template
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index 00fcbbfda06..88d97281d3d 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -1168,7 +1168,7 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
 		trx_start_for_ddl(trx);
 	}
 
-	~ha_innobase_inplace_ctx()
+	~ha_innobase_inplace_ctx() override
 	{
 		UT_DELETE(m_stage);
 		if (instant_table) {
@@ -1277,7 +1277,7 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
 
 	/** Share context between partitions.
 	@param[in] ctx	context from another partition of the table */
-	void set_shared_data(const inplace_alter_handler_ctx& ctx)
+	void set_shared_data(const inplace_alter_handler_ctx& ctx) override
 	{
 		if (add_autoinc != ULINT_UNDEFINED) {
 			const ha_innobase_inplace_ctx& ha_ctx =
@@ -6525,16 +6525,16 @@ acquire_lock:
 		acquiring an InnoDB table lock even for online operation,
 		to ensure that the rollback of recovered transactions will
 		not run concurrently with online ADD INDEX. */
-		user_table->lock_mutex_lock();
+		user_table->lock_shared_lock();
 		for (lock_t *lock = UT_LIST_GET_FIRST(user_table->locks);
 		     lock;
 		     lock = UT_LIST_GET_NEXT(un_member.tab_lock.locks, lock)) {
 			if (lock->trx->is_recovered) {
-				user_table->lock_mutex_unlock();
+				user_table->lock_shared_unlock();
 				goto acquire_lock;
 			}
 		}
-		user_table->lock_mutex_unlock();
+		user_table->lock_shared_unlock();
 	}
 
 	if (fts_exist) {
@@ -8778,10 +8778,11 @@ ok_exit:
 		}
 		s_templ = UT_NEW_NOKEY(dict_vcol_templ_t());
 
+		ctx->new_table->lock_mutex_lock();
 		innobase_build_v_templ(
-			altered_table, ctx->new_table, s_templ, NULL, false);
-
+			altered_table, ctx->new_table, s_templ);
 		ctx->new_table->vc_templ = s_templ;
+                ctx->new_table->lock_mutex_unlock();
 	} else if (ctx->num_to_add_vcol > 0 && ctx->num_to_drop_vcol == 0) {
 		/* if there is ongoing drop virtual column, then we disallow
 		inplace add index on newly added virtual column, so it does
@@ -8796,10 +8797,12 @@ ok_exit:
 		add_v->v_col = ctx->add_vcol;
 		add_v->v_col_name = ctx->add_vcol_name;
 
+		ctx->new_table->lock_mutex_lock();
 		innobase_build_v_templ(
-			altered_table, ctx->new_table, s_templ, add_v, false);
+			altered_table, ctx->new_table, s_templ, add_v);
 		old_templ = ctx->new_table->vc_templ;
 		ctx->new_table->vc_templ = s_templ;
+		ctx->new_table->lock_mutex_unlock();
 	}
 
 	/* Drop virtual column without rebuild will keep dict table
@@ -11087,11 +11090,10 @@ static bool alter_rebuild_apply_log(
 	if (ctx->new_table->n_v_cols > 0) {
 		s_templ = UT_NEW_NOKEY(
 				dict_vcol_templ_t());
-		s_templ->vtempl = NULL;
-
-		innobase_build_v_templ(altered_table, ctx->new_table, s_templ,
-				       NULL, true);
+		ctx->new_table->lock_mutex_lock();
+		innobase_build_v_templ(altered_table, ctx->new_table, s_templ);
 		ctx->new_table->vc_templ = s_templ;
+		ctx->new_table->lock_mutex_unlock();
 	}
 
 	dberr_t error = row_log_table_apply(
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index ec50418b8cc..b27cfe5cc66 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -4757,9 +4757,9 @@ i_s_dict_fill_sys_tablestats(THD* thd, dict_table_t *table,
   Field **fields= table_to_fill->field;
 
   {
-    table->stats_mutex_lock();
+    table->stats_shared_lock();
     auto _ = make_scope_exit([table]() {
-      table->stats_mutex_unlock(); dict_sys.unlock(); });
+      table->stats_shared_unlock(); dict_sys.unlock(); });
 
     OK(fields[SYS_TABLESTATS_ID]->store(longlong(table->id), TRUE));
 
diff --git a/storage/innobase/include/btr0types.h b/storage/innobase/include/btr0types.h
index 966247ffa00..d5a1e79c573 100644
--- a/storage/innobase/include/btr0types.h
+++ b/storage/innobase/include/btr0types.h
@@ -68,9 +68,6 @@ enum btr_latch_mode {
 	/** Search the previous record.
 	Used in btr_pcur_move_backward_from_page(). */
 	BTR_SEARCH_PREV = 4 | BTR_SEARCH_LEAF,
-	/** Modify the previous record.
-	Used in btr_pcur_move_backward_from_page(). */
-	BTR_MODIFY_PREV = 4 | BTR_MODIFY_LEAF,
 	/** Start modifying the entire B-tree. */
 	BTR_MODIFY_TREE = 8 | BTR_MODIFY_LEAF,
 	/** Continue modifying the entire R-tree.
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index 5c436c1092a..503623bac9a 100644
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
@@ -204,6 +204,9 @@ buf_page_t *buf_page_get_zip(const page_id_t page_id, ulint zip_size);
 or BUF_PEEK_IF_IN_POOL
 @param[in,out]	mtr			mini-transaction
 @param[out]	err			DB_SUCCESS or error code
+@param[in,out]	no_wait			If not NULL on input, then we must not
+wait for current page latch. On output, the value is set to true if we had to
+return because we could not wait on page latch.
 @return pointer to the block or NULL */
 buf_block_t*
 buf_page_get_gen(
@@ -213,7 +216,8 @@ buf_page_get_gen(
 	buf_block_t*		guess,
 	ulint			mode,
 	mtr_t*			mtr,
-	dberr_t*		err = nullptr);
+	dberr_t*		err = nullptr,
+        bool*			no_wait = nullptr);
 
 /** Initialize a page in the buffer pool. The page is usually not read
 from a file even if it cannot be found in the buffer buf_pool. This is one
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
index 3f611b4b5aa..106e991c59e 100644
--- a/storage/innobase/include/dict0dict.h
+++ b/storage/innobase/include/dict0dict.h
@@ -698,35 +698,32 @@ bool
 dict_table_has_indexed_v_cols(
 	const dict_table_t*	table);
 
-/********************************************************************//**
-Gets the approximately estimated number of rows in the table.
+TPOOL_SUPPRESS_TSAN
+/** Get the estimated number of rows in the table.
 @return estimated number of rows */
-UNIV_INLINE
-ib_uint64_t
-dict_table_get_n_rows(
-/*==================*/
-	const dict_table_t*	table)	/*!< in: table */
-	MY_ATTRIBUTE((warn_unused_result));
-/********************************************************************//**
-Increment the number of rows in the table by one.
-Notice that this operation is not protected by any latch, the number is
-approximate. */
-UNIV_INLINE
-void
-dict_table_n_rows_inc(
-/*==================*/
-	dict_table_t*	table)	/*!< in/out: table */
-	MY_ATTRIBUTE((nonnull));
-/********************************************************************//**
-Decrement the number of rows in the table by one.
-Notice that this operation is not protected by any latch, the number is
-approximate. */
-UNIV_INLINE
-void
-dict_table_n_rows_dec(
-/*==================*/
-	dict_table_t*	table)	/*!< in/out: table */
-	MY_ATTRIBUTE((nonnull));
+inline uint64_t dict_table_get_n_rows(const dict_table_t *table)
+{
+  ut_ad(table->stat_initialized);
+  return table->stat_n_rows;
+}
+
+/** Increment the number of rows in the table by one.
+Note that this operation is not protected by any latch,
+the number is approximate. */
+TPOOL_SUPPRESS_TSAN inline void dict_table_n_rows_inc(dict_table_t *table)
+{
+  if (auto n_rows= table->stat_n_rows + 1)
+    table->stat_n_rows= n_rows;
+}
+
+/** Decrement the number of rows in the table by one.
+Note that this operation is not protected by any latch,
+the number is approximate. */
+TPOOL_SUPPRESS_TSAN inline void dict_table_n_rows_dec(dict_table_t *table)
+{
+  if (auto n_rows= table->stat_n_rows)
+    table->stat_n_rows= n_rows - 1;
+}
 
 /** Get nth virtual column
 @param[in]	table	target table
diff --git a/storage/innobase/include/dict0dict.inl b/storage/innobase/include/dict0dict.inl
index ead22a21757..21b71cb72b6 100644
--- a/storage/innobase/include/dict0dict.inl
+++ b/storage/innobase/include/dict0dict.inl
@@ -306,56 +306,6 @@ dict_table_has_indexed_v_cols(
 	return(false);
 }
 
-/********************************************************************//**
-Gets the approximately estimated number of rows in the table.
-@return estimated number of rows */
-UNIV_INLINE
-ib_uint64_t
-dict_table_get_n_rows(
-/*==================*/
-	const dict_table_t*	table)	/*!< in: table */
-{
-	ut_ad(table->stat_initialized);
-
-	return(table->stat_n_rows);
-}
-
-/********************************************************************//**
-Increment the number of rows in the table by one.
-Notice that this operation is not protected by any latch, the number is
-approximate. */
-UNIV_INLINE
-void
-dict_table_n_rows_inc(
-/*==================*/
-	dict_table_t*	table)	/*!< in/out: table */
-{
-	if (table->stat_initialized) {
-		ib_uint64_t	n_rows = table->stat_n_rows;
-		if (n_rows < 0xFFFFFFFFFFFFFFFFULL) {
-			table->stat_n_rows = n_rows + 1;
-		}
-	}
-}
-
-/********************************************************************//**
-Decrement the number of rows in the table by one.
-Notice that this operation is not protected by any latch, the number is
-approximate. */
-UNIV_INLINE
-void
-dict_table_n_rows_dec(
-/*==================*/
-	dict_table_t*	table)	/*!< in/out: table */
-{
-	if (table->stat_initialized) {
-		ib_uint64_t	n_rows = table->stat_n_rows;
-		if (n_rows > 0) {
-			table->stat_n_rows = n_rows - 1;
-		}
-	}
-}
-
 #ifdef UNIV_DEBUG
 /********************************************************************//**
 Gets the nth column of a table.
diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index 99e5c6797df..caa8b4a6081 100644
--- a/storage/innobase/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
@@ -1991,38 +1991,36 @@ struct dict_table_t {
 
 #ifdef UNIV_DEBUG
   /** @return whether the current thread holds the lock_mutex */
-  bool lock_mutex_is_owner() const
-  { return lock_mutex_owner == pthread_self(); }
+  bool lock_mutex_is_owner() const { return lock_latch.have_wr(); }
   /** @return whether the current thread holds the stats_mutex (lock_mutex) */
-  bool stats_mutex_is_owner() const
-  { return lock_mutex_owner == pthread_self(); }
+  bool stats_mutex_is_owner() const { return lock_latch.have_wr(); }
 #endif /* UNIV_DEBUG */
-  void lock_mutex_init() { lock_mutex.init(); }
-  void lock_mutex_destroy() { lock_mutex.destroy(); }
-  /** Acquire lock_mutex */
-  void lock_mutex_lock()
+  void lock_mutex_init()
   {
-    ut_ad(!lock_mutex_is_owner());
-    lock_mutex.wr_lock();
-    ut_ad(!lock_mutex_owner.exchange(pthread_self()));
-  }
-  /** Try to acquire lock_mutex */
-  bool lock_mutex_trylock()
-  {
-    ut_ad(!lock_mutex_is_owner());
-    bool acquired= lock_mutex.wr_lock_try();
-    ut_ad(!acquired || !lock_mutex_owner.exchange(pthread_self()));
-    return acquired;
-  }
-  /** Release lock_mutex */
-  void lock_mutex_unlock()
-  {
-    ut_ad(lock_mutex_owner.exchange(0) == pthread_self());
-    lock_mutex.wr_unlock();
+#ifdef UNIV_DEBUG
+    lock_latch.SRW_LOCK_INIT(0);
+#else
+    lock_latch.init();
+#endif
   }
+  void lock_mutex_destroy() { lock_latch.destroy(); }
+  /** Acquire exclusive lock_latch */
+  void lock_mutex_lock() { lock_latch.wr_lock(ut_d(SRW_LOCK_CALL)); }
+  /** Try to acquire exclusive lock_latch */
+  bool lock_mutex_trylock() { return lock_latch.wr_lock_try(); }
+  /** Release exclusive lock_latch */
+  void lock_mutex_unlock() { lock_latch.wr_unlock(); }
+  /** Acquire shared lock_latch */
+  void lock_shared_lock() { lock_latch.rd_lock(ut_d(SRW_LOCK_CALL)); }
+  /** Release shared lock_latch */
+  void lock_shared_unlock() { lock_latch.rd_unlock(); }
+
 #ifndef SUX_LOCK_GENERIC
-  /** @return whether the lock mutex is held by some thread */
-  bool lock_mutex_is_locked() const noexcept { return lock_mutex.is_locked(); }
+  /** @return whether an exclusive lock_latch is held by some thread */
+  bool lock_mutex_is_locked() const noexcept
+  { return lock_latch.is_write_locked(); }
+  bool stats_mutex_is_locked() const noexcept
+  { return lock_latch.is_write_locked(); }
 #endif
 
   /* stats mutex lock currently defaults to lock_mutex but in the future,
@@ -2033,6 +2031,8 @@ struct dict_table_t {
   void stats_mutex_destroy() { lock_mutex_destroy(); }
   void stats_mutex_lock() { lock_mutex_lock(); }
   void stats_mutex_unlock() { lock_mutex_unlock(); }
+  void stats_shared_lock() { lock_shared_lock(); }
+  void stats_shared_unlock() { lock_shared_unlock(); }
 
   /** Rename the data file.
   @param new_name     name of the table
@@ -2323,12 +2323,13 @@ public:
   /** Mutex protecting autoinc and freed_indexes. */
   srw_spin_mutex autoinc_mutex;
 private:
-  /** Mutex protecting locks on this table. */
-  srw_spin_mutex lock_mutex;
 #ifdef UNIV_DEBUG
-  /** The owner of lock_mutex (0 if none) */
-  Atomic_relaxed<pthread_t> lock_mutex_owner{0};
+  typedef srw_lock_debug lock_latch_type;
+#else
+  typedef srw_spin_lock_low lock_latch_type;
 #endif
+  /** RW-lock protecting locks and statistics on this table */
+  lock_latch_type lock_latch;
 public:
   /** The next DB_ROW_ID value */
   Atomic_counter<uint64_t> row_id{0};
@@ -2336,7 +2337,7 @@ public:
   uint64_t autoinc;
 
   /** The transaction that currently holds the the AUTOINC lock on this table.
-  Protected by lock_mutex.
+  Protected by lock_latch.
   The thread that is executing autoinc_trx may read this field without
   holding a latch, in row_lock_table_autoinc_for_mysql().
   Only the autoinc_trx thread may clear this field; it cannot be
@@ -2395,9 +2396,9 @@ public:
 	/** Magic number. */
 	ulint					magic_n;
 #endif /* UNIV_DEBUG */
-	/** mysql_row_templ_t for base columns used for compute the virtual
-	columns */
-	dict_vcol_templ_t*			vc_templ;
+  /** mysql_row_templ_t for base columns used for compute the virtual
+  columns; protected by lock_latch */
+  dict_vcol_templ_t *vc_templ;
 
   /* @return whether the table has any other transcation lock
   other than the given transaction */
diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h
index 85d01f2fc9e..dbd31670b14 100644
--- a/storage/innobase/include/log0log.h
+++ b/storage/innobase/include/log0log.h
@@ -274,11 +274,9 @@ private:
   std::atomic<lsn_t> resize_lsn;
   /** the log sequence number at the start of the log file */
   lsn_t first_lsn;
-#if defined __linux__ || defined _WIN32
-  /** The physical block size of the storage */
-  uint32_t block_size;
-#endif
 public:
+  /** current innodb_log_write_ahead_size */
+  uint write_size;
   /** format of the redo log: e.g., FORMAT_10_8 */
   uint32_t format;
 #if defined __linux__ || defined _WIN32
@@ -330,6 +328,8 @@ public:
       max_buf_free;
   }
 
+  inline void set_recovered() noexcept;
+
   void set_buf_free(size_t f) noexcept
   { ut_ad(f < buf_free_LOCK); buf_free.store(f, std::memory_order_relaxed); }
 
@@ -370,9 +370,12 @@ public:
   inline void resize_write(lsn_t lsn, const byte *end,
                            size_t len, size_t seq) noexcept;
 
+private:
   /** Write resize_buf to resize_log.
   @param length  the used length of resize_buf */
-  ATTRIBUTE_COLD void resize_write_buf(size_t length) noexcept;
+  ATTRIBUTE_COLD ATTRIBUTE_NOINLINE
+  void resize_write_buf(size_t length) noexcept;
+public:
 
   /** Rename a log file after resizing.
   @return whether an error occurred */
@@ -471,14 +474,12 @@ public:
   void close();
 
 #if defined __linux__ || defined _WIN32
-  /** @return the physical block size of the storage */
-  size_t get_block_size() const noexcept
-  { ut_ad(block_size); return block_size; }
   /** Set the log block size for file I/O. */
-  void set_block_size(uint32_t size) noexcept { block_size= size; }
-#else
-  /** @return the physical block size of the storage */
-  static size_t get_block_size() { return 512; }
+  void set_block_size(uint32 size) noexcept
+  {
+    if (write_size < size)
+      write_size= size;
+  }
 #endif
 
 private:
diff --git a/storage/innobase/include/mach0data.inl b/storage/innobase/include/mach0data.inl
index 2f970fd27f0..8fdeaffedf5 100644
--- a/storage/innobase/include/mach0data.inl
+++ b/storage/innobase/include/mach0data.inl
@@ -39,7 +39,9 @@ mach_write_to_1(
 	byte*	b,	/*!< in: pointer to byte where to store */
 	ulint	n)	/*!< in: ulint integer to be stored, >= 0, < 256 */
 {
+#ifndef HAVE_valgrind
 	ut_ad((n & ~0xFFUL) == 0);
+#endif
 
 	b[0] = (byte) n;
 }
@@ -56,7 +58,9 @@ mach_write_to_2(
 	byte*	b,	/*!< in: pointer to two bytes where to store */
 	ulint	n)	/*!< in: ulint integer to be stored */
 {
+#ifndef HAVE_valgrind
 	ut_ad((n & ~0xFFFFUL) == 0);
+#endif
 
 	b[0] = (byte)(n >> 8);
 	b[1] = (byte)(n);
diff --git a/storage/innobase/include/mariadb_stats.h b/storage/innobase/include/mariadb_stats.h
index 3a2790d02f0..838955461e8 100644
--- a/storage/innobase/include/mariadb_stats.h
+++ b/storage/innobase/include/mariadb_stats.h
@@ -79,6 +79,12 @@ inline void mariadb_increment_undo_records_read()
     stats->undo_records_read++;
 }
 
+inline void mariadb_increment_pages_prefetched(ulint n_pages)
+{
+  if (ha_handler_stats *stats= mariadb_stats)
+    stats->pages_prefetched += n_pages;
+}
+
 /*
   The following has to be identical code as measure() in sql_analyze_stmt.h
 
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index db783dada9c..12dbf2138ee 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -592,7 +592,6 @@ struct export_var_t{
 	ulint innodb_data_reads;		/*!< I/O read requests */
 	ulint innodb_dblwr_pages_written;	/*!< srv_dblwr_pages_written */
 	ulint innodb_dblwr_writes;		/*!< srv_dblwr_writes */
-	ulint innodb_deadlocks;
 	ulint innodb_history_list_length;
 	lsn_t innodb_lsn_current;
 	lsn_t innodb_lsn_flushed;
diff --git a/storage/innobase/include/srw_lock.h b/storage/innobase/include/srw_lock.h
index 98c256d3b73..f952722426d 100644
--- a/storage/innobase/include/srw_lock.h
+++ b/storage/innobase/include/srw_lock.h
@@ -70,10 +70,13 @@ inline void pthread_mutex_wrapper<true>::wr_lock()
 { if (!wr_lock_try()) wr_wait(); }
 # endif
 
+template<bool spinloop> class ssux_lock_impl;
+
 /** Futex-based mutex */
 template<bool spinloop>
 class srw_mutex_impl final
 {
+  friend ssux_lock_impl<spinloop>;
   /** The lock word, containing HOLDER + 1 if the lock is being held,
   plus the number of waiters */
   std::atomic<uint32_t> lock;
@@ -95,6 +98,8 @@ private:
   inline void wait(uint32_t lk);
   /** Wake up one wait() thread */
   void wake();
+  /** Wake up all wait() threads */
+  inline void wake_all();
 public:
   /** @return whether the mutex is being held or waited for */
   bool is_locked_or_waiting() const
@@ -207,27 +212,25 @@ public:
   /** @return whether the lock is being held or waited for */
   bool is_vacant() const { return !is_locked_or_waiting(); }
 #endif /* !DBUG_OFF */
-
-  bool rd_lock_try()
+private:
+  /** Try to acquire a shared latch.
+  @return the lock word value if the latch was not acquired
+  @retval 0  if the latch was acquired */
+  uint32_t rd_lock_try_low()
   {
     uint32_t lk= 0;
     while (!readers.compare_exchange_weak(lk, lk + 1,
                                           std::memory_order_acquire,
                                           std::memory_order_relaxed))
       if (lk & WRITER)
-        return false;
-    return true;
+        return lk;
+    return 0;
   }
+public:
 
-  bool u_lock_try()
-  {
-    if (!writer.wr_lock_try())
-      return false;
-    IF_DBUG_ASSERT(uint32_t lk=,)
-    readers.fetch_add(1, std::memory_order_acquire);
-    DBUG_ASSERT(lk < WRITER - 1);
-    return true;
-  }
+  bool rd_lock_try() { return rd_lock_try_low() == 0; }
+
+  bool u_lock_try() { return writer.wr_lock_try(); }
 
   bool wr_lock_try()
   {
@@ -246,9 +249,6 @@ public:
   void u_lock()
   {
     writer.wr_lock();
-    IF_DBUG_ASSERT(uint32_t lk=,)
-    readers.fetch_add(1, std::memory_order_acquire);
-    DBUG_ASSERT(lk < WRITER - 1);
   }
   void wr_lock()
   {
@@ -270,15 +270,15 @@ public:
   void u_wr_upgrade()
   {
     DBUG_ASSERT(writer.is_locked());
-    uint32_t lk= readers.fetch_add(WRITER - 1, std::memory_order_acquire);
-    if (lk != 1)
-      wr_wait(lk - 1);
+    uint32_t lk= readers.fetch_add(WRITER, std::memory_order_acquire);
+    if (lk)
+      wr_wait(lk);
   }
   void wr_u_downgrade()
   {
     DBUG_ASSERT(writer.is_locked());
     DBUG_ASSERT(is_write_locked());
-    readers.store(1, std::memory_order_release);
+    readers.store(0, std::memory_order_release);
     /* Note: Any pending rd_lock() will not be woken up until u_unlock() */
   }
 
@@ -291,10 +291,6 @@ public:
   }
   void u_unlock()
   {
-    IF_DBUG_ASSERT(uint32_t lk=,)
-    readers.fetch_sub(1, std::memory_order_release);
-    DBUG_ASSERT(lk);
-    DBUG_ASSERT(lk < WRITER);
     writer.wr_unlock();
   }
   void wr_unlock()
@@ -404,7 +400,7 @@ typedef srw_spin_lock_low srw_spin_lock;
 class ssux_lock
 {
   PSI_rwlock *pfs_psi;
-  ssux_lock_impl<false> lock;
+  ssux_lock_impl<true> lock;
 
   ATTRIBUTE_NOINLINE void psi_rd_lock(const char *file, unsigned line);
   ATTRIBUTE_NOINLINE void psi_wr_lock(const char *file, unsigned line);
diff --git a/storage/innobase/include/sux_lock.h b/storage/innobase/include/sux_lock.h
index 7a7f93b6787..f0ff2cde228 100644
--- a/storage/innobase/include/sux_lock.h
+++ b/storage/innobase/include/sux_lock.h
@@ -285,7 +285,7 @@ public:
 typedef sux_lock<ssux_lock_impl<true>> block_lock;
 
 #ifndef UNIV_PFS_RWLOCK
-typedef sux_lock<ssux_lock_impl<false>> index_lock;
+typedef sux_lock<ssux_lock_impl<true>> index_lock;
 #else
 typedef sux_lock<ssux_lock> index_lock;
 
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index 1b8d5953059..2450690ecf0 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -296,7 +296,6 @@ namespace Deadlock
       if (tortoise == hare)
       {
         ut_ad(l > 1);
-        lock_sys.deadlocks++;
         /* Note: Normally, trx should be part of any deadlock cycle
         that is found. However, if innodb_deadlock_detect=OFF had been
         in effect in the past, it is possible that trx will be waiting
@@ -503,8 +502,10 @@ this BF-BF wait correct and if not report BF wait and assert.
 
 @param[in]	lock_rec	other waiting record lock
 @param[in]	trx		trx requesting conflicting record lock
+@param[in]	type_mode	lock type mode of requesting trx
 */
-static void wsrep_assert_no_bf_bf_wait(const lock_t *lock, const trx_t *trx)
+static void wsrep_assert_no_bf_bf_wait(const lock_t *lock, const trx_t *trx,
+                                       const unsigned type_mode = LOCK_NONE)
 {
 	ut_ad(!lock->is_table());
 	lock_sys.assert_locked(*lock);
@@ -546,6 +547,15 @@ static void wsrep_assert_no_bf_bf_wait(const lock_t *lock, const trx_t *trx)
 		return;
 	}
 
+	if (type_mode != LOCK_NONE)
+		ib::error() << " Requested lock "
+			    << ((type_mode & LOCK_TABLE) ? "on table " : " on record ")
+			    << ((type_mode & LOCK_WAIT) ? " WAIT " : " ")
+			    << ((type_mode & LOCK_GAP) ? " GAP " : " ")
+			    << ((type_mode & LOCK_REC_NOT_GAP) ? " RECORD " : " ")
+			    << ((type_mode & LOCK_INSERT_INTENTION) ? " INSERT INTENTION " : " ")
+			    << ((type_mode & LOCK_X) ? " LOCK_X " : " LOCK_S ");
+
 	mtr_t mtr;
 
 	ib::error() << "Conflicting lock on table: "
@@ -582,6 +592,80 @@ ATTRIBUTE_NOINLINE static bool wsrep_is_BF_lock_timeout(const trx_t &trx)
              << " query: " << wsrep_thd_query(trx.mysql_thd);
   return true;
 }
+
+/** Checks if a lock request for a new lock has to wait for request
+    lock2 in Galera.
+@param trx                  trx of new lock
+@param type_mode            precise mode of the new lock
+                            to set: LOCK_S or LOCK_X, possibly
+                            ORed to LOCK_GAP or LOCK_REC_NOT_GAP,
+                            LOCK_INSERT_INTENTION.
+@param lock2                another record lock; NOTE that
+                            it is assumed that this has a lock bit
+                            set on the same record as in the new
+	                    lock we are setting.
+@return TRUE if new lock has to wait for lock2 to be removed */
+
+ATTRIBUTE_NOINLINE ATTRIBUTE_COLD
+bool lock_rec_has_to_wait_wsrep(const trx_t *trx,
+                                const unsigned type_mode,
+                                const lock_t *lock2)
+{
+  const trx_t* trx2= lock2->trx;
+
+  if (trx->is_wsrep_UK_scan() &&
+      wsrep_thd_is_BF(trx2->mysql_thd, false))
+  {
+    /* New lock request from a transaction is using unique key
+       scan and this transaction is a wsrep high priority transaction
+       (brute force). If conflicting transaction is also wsrep high
+       priority transaction we should avoid lock conflict because
+       ordering of these transactions is already decided and
+       conflicting transaction will be later replayed. */
+
+    return false;
+  }
+
+  if (wsrep_thd_is_BF(trx->mysql_thd, false) &&
+      wsrep_thd_is_BF(trx2->mysql_thd, false))
+  {
+    /* Both transactions are high priority transactions. */
+
+    if (((type_mode & LOCK_S) && lock2->is_insert_intention()) ||
+        ((type_mode & LOCK_INSERT_INTENTION) && lock2->mode() == LOCK_S))
+    {
+      ut_ad(!wsrep_thd_is_local(trx->mysql_thd));
+      ut_ad(!wsrep_thd_is_local(trx2->mysql_thd));
+
+      /* High priority applier transaction might take S-locks to
+	 conflicting primary/unique key records and those local
+	 transactions are BF-killed. However, these S-locks
+	 are released at commit time. Therefore, high priority
+	 applier transaction when requesting insert intention (II-lock)
+	 lock for primary/unique index might notice conflicting
+	 S-lock. Certification makes sure that applier transactions
+	 do not insert duplicate keys and so we can allow
+	 S-lock and II-lock. */
+      return false;
+    }
+
+    if (wsrep_thd_order_before(trx->mysql_thd, trx2->mysql_thd))
+    {
+      /* If two high priority threads have lock conflict, we look at the
+	 order of these transactions and honor the earlier transaction. */
+
+      return false;
+    }
+
+    /* We very well can let bf to wait normally as other
+       BF will be replayed in case of conflict. For debug
+       builds we will do additional sanity checks to catch
+       unsupported bf wait if any. */
+    ut_d(wsrep_assert_no_bf_bf_wait(lock2, trx, type_mode));
+  }
+
+  return true;
+}
 #endif /* WITH_WSREP */
 
 /*********************************************************************//**
@@ -691,31 +775,8 @@ lock_rec_has_to_wait(
 #endif /* HAVE_REPLICATION */
 
 #ifdef WITH_WSREP
-	/* New lock request from a transaction is using unique key
-	scan and this transaction is a wsrep high priority transaction
-	(brute force). If conflicting transaction is also wsrep high
-	priority transaction we should avoid lock conflict because
-	ordering of these transactions is already decided and
-	conflicting transaction will be later replayed. */
-	if (trx->is_wsrep_UK_scan()
-	    && wsrep_thd_is_BF(lock2->trx->mysql_thd, false)) {
-		return false;
-	}
-
-	/* if BF-BF conflict, we have to look at write set order */
-	if (trx->is_wsrep() &&
-	   (type_mode & LOCK_MODE_MASK) == LOCK_X &&
-	   (lock2->type_mode & LOCK_MODE_MASK) == LOCK_X &&
-	   wsrep_thd_order_before(trx->mysql_thd,
-				  lock2->trx->mysql_thd)) {
-		return false;
-	}
-
-	/* We very well can let bf to wait normally as other
-	BF will be replayed in case of conflict. For debug
-	builds we will do additional sanity checks to catch
-	unsupported bf wait if any. */
-	ut_d(wsrep_assert_no_bf_bf_wait(lock2, trx));
+	if (trx->is_wsrep())
+		return lock_rec_has_to_wait_wsrep(trx, type_mode, lock2);
 #endif /* WITH_WSREP */
 
 	return true;
@@ -1766,14 +1827,6 @@ lock_rec_has_to_wait_in_queue(const hash_cell_t &cell, const lock_t *wait_lock)
 		if (heap_no < lock_rec_get_n_bits(lock)
 		    && (p[bit_offset] & bit_mask)
 		    && lock_has_to_wait(wait_lock, lock)) {
-#ifdef WITH_WSREP
-			if (lock->trx->is_wsrep() &&
-			    wsrep_thd_order_before(wait_lock->trx->mysql_thd,
-						   lock->trx->mysql_thd)) {
-				/* don't wait for another BF lock */
-				continue;
-			}
-#endif
 			return(lock);
 		}
 	}
@@ -6335,7 +6388,7 @@ resolve_table_lock:
       if (!table->lock_mutex_trylock())
       {
         /* The correct latching order is:
-        lock_sys.latch, table->lock_mutex_lock(), lock_sys.wait_mutex.
+        lock_sys.latch, table->lock_latch, lock_sys.wait_mutex.
         Thus, we must release lock_sys.wait_mutex for a blocking wait. */
         mysql_mutex_unlock(&lock_sys.wait_mutex);
         table->lock_mutex_lock();
@@ -6532,9 +6585,9 @@ bool lock_table_has_locks(dict_table_t *table)
   else
 #endif
   {
-    table->lock_mutex_lock();
+    table->lock_shared_lock();
     len= UT_LIST_GET_LEN(table->locks);
-    table->lock_mutex_unlock();
+    table->lock_shared_unlock();
   }
   if (len)
     return true;
@@ -6771,6 +6824,7 @@ and less modified rows. Bit 0 is used to prefer orig_trx in case of a tie.
       if (!cycle)
         goto func_exit; /* One of the transactions was already aborted. */
 
+      lock_sys.deadlocks++;
       victim= cycle;
       undo_no_t victim_weight= calc_victim_weight(victim, trx);
       unsigned victim_pos= l;
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
index 9d239ce80b6..a27f0d39834 100644
--- a/storage/innobase/log/log0log.cc
+++ b/storage/innobase/log/log0log.cc
@@ -235,9 +235,6 @@ void log_t::attach_low(log_file_t file, os_offset_t size)
       mprotect(ptr, size_t(size), PROT_READ);
       buf= static_cast<byte*>(ptr);
       max_buf_free= 1;
-# if defined __linux__ || defined _WIN32
-      set_block_size(CPU_LEVEL1_DCACHE_LINESIZE);
-# endif
       log_maybe_unbuffered= true;
       log_buffered= false;
       mtr_t::finisher_update();
@@ -272,13 +269,16 @@ void log_t::attach_low(log_file_t file, os_offset_t size)
                         log_buffered
                         ? "Buffered log writes"
                         : "File system buffers for log disabled",
-                        block_size);
+                        write_size);
 #endif
 
   mtr_t::finisher_update();
 #ifdef HAVE_PMEM
-  checkpoint_buf= static_cast<byte*>(aligned_malloc(block_size, block_size));
-  memset_aligned<64>(checkpoint_buf, 0, block_size);
+  ut_ad(ut_is_2pow(write_size));
+  ut_ad(write_size >= 512);
+  ut_ad(write_size <= 4096);
+  checkpoint_buf= static_cast<byte*>(aligned_malloc(write_size, write_size));
+  memset_aligned<512>(checkpoint_buf, 0, write_size);
   return true;
 #endif
 }
@@ -429,7 +429,7 @@ void log_t::set_buffered(bool buffered)
                           log_buffered
                           ? "Buffered log writes"
                           : "File system buffers for log disabled",
-                          block_size);
+                          write_size);
   }
   log_resize_release();
 }
@@ -491,6 +491,8 @@ log_t::resize_start_status log_t::resize_start(os_offset_t size) noexcept
                           OS_FILE_NORMAL, OS_LOG_FILE, false, &success);
     if (success)
     {
+      ut_ad(!(size_t(file_size) & (write_size - 1)));
+      ut_ad(!(size_t(size) & (write_size - 1)));
       log_resize_release();
 
       void *ptr= nullptr, *ptr2= nullptr;
@@ -546,7 +548,7 @@ log_t::resize_start_status log_t::resize_start(os_offset_t size) noexcept
         {
           memcpy_aligned<16>(resize_buf, buf, (buf_free + 15) & ~15);
           start_lsn= first_lsn +
-            (~lsn_t{get_block_size() - 1} & (write_lsn - first_lsn));
+            (~lsn_t{write_size - 1} & (write_lsn - first_lsn));
         }
       }
       resize_lsn.store(start_lsn, std::memory_order_relaxed);
@@ -602,32 +604,30 @@ void log_t::resize_abort() noexcept
 
 /** Write an aligned buffer to ib_logfile0.
 @param buf    buffer to be written
-@param len    length of data to be written
+@param length length of data to be written
 @param offset log file offset */
-static void log_write_buf(const byte *buf, size_t len, lsn_t offset)
+static void log_write_buf(const byte *buf, size_t length, lsn_t offset)
 {
   ut_ad(write_lock.is_owner());
   ut_ad(!recv_no_log_write);
-  ut_d(const size_t block_size_1= log_sys.get_block_size() - 1);
+  ut_d(const size_t block_size_1= log_sys.write_size - 1);
   ut_ad(!(offset & block_size_1));
-  ut_ad(!(len & block_size_1));
+  ut_ad(!(length & block_size_1));
   ut_ad(!(size_t(buf) & block_size_1));
-  ut_ad(len);
+  ut_ad(length);
 
-  if (UNIV_LIKELY(offset + len <= log_sys.file_size))
+  const lsn_t maximum_write_length{log_sys.file_size - offset};
+  ut_ad(maximum_write_length <= log_sys.file_size - log_sys.START_OFFSET);
+
+  if (UNIV_UNLIKELY(length > maximum_write_length))
   {
-write:
-    log_sys.log.write(offset, {buf, len});
-    return;
+    log_sys.log.write(offset, {buf, size_t(maximum_write_length)});
+    length-= size_t(maximum_write_length);
+    buf+= size_t(maximum_write_length);
+    ut_ad(log_sys.START_OFFSET + length < offset);
+    offset= log_sys.START_OFFSET;
   }
-
-  const size_t write_len= size_t(log_sys.file_size - offset);
-  log_sys.log.write(offset, {buf, write_len});
-  len-= write_len;
-  buf+= write_len;
-  ut_ad(log_sys.START_OFFSET + len < offset);
-  offset= log_sys.START_OFFSET;
-  goto write;
+  log_sys.log.write(offset, {buf, length});
 }
 
 /** Invoke commit_checkpoint_notify_ha() to notify that outstanding
@@ -802,11 +802,12 @@ inline void log_t::persist(lsn_t lsn) noexcept
 }
 #endif
 
+ATTRIBUTE_COLD ATTRIBUTE_NOINLINE
 /** Write resize_buf to resize_log.
 @param length  the used length of resize_buf */
-ATTRIBUTE_COLD void log_t::resize_write_buf(size_t length) noexcept
+void log_t::resize_write_buf(size_t length) noexcept
 {
-  const size_t block_size_1= get_block_size() - 1;
+  const size_t block_size_1= write_size - 1;
   ut_ad(!(resize_target & block_size_1));
   ut_ad(!(length & block_size_1));
   ut_ad(length > block_size_1);
@@ -826,7 +827,7 @@ ATTRIBUTE_COLD void log_t::resize_write_buf(size_t length) noexcept
   }
 
   ut_a(os_file_write_func(IORequestWrite, "ib_logfile101", resize_log.m_file,
-                          resize_flush_buf, offset, length) == DB_SUCCESS);
+                          buf, offset, length) == DB_SUCCESS);
 }
 
 /** Write buf to ib_logfile0.
@@ -848,64 +849,88 @@ template<bool release_latch> inline lsn_t log_t::write_buf() noexcept
   }
   else
   {
+    ut_ad(write_lock.is_owner());
     ut_ad(!recv_no_log_write);
     write_lock.set_pending(lsn);
     ut_ad(write_lsn >= get_flushed_lsn());
-    const size_t block_size_1{get_block_size() - 1};
-    lsn_t offset{calc_lsn_offset(write_lsn) & ~lsn_t{block_size_1}};
+    const size_t write_size_1{write_size - 1};
+    ut_ad(ut_is_2pow(write_size));
+    size_t length{buf_free.load(std::memory_order_relaxed)};
+    lsn_t offset{calc_lsn_offset(write_lsn)};
+    ut_ad(length >= (offset & write_size_1));
+    ut_ad(write_size_1 >= 511);
 
-    DBUG_PRINT("ib_log", ("write " LSN_PF " to " LSN_PF " at " LSN_PF,
-                          write_lsn, lsn, offset));
-    const byte *write_buf{buf};
-    size_t length{buf_free};
-    ut_ad(length >= (calc_lsn_offset(write_lsn) & block_size_1));
-    const size_t new_buf_free{length & block_size_1};
-    buf_free= new_buf_free;
-    ut_ad(new_buf_free == ((lsn - first_lsn) & block_size_1));
+    const byte *const write_buf{buf};
+    offset&= ~lsn_t{write_size_1};
 
-    if (new_buf_free)
+    if (length <= write_size_1)
     {
+      ut_ad(!((length ^ (size_t(lsn) - size_t(first_lsn))) & write_size_1));
+      /* Keep filling the same buffer until we have more than one block. */
 #if 0 /* TODO: Pad the last log block with dummy records. */
-      buf_free= log_pad(lsn, get_block_size() - new_buf_free,
-                        buf + new_buf_free, flush_buf);
+      buf_free= log_pad(lsn, (write_size_1 + 1) - length,
+                        buf + length, flush_buf);
       ... /* TODO: Update the LSN and adjust other code. */
 #else
-      /* The rest of the block will be written as garbage.
-      (We want to avoid memset() while holding exclusive log_sys.latch)
-      This block will be overwritten later, once records beyond
-      the current LSN are generated. */
 # ifdef HAVE_valgrind
-      MEM_MAKE_DEFINED(buf + length, get_block_size() - new_buf_free);
-      if (UNIV_LIKELY_NULL(resize_flush_buf))
-        MEM_MAKE_DEFINED(resize_buf + length, get_block_size() - new_buf_free);
+      MEM_MAKE_DEFINED(buf + length, (write_size_1 + 1) - length);
+      if (UNIV_LIKELY_NULL(resize_buf))
+        MEM_MAKE_DEFINED(resize_buf + length, (write_size_1 + 1) - length);
 # endif
       buf[length]= 0; /* allow recovery to catch EOF faster */
-      length&= ~block_size_1;
-      memcpy_aligned<16>(flush_buf, buf + length, (new_buf_free + 15) & ~15);
-      if (UNIV_LIKELY_NULL(resize_flush_buf))
-        memcpy_aligned<16>(resize_flush_buf, resize_buf + length,
-                           (new_buf_free + 15) & ~15);
-      length+= get_block_size();
 #endif
+      length= write_size_1 + 1;
+    }
+    else
+    {
+      const size_t new_buf_free{length & write_size_1};
+      ut_ad(new_buf_free == ((lsn - first_lsn) & write_size_1));
+      buf_free.store(new_buf_free, std::memory_order_relaxed);
+
+      if (new_buf_free)
+      {
+        /* The rest of the block will be written as garbage.
+        (We want to avoid memset() while holding exclusive log_sys.latch)
+        This block will be overwritten later, once records beyond
+        the current LSN are generated. */
+#ifdef HAVE_valgrind
+          MEM_MAKE_DEFINED(buf + length, (write_size_1 + 1) - new_buf_free);
+        if (UNIV_LIKELY_NULL(resize_buf))
+          MEM_MAKE_DEFINED(resize_buf + length, (write_size_1 + 1) -
+                           new_buf_free);
+#endif
+        buf[length]= 0; /* allow recovery to catch EOF faster */
+        length&= ~write_size_1;
+        memcpy_aligned<16>(flush_buf, buf + length, (new_buf_free + 15) & ~15);
+        if (UNIV_LIKELY_NULL(resize_buf))
+          memcpy_aligned<16>(resize_flush_buf, resize_buf + length,
+                             (new_buf_free + 15) & ~15);
+        length+= write_size_1 + 1;
+      }
+
+      std::swap(buf, flush_buf);
+      std::swap(resize_buf, resize_flush_buf);
     }
 
-    std::swap(buf, flush_buf);
-    std::swap(resize_buf, resize_flush_buf);
     write_to_log++;
     if (release_latch)
       latch.wr_unlock();
 
+    DBUG_PRINT("ib_log", ("write " LSN_PF " to " LSN_PF " at " LSN_PF,
+                          write_lsn, lsn, offset));
+
+    /* Do the write to the log file */
+    log_write_buf(write_buf, length, offset);
+
+    if (UNIV_LIKELY_NULL(resize_buf))
+      resize_write_buf(length);
+    write_lsn= lsn;
+
     if (UNIV_UNLIKELY(srv_shutdown_state > SRV_SHUTDOWN_INITIATED))
     {
       service_manager_extend_timeout(INNODB_EXTEND_TIMEOUT_INTERVAL,
                                      "InnoDB log write: " LSN_PF, write_lsn);
     }
-
-    /* Do the write to the log file */
-    log_write_buf(write_buf, length, offset);
-    if (UNIV_LIKELY_NULL(resize_buf))
-      resize_write_buf(length);
-    write_lsn= lsn;
   }
 
   set_check_for_checkpoint(false);
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 97bf3ec6393..c54cca4a2d1 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -1682,7 +1682,7 @@ dberr_t recv_sys_t::find_checkpoint()
   lsn= 0;
   buf= my_assume_aligned<4096>(log_sys.buf);
   if (!log_sys.is_pmem())
-    if (dberr_t err= log_sys.log.read(0, {buf, 4096}))
+    if (dberr_t err= log_sys.log.read(0, {buf, log_sys.START_OFFSET}))
       return err;
   /* Check the header page checksum. There was no
   checksum in the first redo log format (version 0). */
@@ -1751,12 +1751,7 @@ dberr_t recv_sys_t::find_checkpoint()
     for (size_t field= log_t::CHECKPOINT_1; field <= log_t::CHECKPOINT_2;
          field+= log_t::CHECKPOINT_2 - log_t::CHECKPOINT_1)
     {
-      if (log_sys.is_pmem())
-        buf= log_sys.buf + field;
-      else
-        if (dberr_t err= log_sys.log.read(field,
-                                          {buf, log_sys.get_block_size()}))
-          return err;
+      buf= log_sys.buf + field;
       const lsn_t checkpoint_lsn{mach_read_from_8(buf)};
       const lsn_t end_lsn{mach_read_from_8(buf + 8)};
       if (checkpoint_lsn < first_lsn || end_lsn < checkpoint_lsn ||
@@ -3966,7 +3961,7 @@ static bool recv_scan_log(bool last_phase)
   DBUG_ENTER("recv_scan_log");
 
   ut_ad(log_sys.is_latest());
-  const size_t block_size_1{log_sys.get_block_size() - 1};
+  const size_t block_size_1{log_sys.write_size - 1};
 
   mysql_mutex_lock(&recv_sys.mutex);
   if (!last_phase)
@@ -4148,7 +4143,7 @@ static bool recv_scan_log(bool last_phase)
     if (recv_sys.is_corrupt_log())
       break;
 
-    if (recv_sys.offset < log_sys.get_block_size() &&
+    if (recv_sys.offset < log_sys.write_size &&
         recv_sys.lsn == recv_sys.scanned_lsn)
       goto got_eof;
 
@@ -4484,6 +4479,24 @@ dberr_t recv_recovery_read_checkpoint()
   return err;
 }
 
+inline void log_t::set_recovered() noexcept
+{
+  ut_ad(get_flushed_lsn() == get_lsn());
+  ut_ad(recv_sys.lsn == get_lsn());
+  size_t offset{recv_sys.offset};
+  if (!is_pmem())
+  {
+    const size_t bs{log_sys.write_size}, bs_1{bs - 1};
+    memmove_aligned<512>(buf, buf + (offset & ~bs_1), bs);
+    offset&= bs_1;
+  }
+#ifdef HAVE_PMEM
+  else
+    mprotect(buf, size_t(file_size), PROT_READ | PROT_WRITE);
+#endif
+  set_buf_free(offset);
+}
+
 /** Start recovering from a redo log checkpoint.
 of first system tablespace page
 @return error code or DB_SUCCESS */
@@ -4657,24 +4670,11 @@ err_exit:
 	}
 
 	if (!srv_read_only_mode && log_sys.is_latest()) {
-		ut_ad(log_sys.get_flushed_lsn() == log_sys.get_lsn());
-		ut_ad(recv_sys.lsn == log_sys.get_lsn());
-		if (!log_sys.is_pmem()) {
-			const size_t bs_1{log_sys.get_block_size() - 1};
-			const size_t ro{recv_sys.offset};
-			recv_sys.offset &= bs_1;
-			memmove_aligned<64>(log_sys.buf,
-					    log_sys.buf + (ro & ~bs_1),
-					    log_sys.get_block_size());
-#ifdef HAVE_PMEM
-		} else {
-			mprotect(log_sys.buf, size_t(log_sys.file_size),
-				 PROT_READ | PROT_WRITE);
-#endif
-		}
-		log_sys.set_buf_free(recv_sys.offset);
+		log_sys.set_recovered();
 		if (recv_needed_recovery
-	            && srv_operation <= SRV_OPERATION_EXPORT_RESTORED) {
+		    && srv_operation <= SRV_OPERATION_EXPORT_RESTORED
+		    && recv_sys.lsn - log_sys.next_checkpoint_lsn
+		    < log_sys.log_capacity) {
 			/* Write a FILE_CHECKPOINT marker as the first thing,
 			before generating any other redo log. This ensures
 			that subsequent crash recovery will be possible even
@@ -4683,6 +4683,7 @@ err_exit:
 		}
 	}
 
+	DBUG_EXECUTE_IF("before_final_redo_apply", goto err_exit;);
 	mysql_mutex_lock(&recv_sys.mutex);
 	if (UNIV_UNLIKELY(recv_sys.scanned_lsn != recv_sys.lsn)
 	    && log_sys.is_latest()) {
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index c623398c836..e68c4832fd6 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -1106,7 +1106,6 @@ static ATTRIBUTE_COLD void os_file_log_buffered()
 {
   log_sys.log_maybe_unbuffered= false;
   log_sys.log_buffered= true;
-  log_sys.set_block_size(512);
 }
 # endif
 
@@ -1217,26 +1216,23 @@ os_file_create_func(
 			direct_flag = O_DIRECT;
 		}
 # ifdef __linux__
-	} else if (type != OS_LOG_FILE) {
-	} else if (log_sys.log_buffered) {
-	skip_o_direct:
-		os_file_log_buffered();
-	} else if (create_mode != OS_FILE_CREATE
+	} else if (type == OS_LOG_FILE && create_mode != OS_FILE_CREATE
 		   && create_mode != OS_FILE_CREATE_SILENT
 		   && !log_sys.is_opened()) {
 		if (stat(name, &st)) {
 			if (errno == ENOENT) {
 				goto not_found;
 			}
+			log_sys.set_block_size(512);
 			goto skip_o_direct;
+		} else if (!os_file_log_maybe_unbuffered(st)
+                           || log_sys.log_buffered) {
+skip_o_direct:
+			os_file_log_buffered();
+		} else {
+			direct_flag = O_DIRECT;
+			log_sys.log_maybe_unbuffered = true;
 		}
-
-		if (!os_file_log_maybe_unbuffered(st)) {
-			goto skip_o_direct;
-		}
-
-		direct_flag = O_DIRECT;
-		log_sys.log_maybe_unbuffered= true;
 # endif
 	}
 #else
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index df1dcdf63ea..fcc10f41268 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -2183,7 +2183,7 @@ dberr_t PageConverter::operator()(buf_block_t* block) UNIV_NOTHROW
 	we no longer evict the pages on DISCARD TABLESPACE. */
 	buf_page_get_gen(block->page.id(), get_zip_size(), RW_NO_LATCH,
 			 nullptr, BUF_PEEK_IF_IN_POOL,
-			 nullptr, nullptr);
+			 nullptr, nullptr, nullptr);
 
 	uint16_t page_type;
 
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 0a38e30bf34..46bfb482223 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -865,6 +865,8 @@ row_sel_build_committed_vers_for_mysql(
 	mtr_t*		mtr)		/*!< in: mtr */
 {
 	if (prebuilt->trx->snapshot_isolation) {
+		ut_ad(prebuilt->trx->isolation_level
+		    == TRX_ISO_READ_UNCOMMITTED);
 		*old_vers = rec;
 		return;
 	}
@@ -5259,7 +5261,20 @@ no_gap_lock:
 			if (UNIV_LIKELY(prebuilt->row_read_type
 					!= ROW_READ_TRY_SEMI_CONSISTENT)
 			    || unique_search
-			    || index != clust_index) {
+			    || index != clust_index
+			    /* If read view was opened, sel_set_rec_lock()
+			    would return DB_RECORD_CHANGED, and we would not be
+			    here. As read view wasn't opened, do locking read
+			    instead of semi-consistent one for READ COMMITTED.
+			    For READ UNCOMMITTED
+			    row_sel_build_committed_vers_for_mysql() must read
+			    uncommitted version of the record. For REPEATABLE
+			    READ and SERIALIZABLE prebuilt->row_read_type
+			    must be not equal to ROW_READ_TRY_SEMI_CONSISTENT,
+			    so there will be locking read for those isolation
+			    levels. */
+			    || (trx->snapshot_isolation && trx->isolation_level
+			      == TRX_ISO_READ_COMMITTED )) {
 				if (!prebuilt->skip_locked) {
 					goto lock_wait_or_error;
 				}
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 91809f020c9..11b8349887f 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -174,7 +174,7 @@ static dberr_t create_log_file(bool create_new_db, lsn_t lsn)
 
 	/* We will retain ib_logfile0 until we have written a new logically
 	empty log as ib_logfile101 and atomically renamed it to
-	ib_logfile0 in log_t::rename_resized(). */
+	ib_logfile0 in log_t::resize_rename(). */
 	delete_log_files();
 
 	ut_ad(!os_aio_pending_reads());
diff --git a/storage/innobase/sync/srw_lock.cc b/storage/innobase/sync/srw_lock.cc
index 19db12452f9..6c37d120f73 100644
--- a/storage/innobase/sync/srw_lock.cc
+++ b/storage/innobase/sync/srw_lock.cc
@@ -191,6 +191,13 @@ void srw_mutex_impl<spinloop>::wake()
   pthread_mutex_unlock(&mutex);
 }
 template<bool spinloop>
+inline void srw_mutex_impl<spinloop>::wake_all()
+{
+  pthread_mutex_lock(&mutex);
+  pthread_cond_broadcast(&cond);
+  pthread_mutex_unlock(&mutex);
+}
+template<bool spinloop>
 void ssux_lock_impl<spinloop>::wake()
 {
   pthread_mutex_lock(&writer.mutex);
@@ -207,6 +214,8 @@ inline void srw_mutex_impl<spinloop>::wait(uint32_t lk)
 { WaitOnAddress(&lock, &lk, 4, INFINITE); }
 template<bool spinloop>
 void srw_mutex_impl<spinloop>::wake() { WakeByAddressSingle(&lock); }
+template<bool spinloop>
+inline void srw_mutex_impl<spinloop>::wake_all() { WakeByAddressAll(&lock); }
 
 template<bool spinloop>
 inline void ssux_lock_impl<spinloop>::wait(uint32_t lk)
@@ -244,6 +253,8 @@ inline void srw_mutex_impl<spinloop>::wait(uint32_t lk)
 { SRW_FUTEX(&lock, WAIT, lk); }
 template<bool spinloop>
 void srw_mutex_impl<spinloop>::wake() { SRW_FUTEX(&lock, WAKE, 1); }
+template<bool spinloop>
+void srw_mutex_impl<spinloop>::wake_all() { SRW_FUTEX(&lock, WAKE, INT_MAX); }
 
 template<bool spinloop>
 inline void ssux_lock_impl<spinloop>::wait(uint32_t lk)
@@ -304,9 +315,8 @@ void srw_mutex_impl<spinloop>::wait_and_lock()
     for (auto spin= srv_n_spin_wait_rounds;;)
     {
       DBUG_ASSERT(~HOLDER & lk);
-      if (lk & HOLDER)
-        lk= lock.load(std::memory_order_relaxed);
-      else
+      lk= lock.load(std::memory_order_relaxed);
+      if (!(lk & HOLDER))
       {
 #ifdef IF_NOT_FETCH_OR_GOTO
         static_assert(HOLDER == (1U << 31), "compatibility");
@@ -316,10 +326,10 @@ void srw_mutex_impl<spinloop>::wait_and_lock()
         if (!((lk= lock.fetch_or(HOLDER, std::memory_order_relaxed)) & HOLDER))
           goto acquired;
 #endif
-        srw_pause(delay);
       }
       if (!--spin)
         break;
+      srw_pause(delay);
     }
   }
 
@@ -392,14 +402,52 @@ template void ssux_lock_impl<false>::wr_wait(uint32_t);
 template<bool spinloop>
 void ssux_lock_impl<spinloop>::rd_wait()
 {
+  const unsigned delay= srw_pause_delay();
+
+  if (spinloop)
+  {
+    for (auto spin= srv_n_spin_wait_rounds; spin; spin--)
+    {
+      srw_pause(delay);
+      if (rd_lock_try())
+        return;
+    }
+  }
+
+  /* Subscribe to writer.wake() or write.wake_all() calls by
+  concurrently executing rd_wait() or writer.wr_unlock(). */
+  uint32_t wl= 1 + writer.lock.fetch_add(1, std::memory_order_acquire);
+
   for (;;)
   {
-    writer.wr_lock();
-    bool acquired= rd_lock_try();
-    writer.wr_unlock();
-    if (acquired)
+    if (UNIV_LIKELY(writer.HOLDER & wl))
+      writer.wait(wl);
+    uint32_t lk= rd_lock_try_low();
+    if (!lk)
       break;
+    if (UNIV_UNLIKELY(lk == WRITER)) /* A wr_lock() just succeeded. */
+      /* Immediately wake up (also) wr_lock(). We may also unnecessarily
+      wake up other concurrent threads that are executing rd_wait().
+      If we invoked writer.wake() here to wake up just one thread,
+      we could wake up a rd_wait(), which then would invoke writer.wake(),
+      waking up possibly another rd_wait(), and we could end up doing
+      lots of non-productive context switching until the wr_lock()
+      is finally woken up. */
+      writer.wake_all();
+    srw_pause(delay);
+    wl= writer.lock.load(std::memory_order_acquire);
+    ut_ad(wl);
   }
+
+  /* Unsubscribe writer.wake() and writer.wake_all(). */
+  wl= writer.lock.fetch_sub(1, std::memory_order_release);
+  ut_ad(wl);
+
+  /* Wake any other threads that may be blocked in writer.wait().
+  All other waiters than this rd_wait() would end up acquiring writer.lock
+  and waking up other threads on unlock(). */
+  if (wl > 1)
+    writer.wake_all();
 }
 
 template void ssux_lock_impl<true>::rd_wait();
@@ -462,17 +510,40 @@ template<bool spinloop>
 void srw_lock_impl<spinloop>::psi_wr_lock(const char *file, unsigned line)
 {
   PSI_rwlock_locker_state state;
-  const bool nowait= lock.wr_lock_try();
+# if defined _WIN32 || defined SUX_LOCK_GENERIC
+  const bool nowait2= lock.wr_lock_try();
+# else
+  const bool nowait1= lock.writer.wr_lock_try();
+  uint32_t lk= 0;
+  const bool nowait2= nowait1 &&
+    lock.readers.compare_exchange_strong(lk, lock.WRITER,
+                                         std::memory_order_acquire,
+                                         std::memory_order_relaxed);
+# endif
   if (PSI_rwlock_locker *locker= PSI_RWLOCK_CALL(start_rwlock_wrwait)
       (&state, pfs_psi,
-       nowait ? PSI_RWLOCK_TRYWRITELOCK : PSI_RWLOCK_WRITELOCK, file, line))
+       nowait2 ? PSI_RWLOCK_TRYWRITELOCK : PSI_RWLOCK_WRITELOCK, file, line))
   {
-    if (!nowait)
+# if defined _WIN32 || defined SUX_LOCK_GENERIC
+    if (!nowait2)
       lock.wr_lock();
+# else
+    if (!nowait1)
+      lock.wr_lock();
+    else if (!nowait2)
+      lock.u_wr_upgrade();
+# endif
     PSI_RWLOCK_CALL(end_rwlock_rdwait)(locker, 0);
   }
-  else if (!nowait)
+# if defined _WIN32 || defined SUX_LOCK_GENERIC
+  else if (!nowait2)
     lock.wr_lock();
+# else
+  else if (!nowait1)
+    lock.wr_lock();
+  else if (!nowait2)
+    lock.u_wr_upgrade();
+# endif
 }
 
 void ssux_lock::psi_rd_lock(const char *file, unsigned line)
@@ -507,25 +578,48 @@ void ssux_lock::psi_u_lock(const char *file, unsigned line)
 void ssux_lock::psi_wr_lock(const char *file, unsigned line)
 {
   PSI_rwlock_locker_state state;
-  const bool nowait= lock.wr_lock_try();
+# if defined _WIN32 || defined SUX_LOCK_GENERIC
+  const bool nowait2= lock.wr_lock_try();
+# else
+  const bool nowait1= lock.writer.wr_lock_try();
+  uint32_t lk= 0;
+  const bool nowait2= nowait1 &&
+    lock.readers.compare_exchange_strong(lk, lock.WRITER,
+                                         std::memory_order_acquire,
+                                         std::memory_order_relaxed);
+# endif
   if (PSI_rwlock_locker *locker= PSI_RWLOCK_CALL(start_rwlock_wrwait)
       (&state, pfs_psi,
-       nowait ? PSI_RWLOCK_TRYEXCLUSIVELOCK : PSI_RWLOCK_EXCLUSIVELOCK,
+       nowait2 ? PSI_RWLOCK_TRYEXCLUSIVELOCK : PSI_RWLOCK_EXCLUSIVELOCK,
        file, line))
   {
-    if (!nowait)
+# if defined _WIN32 || defined SUX_LOCK_GENERIC
+    if (!nowait2)
       lock.wr_lock();
+# else
+    if (!nowait1)
+      lock.wr_lock();
+    else if (!nowait2)
+      lock.u_wr_upgrade();
+# endif
     PSI_RWLOCK_CALL(end_rwlock_rdwait)(locker, 0);
   }
-  else if (!nowait)
+# if defined _WIN32 || defined SUX_LOCK_GENERIC
+  else if (!nowait2)
     lock.wr_lock();
+# else
+  else if (!nowait1)
+    lock.wr_lock();
+  else if (!nowait2)
+    lock.u_wr_upgrade();
+# endif
 }
 
 void ssux_lock::psi_u_wr_upgrade(const char *file, unsigned line)
 {
   PSI_rwlock_locker_state state;
   DBUG_ASSERT(lock.writer.is_locked());
-  uint32_t lk= 1;
+  uint32_t lk= 0;
   const bool nowait=
     lock.readers.compare_exchange_strong(lk, ssux_lock_impl<false>::WRITER,
                                          std::memory_order_acquire,
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
index f21ba4229b6..126d8aadacb 100644
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -221,7 +221,7 @@ dberr_t trx_rollback_for_mysql(trx_t* trx)
 		even if trx->state is TRX_STATE_NOT_STARTED. */
 		ut_ad(!(trx->lock.was_chosen_as_deadlock_victim & 1));
 #ifdef WITH_WSREP
-		trx->wsrep= false;
+		ut_ad(!trx->is_wsrep());
 		trx->lock.was_chosen_as_deadlock_victim= false;
 #endif
 		return(DB_SUCCESS);
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index 34c380039ab..ef980eccc36 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -929,6 +929,7 @@ trx_start_low(
 
 #ifdef WITH_WSREP
 	trx->xid.null();
+	trx->wsrep = wsrep_on(trx->mysql_thd);
 #endif /* WITH_WSREP */
 
 	ut_a(ib_vector_is_empty(trx->autoinc_locks));
@@ -1503,6 +1504,8 @@ TRANSACTIONAL_INLINE inline void trx_t::commit_in_memory(const mtr_t *mtr)
     trx_finalize_for_fts(this, undo_no != 0);
 
 #ifdef WITH_WSREP
+  ut_ad(is_wsrep() == wsrep_on(mysql_thd));
+
   /* Serialization history has been written and the transaction is
   committed in memory, which makes this commit ordered. Release commit
   order critical section. */
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 703a2d082ca..b4f1fab8195 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -1846,6 +1846,11 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize)
       _ma_check_print_warning(param, "Number of rows changed from %s to %s",
                               llstr(rows, llbuff),
                               llstr(file->state->records, llbuff2));
+      /*
+        ma_check_print_warning() may generate an error in case of creating keys
+        for ALTER TABLE. In this case we should signal an error.
+      */
+      error= thd->is_error();
     }
   }
   else
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc
index 227018cca50..83f688b7c45 100644
--- a/storage/maria/ha_s3.cc
+++ b/storage/maria/ha_s3.cc
@@ -576,6 +576,7 @@ int ha_s3::create(const char *name, TABLE *table_arg,
     s3_deinit(s3_client);
     if (error)
       maria_delete_table_files(name, 1, 0);
+  }
   else
 #endif /* MOVE_TABLE_TO_S3 */
   {
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 1bcc5a99252..7c57ddeb192 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -2510,7 +2510,7 @@ static int initialize_variables_for_repair(HA_CHECK *param,
   *info->state= info->s->state.state;
   if (share->data_file_type == BLOCK_RECORD)
     share->state.state.data_file_length= MY_ALIGN(sort_info->filelength,
-                                                  share->block_size);
+                                                  (my_off_t) share->block_size);
   else
     share->state.state.data_file_length= sort_info->filelength;
   return 0;
diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp
index 394eba7eb0e..ea34394f8cb 100644
--- a/storage/mroonga/ha_mroonga.hpp
+++ b/storage/mroonga/ha_mroonga.hpp
@@ -35,11 +35,8 @@ extern "C" {
 #include <mrn_operations.hpp>
 #include <mrn_database.hpp>
 
-#if __cplusplus >= 201402
-#  define mrn_override override
-#else
-#  define mrn_override
-#endif
+#define mrn_override override
+
 
 #if (MYSQL_VERSION_ID >= 50514 && MYSQL_VERSION_ID < 50600)
 #  define MRN_HANDLER_HAVE_FINAL_ADD_INDEX 1
@@ -406,7 +403,7 @@ private:
 public:
   ha_mroonga(handlerton *hton, TABLE_SHARE *share_arg);
   ~ha_mroonga();
-  const char *table_type() const;           // required
+  const char *table_type() const override;           // required
   const char *index_type(uint inx) mrn_override;
   const char **bas_ext() const;                                    // required
 
@@ -455,10 +452,10 @@ public:
   int update_row(const uchar *old_data, const uchar *new_data) mrn_override;
   int delete_row(const uchar *buf) mrn_override;
 
-  uint max_supported_record_length()   const mrn_override;
-  uint max_supported_keys()            const mrn_override;
-  uint max_supported_key_parts()       const mrn_override;
-  uint max_supported_key_length()      const mrn_override;
+  uint max_supported_record_length() const   mrn_override;
+  uint max_supported_keys() const            mrn_override;
+  uint max_supported_key_parts() const       mrn_override;
+  uint max_supported_key_length() const      mrn_override;
   uint max_supported_key_part_length() const mrn_override;
 
   ha_rows records_in_range(uint inx, const key_range *min_key,
diff --git a/storage/mroonga/vendor/groonga/lib/dat/dat.hpp b/storage/mroonga/vendor/groonga/lib/dat/dat.hpp
index b6e2893ad07..b1ae507542d 100644
--- a/storage/mroonga/vendor/groonga/lib/dat/dat.hpp
+++ b/storage/mroonga/vendor/groonga/lib/dat/dat.hpp
@@ -185,7 +185,7 @@ class Exception : public std::exception {
   virtual int line() const throw() {
     return line_;
   }
-  virtual const char *what() const throw() {
+  const char *what() const throw() override {
     return what_;
   }
 
@@ -206,7 +206,7 @@ class Error : public Exception {
       : Exception(ex) {}
   virtual ~Error() throw() = default;
 
-  virtual ErrorCode code() const throw() {
+  ErrorCode code() const throw() override {
     return T;
   }
 };
diff --git a/storage/mroonga/vendor/groonga/lib/dat/id-cursor.hpp b/storage/mroonga/vendor/groonga/lib/dat/id-cursor.hpp
index 60953faeb2f..63741e6bf20 100644
--- a/storage/mroonga/vendor/groonga/lib/dat/id-cursor.hpp
+++ b/storage/mroonga/vendor/groonga/lib/dat/id-cursor.hpp
@@ -44,17 +44,17 @@ class GRN_DAT_API IdCursor : public Cursor {
             UInt32 limit = MAX_UINT32,
             UInt32 flags = 0);
 
-  void close();
+  void close() override;
 
-  const Key &next();
+  const Key &next() override;
 
-  UInt32 offset() const {
+  UInt32 offset() const override {
     return offset_;
   }
-  UInt32 limit() const {
+  UInt32 limit() const override {
     return limit_;
   }
-  UInt32 flags() const {
+  UInt32 flags() const override {
     return flags_;
   }
 
diff --git a/storage/mroonga/vendor/groonga/lib/dat/key-cursor.hpp b/storage/mroonga/vendor/groonga/lib/dat/key-cursor.hpp
index 56392b63c23..978724fce80 100644
--- a/storage/mroonga/vendor/groonga/lib/dat/key-cursor.hpp
+++ b/storage/mroonga/vendor/groonga/lib/dat/key-cursor.hpp
@@ -38,17 +38,17 @@ class GRN_DAT_API KeyCursor : public Cursor {
             UInt32 limit = MAX_UINT32,
             UInt32 flags = 0);
 
-  void close();
+  void close() override;
 
-  const Key &next();
+  const Key &next() override;
 
-  UInt32 offset() const {
+  UInt32 offset() const override {
     return offset_;
   }
-  UInt32 limit() const {
+  UInt32 limit() const override {
     return limit_;
   }
-  UInt32 flags() const {
+  UInt32 flags() const override {
     return flags_;
   }
 
diff --git a/storage/mroonga/vendor/groonga/lib/dat/predictive-cursor.hpp b/storage/mroonga/vendor/groonga/lib/dat/predictive-cursor.hpp
index 88a950b8bba..93c151242f0 100644
--- a/storage/mroonga/vendor/groonga/lib/dat/predictive-cursor.hpp
+++ b/storage/mroonga/vendor/groonga/lib/dat/predictive-cursor.hpp
@@ -37,17 +37,17 @@ class GRN_DAT_API PredictiveCursor : public Cursor {
             UInt32 limit = MAX_UINT32,
             UInt32 flags = 0);
 
-  void close();
+  void close() override;
 
-  const Key &next();
+  const Key &next() override;
 
-  UInt32 offset() const {
+  UInt32 offset() const override {
     return offset_;
   }
-  UInt32 limit() const {
+  UInt32 limit() const override {
     return limit_;
   }
-  UInt32 flags() const {
+  UInt32 flags() const override {
     return flags_;
   }
 
diff --git a/storage/mroonga/vendor/groonga/lib/dat/prefix-cursor.hpp b/storage/mroonga/vendor/groonga/lib/dat/prefix-cursor.hpp
index 07a59186b37..8f6e04bd94b 100644
--- a/storage/mroonga/vendor/groonga/lib/dat/prefix-cursor.hpp
+++ b/storage/mroonga/vendor/groonga/lib/dat/prefix-cursor.hpp
@@ -38,17 +38,17 @@ class GRN_DAT_API PrefixCursor : public Cursor {
             UInt32 limit = MAX_UINT32,
             UInt32 flags = 0);
 
-  void close();
+  void close() override;
 
-  const Key &next();
+  const Key &next() override;
 
-  UInt32 offset() const {
+  UInt32 offset() const override {
     return offset_;
   }
-  UInt32 limit() const {
+  UInt32 limit() const override {
     return limit_;
   }
-  UInt32 flags() const {
+  UInt32 flags() const override {
     return flags_;
   }
 
diff --git a/storage/oqgraph/graphcore.cc b/storage/oqgraph/graphcore.cc
index 92796538de3..ecf7a066b2b 100644
--- a/storage/oqgraph/graphcore.cc
+++ b/storage/oqgraph/graphcore.cc
@@ -266,10 +266,10 @@ namespace open_query {
       : oqgraph_cursor(arg), no_weight(), sequence(0), results(), last()
     { }
 
-    int fetch_row(const row &, row&);
-    int fetch_row(const row &, row&, const reference&);
+    int fetch_row(const row &, row&) override;
+    int fetch_row(const row &, row&, const reference&) override;
 
-    void current(reference& ref) const
+    void current(reference& ref) const override
     {
       ref= last;
     }
@@ -286,10 +286,10 @@ namespace open_query {
       : oqgraph_cursor(arg), position(0)
     { }
 
-    int fetch_row(const row &, row&);
-    int fetch_row(const row &, row&, const reference&);
+    int fetch_row(const row &, row&) override;
+    int fetch_row(const row &, row&, const reference&) override;
 
-    void current(reference& ref) const
+    void current(reference& ref) const override
     {
       ref= last;
     }
@@ -308,10 +308,10 @@ namespace open_query {
       : oqgraph_cursor(arg), position(0), last()
     { }
 
-    int fetch_row(const row &, row&);
-    int fetch_row(const row &, row&, const reference&);
+    int fetch_row(const row &, row&) override;
+    int fetch_row(const row &, row&, const reference&) override;
 
-    void current(reference& ref) const
+    void current(reference& ref) const override
     {
       ref= last;
     }
diff --git a/storage/oqgraph/ha_oqgraph.h b/storage/oqgraph/ha_oqgraph.h
index d1f5a898ad7..0b0bb25f4db 100644
--- a/storage/oqgraph/ha_oqgraph.h
+++ b/storage/oqgraph/ha_oqgraph.h
@@ -58,60 +58,60 @@ class ha_oqgraph: public handler
 public:
 #if MYSQL_VERSION_ID >= 50100
   ha_oqgraph(handlerton *hton, TABLE_SHARE *table);
-  ulonglong table_flags() const;
+  ulonglong table_flags() const override;
 #else
   ha_oqgraph(TABLE *table);
   Table_flags table_flags() const;
 #endif
   virtual ~ha_oqgraph();
-  const char *index_type(uint inx)
+  const char *index_type(uint inx) override
   {
     return "HASH";
   }
   /* Rows also use a fixed-size format */
-  enum row_type get_row_type() const { return ROW_TYPE_FIXED; }
-  ulong index_flags(uint inx, uint part, bool all_parts) const;
+  enum row_type get_row_type() const override { return ROW_TYPE_FIXED; }
+  ulong index_flags(uint inx, uint part, bool all_parts) const override;
   const char **bas_ext() const;
-  uint max_supported_keys()          const { return MAX_KEY; }
-  uint max_supported_key_part_length() const { return MAX_KEY_LENGTH; }
-  IO_AND_CPU_COST scan_time()
+  uint max_supported_keys()          const override { return MAX_KEY; }
+  uint max_supported_key_part_length() const override { return MAX_KEY_LENGTH; }
+  IO_AND_CPU_COST scan_time()  override
   { return { (double) 1000000000, (double) 1000000000 }; }
-  IO_AND_CPU_COST rnd_pos_time(ha_rows rows)
+  IO_AND_CPU_COST rnd_pos_time(ha_rows rows)  override
   { return { (double) rows, (double) rows }; }
 
   // Doesn't make sense to change the engine on a virtual table.
-  virtual bool can_switch_engines() { return false; }
+  virtual bool can_switch_engines() override { return false; }
 
-  int open(const char *name, int mode, uint test_if_locked);
-  int close(void);
-  int write_row(const byte * buf);
-  int update_row(const uchar * old_data, const uchar * new_data);
-  int delete_row(const byte * buf);
+  int open(const char *name, int mode, uint test_if_locked) override;
+  int close(void) override;
+  int write_row(const byte * buf) override;
+  int update_row(const uchar * old_data, const uchar * new_data) override;
+  int delete_row(const byte * buf) override;
   int index_read(byte * buf, const byte * key,
-		 uint key_len, enum ha_rkey_function find_flag);
+		 uint key_len, enum ha_rkey_function find_flag) override;
   int index_read_idx(byte * buf, uint idx, const byte * key,
 		     uint key_len, enum ha_rkey_function find_flag);
-  int index_next_same(byte * buf, const byte * key, uint key_len);
-  int rnd_init(bool scan);
-  int rnd_next(byte *buf);
-  int rnd_pos(byte * buf, byte *pos);
-  void position(const byte *record);
-  int info(uint);
-  int extra(enum ha_extra_function operation);
-  int external_lock(THD *thd, int lock_type);
-  int delete_all_rows(void);
+  int index_next_same(byte * buf, const byte * key, uint key_len) override;
+  int rnd_init(bool scan) override;
+  int rnd_next(byte *buf) override;
+  int rnd_pos(byte * buf, byte *pos) override;
+  void position(const byte *record) override;
+  int info(uint) override;
+  int extra(enum ha_extra_function operation) override;
+  int external_lock(THD *thd, int lock_type) override;
+  int delete_all_rows(void) override;
   ha_rows records_in_range(uint inx, const key_range *min_key,
-                           const key_range *max_key, page_range *pages);
-  int delete_table(const char *from);
-  int rename_table(const char * from, const char * to);
-  int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info);
-  void update_create_info(HA_CREATE_INFO *create_info);
+                           const key_range *max_key, page_range *pages) override;
+  int delete_table(const char *from) override;
+  int rename_table(const char * from, const char * to) override;
+  int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info) override;
+  void update_create_info(HA_CREATE_INFO *create_info) override;
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-			     enum thr_lock_type lock_type);
-  int cmp_ref(const byte *ref1, const byte *ref2);
+			     enum thr_lock_type lock_type) override;
+  int cmp_ref(const byte *ref1, const byte *ref2) override;
 
-  bool get_error_message(int error, String* buf);
+  bool get_error_message(int error, String* buf) override;
 
   void fprint_error(const char* fmt, ...);
 
@@ -124,7 +124,7 @@ public:
                                      uint key_length,
                                      qc_engine_callback
                                      *engine_callback,
-                                     ulonglong *engine_data)
+                                     ulonglong *engine_data)  override
   {
     /* 
       Do not put data from OQGRAPH tables into query cache (because there 
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt
index e703e43fe50..402f62d569d 100644
--- a/storage/perfschema/CMakeLists.txt
+++ b/storage/perfschema/CMakeLists.txt
@@ -49,7 +49,6 @@ cursor_by_thread.h
 cursor_by_user.h
 pfs.h
 pfs_account.h
-pfs_atomic.h
 pfs_buffer_container.h
 pfs_builtin_memory.h
 pfs_column_types.h
diff --git a/storage/perfschema/cursor_by_account.h b/storage/perfschema/cursor_by_account.h
index 44175ceb3a2..61e9f9afd31 100644
--- a/storage/perfschema/cursor_by_account.h
+++ b/storage/perfschema/cursor_by_account.h
@@ -43,9 +43,9 @@ class cursor_by_account : public PFS_engine_table
 public:
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   cursor_by_account(const PFS_engine_table_share *share);
diff --git a/storage/perfschema/cursor_by_host.h b/storage/perfschema/cursor_by_host.h
index c8a83a47ec6..a9e2005148f 100644
--- a/storage/perfschema/cursor_by_host.h
+++ b/storage/perfschema/cursor_by_host.h
@@ -43,9 +43,9 @@ class cursor_by_host : public PFS_engine_table
 public:
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   cursor_by_host(const PFS_engine_table_share *share);
diff --git a/storage/perfschema/cursor_by_thread.h b/storage/perfschema/cursor_by_thread.h
index 50e162294cf..c1e647fba8c 100644
--- a/storage/perfschema/cursor_by_thread.h
+++ b/storage/perfschema/cursor_by_thread.h
@@ -43,9 +43,9 @@ class cursor_by_thread : public PFS_engine_table
 public:
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   cursor_by_thread(const PFS_engine_table_share *share);
diff --git a/storage/perfschema/cursor_by_thread_connect_attr.h b/storage/perfschema/cursor_by_thread_connect_attr.h
index 4f48b40c870..fffa89c7e81 100644
--- a/storage/perfschema/cursor_by_thread_connect_attr.h
+++ b/storage/perfschema/cursor_by_thread_connect_attr.h
@@ -62,9 +62,9 @@ class cursor_by_thread_connect_attr : public PFS_engine_table
 public:
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   cursor_by_thread_connect_attr(const PFS_engine_table_share *share);
diff --git a/storage/perfschema/cursor_by_user.h b/storage/perfschema/cursor_by_user.h
index 6438515cf1e..d45507a2b50 100644
--- a/storage/perfschema/cursor_by_user.h
+++ b/storage/perfschema/cursor_by_user.h
@@ -43,9 +43,9 @@ class cursor_by_user : public PFS_engine_table
 public:
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   cursor_by_user(const PFS_engine_table_share *share);
diff --git a/storage/perfschema/ha_perfschema.h b/storage/perfschema/ha_perfschema.h
index f1929d2334b..07db9dd1941 100644
--- a/storage/perfschema/ha_perfschema.h
+++ b/storage/perfschema/ha_perfschema.h
@@ -53,10 +53,10 @@ public:
 
   ~ha_perfschema();
 
-  const char *index_type(uint) { return ""; }
+  const char *index_type(uint) override { return ""; }
 
   /** Capabilities of the performance schema tables. */
-  ulonglong table_flags(void) const
+  ulonglong table_flags(void) const override
   {
     /*
       About HA_FAST_KEY_READ:
@@ -86,25 +86,25 @@ public:
     Operations supported by indexes.
     None, there are no indexes.
   */
-  ulong index_flags(uint , uint , bool ) const
+  ulong index_flags(uint , uint , bool ) const override
   { return 0; }
 
-  uint max_supported_record_length(void) const
+  uint max_supported_record_length(void) const override
   { return HA_MAX_REC_LENGTH; }
 
-  uint max_supported_keys(void) const
+  uint max_supported_keys(void) const override
   { return 0; }
 
-  uint max_supported_key_parts(void) const
+  uint max_supported_key_parts(void) const override
   { return 0; }
 
-  uint max_supported_key_length(void) const
+  uint max_supported_key_length(void) const override
   { return 0; }
 
-  ha_rows estimate_rows_upper_bound(void)
+  ha_rows estimate_rows_upper_bound(void) override
   { return HA_POS_ERROR; }
 
-  IO_AND_CPU_COST scan_time(void)
+  IO_AND_CPU_COST scan_time(void)  override
   {
     return {0.0, 1.0};
   }
@@ -116,22 +116,22 @@ public:
     @param test_if_locked unused
     @return 0 on success
   */
-  int open(const char *name, int mode, uint test_if_locked);
+  int open(const char *name, int mode, uint test_if_locked) override;
 
   /**
     Close a table handle.
     @sa open.
   */
-  int close(void);
+  int close(void) override;
 
   /**
     Write a row.
     @param buf the row to write
     @return 0 on success
   */
-  int write_row(const uchar *buf);
+  int write_row(const uchar *buf) override;
 
-  void use_hidden_primary_key();
+  void use_hidden_primary_key() override;
 
   /**
     Update a row.
@@ -139,29 +139,29 @@ public:
     @param new_data the row new values
     @return 0 on success
   */
-  int update_row(const uchar *old_data, const uchar *new_data);
+  int update_row(const uchar *old_data, const uchar *new_data) override;
 
   /**
     Delete a row.
     @param buf the row to delete
     @return 0 on success
   */
-  int delete_row(const uchar *buf);
+  int delete_row(const uchar *buf) override;
 
-  int rnd_init(bool scan);
+  int rnd_init(bool scan) override;
 
   /**
     Scan end.
     @sa rnd_init.
   */
-  int rnd_end(void);
+  int rnd_end(void) override;
 
   /**
     Iterator, fetch the next row.
     @param[out] buf the row fetched.
     @return 0 on success
   */
-  int rnd_next(uchar *buf);
+  int rnd_next(uchar *buf) override;
 
   /**
     Iterator, fetch the row at a given position.
@@ -169,42 +169,42 @@ public:
     @param pos the row position
     @return 0 on success
   */
-  int rnd_pos(uchar *buf, uchar *pos);
+  int rnd_pos(uchar *buf, uchar *pos) override;
 
   /**
     Read the row current position.
     @param record the current row
   */
-  void position(const uchar *record);
+  void position(const uchar *record) override;
 
-  int info(uint);
+  int info(uint) override;
 
-  int delete_all_rows(void);
+  int delete_all_rows(void) override;
 
-  int truncate();
+  int truncate() override;
 
-  int delete_table(const char *from);
+  int delete_table(const char *from) override;
 
-  int rename_table(const char * from, const char * to);
+  int rename_table(const char * from, const char * to) override;
 
   int create(const char *name, TABLE *form,
-             HA_CREATE_INFO *create_info);
+             HA_CREATE_INFO *create_info) override;
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type);
+                             enum thr_lock_type lock_type) override;
 
-  virtual uint8 table_cache_type(void)
+  uint8 table_cache_type(void) override
   { return HA_CACHE_TBL_NOCACHE; }
 
-  virtual my_bool register_query_cache_table
+  my_bool register_query_cache_table
     (THD *, const char *, uint , qc_engine_callback *engine_callback,
-     ulonglong *)
+     ulonglong *) override
   {
     *engine_callback= 0;
     return FALSE;
   }
 
-  virtual void print_error(int error, myf errflags);
+  void print_error(int error, myf errflags) override;
 
 private:
   /**
diff --git a/storage/perfschema/pfs_account.cc b/storage/perfschema/pfs_account.cc
index ecf26cd77ea..84257d9dc38 100644
--- a/storage/perfschema/pfs_account.cc
+++ b/storage/perfschema/pfs_account.cc
@@ -666,7 +666,7 @@ public:
     : m_thread(thread)
   {}
 
-  virtual void operator()(PFS_account *pfs)
+  void operator()(PFS_account *pfs) override
   {
     PFS_user *user= sanitize_user(pfs->m_user);
     PFS_host *host= sanitize_host(pfs->m_host);
@@ -699,7 +699,7 @@ public:
     : m_thread(thread)
   {}
 
-  virtual void operator()(PFS_account *pfs)
+  void operator()(PFS_account *pfs) override
   {
     if (pfs->m_username_length > 0 && pfs->m_hostname_length > 0)
     {
diff --git a/storage/perfschema/pfs_account.h b/storage/perfschema/pfs_account.h
index 0aa36204e12..8a2d40c5017 100644
--- a/storage/perfschema/pfs_account.h
+++ b/storage/perfschema/pfs_account.h
@@ -27,6 +27,7 @@
   @file storage/perfschema/pfs_account.h
   Performance schema account (declarations).
 */
+#include <atomic>
 
 #include "pfs_lock.h"
 #include "lf.h"
@@ -62,22 +63,22 @@ struct PFS_ALIGNED PFS_account : PFS_connection_slice
 public:
   inline void init_refcount(void)
   {
-    PFS_atomic::store_32(& m_refcount, 1);
+    m_refcount.store(1);
   }
 
   inline int get_refcount(void)
   {
-    return PFS_atomic::load_32(& m_refcount);
+    return m_refcount.load();
   }
 
   inline void inc_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, 1);
+    m_refcount.fetch_add(1);
   }
 
   inline void dec_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, -1);
+    m_refcount.fetch_sub(1);
   }
 
   void aggregate(bool alive, PFS_user *safe_user, PFS_host *safe_host);
@@ -109,7 +110,7 @@ public:
   ulonglong m_disconnected_count;
 
 private:
-  int m_refcount;
+  std::atomic<int> m_refcount;
 };
 
 int init_account(const PFS_global_param *param);
diff --git a/storage/perfschema/pfs_atomic.h b/storage/perfschema/pfs_atomic.h
deleted file mode 100644
index 8543cdabc88..00000000000
--- a/storage/perfschema/pfs_atomic.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License, version 2.0,
-  as published by the Free Software Foundation.
-
-  This program is also distributed with certain software (including
-  but not limited to OpenSSL) that is licensed under separate terms,
-  as designated in a particular file or component or in included license
-  documentation.  The authors of MySQL hereby grant you an additional
-  permission to link the program and your derivative works with the
-  separately licensed software that they have included with MySQL.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License, version 2.0, for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
-
-#ifndef PFS_ATOMIC_H
-#define PFS_ATOMIC_H
-
-/**
-  @file storage/perfschema/pfs_atomic.h
-  Atomic operations (declarations).
-*/
-
-#include <my_atomic.h>
-
-/** Helper for atomic operations. */
-class PFS_atomic
-{
-public:
-  /** Atomic load. */
-  static inline int32 load_32(int32 *ptr)
-  {
-    return my_atomic_load32(ptr);
-  }
-
-  /** Atomic load. */
-  static inline int64 load_64(int64 *ptr)
-  {
-    return my_atomic_load64(ptr);
-  }
-
-  /** Atomic load. */
-  static inline uint32 load_u32(uint32 *ptr)
-  {
-    return (uint32) my_atomic_load32((int32*) ptr);
-  }
-
-  /** Atomic load. */
-  static inline uint64 load_u64(uint64 *ptr)
-  {
-    return (uint64) my_atomic_load64((int64*) ptr);
-  }
-
-  /** Atomic store. */
-  static inline void store_32(int32 *ptr, int32 value)
-  {
-    my_atomic_store32(ptr, value);
-  }
-
-  /** Atomic store. */
-  static inline void store_64(int64 *ptr, int64 value)
-  {
-    my_atomic_store64(ptr, value);
-  }
-
-  /** Atomic store. */
-  static inline void store_u32(uint32 *ptr, uint32 value)
-  {
-    my_atomic_store32((int32*) ptr, (int32) value);
-  }
-
-  /** Atomic store. */
-  static inline void store_u64(uint64 *ptr, uint64 value)
-  {
-    my_atomic_store64((int64*) ptr, (int64) value);
-  }
-
-  /** Atomic add. */
-  static inline int32 add_32(int32 *ptr, int32 value)
-  {
-    return my_atomic_add32(ptr, value);
-  }
-
-  /** Atomic add. */
-  static inline int64 add_64(int64 *ptr, int64 value)
-  {
-    return my_atomic_add64(ptr, value);
-  }
-
-  /** Atomic add. */
-  static inline uint32 add_u32(uint32 *ptr, uint32 value)
-  {
-    return (uint32) my_atomic_add32((int32*) ptr, (int32) value);
-  }
-
-  /** Atomic add. */
-  static inline uint64 add_u64(uint64 *ptr, uint64 value)
-  {
-    return (uint64) my_atomic_add64((int64*) ptr, (int64) value);
-  }
-
-  /** Atomic compare and swap. */
-  static inline bool cas_32(int32 *ptr, int32 *old_value,
-                            int32 new_value)
-  {
-    return my_atomic_cas32(ptr, old_value, new_value);
-  }
-
-  /** Atomic compare and swap. */
-  static inline bool cas_64(int64 *ptr, int64 *old_value,
-                            int64 new_value)
-  {
-    return my_atomic_cas64(ptr, old_value, new_value);
-  }
-
-  /** Atomic compare and swap. */
-  static inline bool cas_u32(uint32 *ptr, uint32 *old_value,
-                             uint32 new_value)
-  {
-    return my_atomic_cas32((int32*) ptr, (int32*) old_value,
-                           (uint32) new_value);
-  }
-
-  /** Atomic compare and swap. */
-  static inline bool cas_u64(uint64 *ptr, uint64 *old_value,
-                             uint64 new_value)
-  {
-    return my_atomic_cas64((int64*) ptr, (int64*) old_value,
-                            (uint64) new_value);
-  }
-};
-
-#endif
-
diff --git a/storage/perfschema/pfs_buffer_container.h b/storage/perfschema/pfs_buffer_container.h
index b5506fe0195..c1cd9e644ef 100644
--- a/storage/perfschema/pfs_buffer_container.h
+++ b/storage/perfschema/pfs_buffer_container.h
@@ -87,7 +87,7 @@ public:
     if (m_full)
       return NULL;
 
-    monotonic= PFS_atomic::add_u32(& m_monotonic.m_u32, 1);
+    monotonic= m_monotonic.m_u32.fetch_add(1);
     monotonic_max= monotonic + static_cast<uint>(m_max);
 
     while (monotonic < monotonic_max)
@@ -99,7 +99,8 @@ public:
       {
         return pfs;
       }
-      monotonic= PFS_atomic::add_u32(& m_monotonic.m_u32, 1);
+      monotonic= m_monotonic.m_u32.fetch_add(1);
+
     }
 
     m_full= true;
@@ -517,7 +518,7 @@ public:
 
   ulong get_row_count()
   {
-    ulong page_count= PFS_atomic::load_u32(& m_max_page_index.m_u32);
+    ulong page_count= m_max_page_index.m_u32.load();
 
     return page_count * PFS_PAGE_SIZE;
   }
@@ -554,11 +555,11 @@ public:
     /*
       1: Try to find an available record within the existing pages
     */
-    current_page_count= PFS_atomic::load_u32(& m_max_page_index.m_u32);
+    current_page_count= m_max_page_index.m_u32.load();
 
     if (current_page_count != 0)
     {
-      monotonic= PFS_atomic::load_u32(& m_monotonic.m_u32);
+      monotonic= m_monotonic.m_u32.load();
       monotonic_max= monotonic + current_page_count;
 
       while (monotonic < monotonic_max)
@@ -602,7 +603,7 @@ public:
           counter faster and then move on to the detection of new pages,
           in part 2: below.
         */
-        monotonic= PFS_atomic::add_u32(& m_monotonic.m_u32, 1);
+        monotonic= m_monotonic.m_u32.fetch_add(1);
       };
     }
 
@@ -683,7 +684,7 @@ public:
           my_atomic_storeptr(typed_addr, ptr);
 
           /* Advertise the new page */
-          PFS_atomic::add_u32(& m_max_page_index.m_u32, 1);
+          m_max_page_index.m_u32.fetch_add(1);
         }
 
         pthread_mutex_unlock(& m_critical_section);
diff --git a/storage/perfschema/pfs_digest.cc b/storage/perfschema/pfs_digest.cc
index fd5fdc5f8ff..47fa82dcb9a 100644
--- a/storage/perfschema/pfs_digest.cc
+++ b/storage/perfschema/pfs_digest.cc
@@ -76,7 +76,7 @@ int init_digest(const PFS_global_param *param)
   */
   digest_max= param->m_digest_sizing;
   digest_lost= 0;
-  PFS_atomic::store_u32(& digest_monotonic_index.m_u32, 1);
+  digest_monotonic_index.m_u32.store(1);
   digest_full= false;
 
   if (digest_max == 0)
@@ -275,7 +275,7 @@ search:
 
   while (++attempts <= digest_max)
   {
-    safe_index= PFS_atomic::add_u32(& digest_monotonic_index.m_u32, 1) % digest_max;
+    safe_index= digest_monotonic_index.m_u32.fetch_add(1) % digest_max;
     if (safe_index == 0)
     {
       /* Record [0] is reserved. */
@@ -407,7 +407,7 @@ void reset_esms_by_digest()
     Reset index which indicates where the next calculated digest information
     to be inserted in statements_digest_stat_array.
   */
-  PFS_atomic::store_u32(& digest_monotonic_index.m_u32, 1);
+  digest_monotonic_index.m_u32.store(1);
   digest_full= false;
 }
 
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc
index 6a73f75f582..15ebe8013cd 100644
--- a/storage/perfschema/pfs_engine_table.cc
+++ b/storage/perfschema/pfs_engine_table.cc
@@ -343,13 +343,13 @@ static PFS_engine_table_share *all_shares[]=
 class PFS_silent_check_intact : public Table_check_intact
 {
 protected:
-  virtual void report_error(uint code, const char *fmt, ...) {}
+  void report_error(uint code, const char *fmt, ...) override {}
 
 public:
   PFS_silent_check_intact()
   {}
 
-  ~PFS_silent_check_intact()
+  ~PFS_silent_check_intact() override
   {}
 };
 
@@ -652,12 +652,12 @@ class PFS_internal_schema_access : public ACL_internal_schema_access
 public:
   PFS_internal_schema_access() = default;
 
-  ~PFS_internal_schema_access() = default;
+  ~PFS_internal_schema_access() override = default;
 
   ACL_internal_access_result check(privilege_t want_access,
-                                   privilege_t *save_priv) const;
+                                   privilege_t *save_priv) const override;
 
-  const ACL_internal_table_access *lookup(const char *name) const;
+  const ACL_internal_table_access *lookup(const char *name) const override;
 };
 
 ACL_internal_access_result
diff --git a/storage/perfschema/pfs_engine_table.h b/storage/perfschema/pfs_engine_table.h
index 389d9a56480..856010a4a4b 100644
--- a/storage/perfschema/pfs_engine_table.h
+++ b/storage/perfschema/pfs_engine_table.h
@@ -356,8 +356,8 @@ public:
 
   ~PFS_readonly_acl() = default;
 
-  virtual ACL_internal_access_result check(privilege_t want_access,
-                                           privilege_t *save_priv) const;
+    ACL_internal_access_result check(privilege_t want_access,
+                                     privilege_t *save_priv) const override;
 };
 
 /** Singleton instance of PFS_readonly_acl. */
@@ -374,8 +374,8 @@ public:
 
   ~PFS_truncatable_acl() = default;
 
-  virtual ACL_internal_access_result check(privilege_t want_access,
-                                   privilege_t *save_priv) const;
+  ACL_internal_access_result check(privilege_t want_access,
+                                   privilege_t *save_priv) const override;
 };
 
 /** Singleton instance of PFS_truncatable_acl. */
@@ -393,7 +393,7 @@ public:
   ~PFS_updatable_acl() = default;
 
   ACL_internal_access_result check(privilege_t want_access,
-                                   privilege_t *save_priv) const;
+                                   privilege_t *save_priv) const override;
 };
 
 /** Singleton instance of PFS_updatable_acl. */
@@ -411,7 +411,7 @@ public:
   ~PFS_editable_acl() = default;
 
   ACL_internal_access_result check(privilege_t want_access,
-                                   privilege_t *save_priv) const;
+                                   privilege_t *save_priv) const override;
 };
 
 /** Singleton instance of PFS_editable_acl. */
@@ -428,7 +428,7 @@ public:
   ~PFS_unknown_acl() = default;
 
   ACL_internal_access_result check(privilege_t want_access,
-                                   privilege_t *save_priv) const;
+                                   privilege_t *save_priv) const override;
 };
 
 /** Singleton instance of PFS_unknown_acl. */
@@ -446,7 +446,7 @@ public:
 
   ~PFS_readonly_world_acl()
   {}
-  virtual ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const;
+  ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const override;
 };
 
 
@@ -465,7 +465,7 @@ public:
 
   ~PFS_truncatable_world_acl()
   {}
-  virtual ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const;
+  ACL_internal_access_result check(privilege_t want_access, privilege_t *save_priv) const override;
 };
 
 
@@ -484,8 +484,8 @@ class PFS_readonly_processlist_acl : public PFS_readonly_acl {
   ~PFS_readonly_processlist_acl()
   {}
 
-  virtual ACL_internal_access_result check(privilege_t want_access,
-                                           privilege_t *save_priv) const;
+  ACL_internal_access_result check(privilege_t want_access,
+                                   privilege_t *save_priv) const override;
 };
 
 /** Singleton instance of PFS_readonly_processlist_acl */
diff --git a/storage/perfschema/pfs_events_stages.cc b/storage/perfschema/pfs_events_stages.cc
index aa1bdf4f7a0..9289d25e38e 100644
--- a/storage/perfschema/pfs_events_stages.cc
+++ b/storage/perfschema/pfs_events_stages.cc
@@ -34,7 +34,6 @@
 #include "pfs_host.h"
 #include "pfs_user.h"
 #include "pfs_events_stages.h"
-#include "pfs_atomic.h"
 #include "pfs_buffer_container.h"
 #include "pfs_builtin_memory.h"
 #include "m_string.h"
@@ -62,7 +61,7 @@ int init_events_stages_history_long(uint events_stages_history_long_sizing)
 {
   events_stages_history_long_size= events_stages_history_long_sizing;
   events_stages_history_long_full= false;
-  PFS_atomic::store_u32(&events_stages_history_long_index.m_u32, 0);
+  events_stages_history_long_index.m_u32.store(0);
 
   if (events_stages_history_long_size == 0)
     return 0;
@@ -135,7 +134,7 @@ void insert_events_stages_history_long(PFS_events_stages *stage)
 
   assert(events_stages_history_long_array != NULL);
 
-  uint index= PFS_atomic::add_u32(&events_stages_history_long_index.m_u32, 1);
+  uint index= events_stages_history_long_index.m_u32.fetch_add(1);
 
   index= index % events_stages_history_long_size;
   if (index == 0)
@@ -176,7 +175,7 @@ void reset_events_stages_history(void)
 /** Reset table EVENTS_STAGES_HISTORY_LONG data. */
 void reset_events_stages_history_long(void)
 {
-  PFS_atomic::store_u32(&events_stages_history_long_index.m_u32, 0);
+  events_stages_history_long_index.m_u32.store(0);
   events_stages_history_long_full= false;
 
   PFS_events_stages *pfs= events_stages_history_long_array;
diff --git a/storage/perfschema/pfs_events_statements.cc b/storage/perfschema/pfs_events_statements.cc
index 05bdc83fc5c..9bd6013b390 100644
--- a/storage/perfschema/pfs_events_statements.cc
+++ b/storage/perfschema/pfs_events_statements.cc
@@ -34,7 +34,6 @@
 #include "pfs_host.h"
 #include "pfs_user.h"
 #include "pfs_events_statements.h"
-#include "pfs_atomic.h"
 #include "pfs_buffer_container.h"
 #include "pfs_builtin_memory.h"
 #include "m_string.h"
@@ -64,7 +63,7 @@ int init_events_statements_history_long(size_t events_statements_history_long_si
 {
   events_statements_history_long_size= events_statements_history_long_sizing;
   events_statements_history_long_full= false;
-  PFS_atomic::store_u32(&events_statements_history_long_index.m_u32, 0);
+  events_statements_history_long_index.m_u32.store(0);
 
   if (events_statements_history_long_size == 0)
     return 0;
@@ -213,7 +212,7 @@ void insert_events_statements_history_long(PFS_events_statements *statement)
 
   assert(events_statements_history_long_array != NULL);
 
-  uint index= PFS_atomic::add_u32(&events_statements_history_long_index.m_u32, 1);
+  uint index= events_statements_history_long_index.m_u32.fetch_add(1);
 
   index= index % events_statements_history_long_size;
   if (index == 0)
@@ -258,7 +257,7 @@ void reset_events_statements_history(void)
 /** Reset table EVENTS_STATEMENTS_HISTORY_LONG data. */
 void reset_events_statements_history_long(void)
 {
-  PFS_atomic::store_u32(&events_statements_history_long_index.m_u32, 0);
+  events_statements_history_long_index.m_u32.store(0);
   events_statements_history_long_full= false;
 
   PFS_events_statements *pfs= events_statements_history_long_array;
diff --git a/storage/perfschema/pfs_events_transactions.cc b/storage/perfschema/pfs_events_transactions.cc
index 5ccdb0345d7..563de844f3a 100644
--- a/storage/perfschema/pfs_events_transactions.cc
+++ b/storage/perfschema/pfs_events_transactions.cc
@@ -34,7 +34,6 @@
 #include "pfs_host.h"
 #include "pfs_user.h"
 #include "pfs_events_transactions.h"
-#include "pfs_atomic.h"
 #include "pfs_buffer_container.h"
 #include "pfs_builtin_memory.h"
 #include "m_string.h"
@@ -62,7 +61,7 @@ int init_events_transactions_history_long(uint events_transactions_history_long_
 {
   events_transactions_history_long_size= events_transactions_history_long_sizing;
   events_transactions_history_long_full= false;
-  PFS_atomic::store_u32(&events_transactions_history_long_index.m_u32, 0);
+  events_transactions_history_long_index.m_u32.store(0);
 
   if (events_transactions_history_long_size == 0)
     return 0;
@@ -135,7 +134,7 @@ void insert_events_transactions_history_long(PFS_events_transactions *transactio
 
   assert(events_transactions_history_long_array != NULL);
 
-  uint index= PFS_atomic::add_u32(&events_transactions_history_long_index.m_u32, 1);
+  uint index= events_transactions_history_long_index.m_u32.fetch_add(1);
 
   index= index % events_transactions_history_long_size;
   if (index == 0)
@@ -176,7 +175,7 @@ void reset_events_transactions_history(void)
 /** Reset table EVENTS_TRANSACTIONS_HISTORY_LONG data. */
 void reset_events_transactions_history_long(void)
 {
-  PFS_atomic::store_u32(&events_transactions_history_long_index.m_u32, 0);
+  events_transactions_history_long_index.m_u32.store(0);
   events_transactions_history_long_full= false;
 
   PFS_events_transactions *pfs= events_transactions_history_long_array;
diff --git a/storage/perfschema/pfs_events_waits.cc b/storage/perfschema/pfs_events_waits.cc
index 3ec6a671913..bceb8d3b791 100644
--- a/storage/perfschema/pfs_events_waits.cc
+++ b/storage/perfschema/pfs_events_waits.cc
@@ -34,7 +34,6 @@
 #include "pfs_host.h"
 #include "pfs_account.h"
 #include "pfs_events_waits.h"
-#include "pfs_atomic.h"
 #include "pfs_buffer_container.h"
 #include "pfs_builtin_memory.h"
 #include "m_string.h"
@@ -66,7 +65,7 @@ int init_events_waits_history_long(uint events_waits_history_long_sizing)
 {
   events_waits_history_long_size= events_waits_history_long_sizing;
   events_waits_history_long_full= false;
-  PFS_atomic::store_u32(&events_waits_history_long_index.m_u32, 0);
+  events_waits_history_long_index.m_u32.store(0);
 
   if (events_waits_history_long_size == 0)
     return 0;
@@ -135,7 +134,7 @@ void insert_events_waits_history_long(PFS_events_waits *wait)
   if (unlikely(events_waits_history_long_size == 0))
     return;
 
-  uint index= PFS_atomic::add_u32(&events_waits_history_long_index.m_u32, 1);
+  uint index= events_waits_history_long_index.m_u32.fetch_add(1);
 
   index= index % events_waits_history_long_size;
   if (index == 0)
@@ -181,7 +180,7 @@ void reset_events_waits_history(void)
 /** Reset table EVENTS_WAITS_HISTORY_LONG data. */
 void reset_events_waits_history_long(void)
 {
-  PFS_atomic::store_u32(&events_waits_history_long_index.m_u32, 0);
+  events_waits_history_long_index.m_u32.store(0);
   events_waits_history_long_full= false;
 
   PFS_events_waits *wait= events_waits_history_long_array;
diff --git a/storage/perfschema/pfs_global.h b/storage/perfschema/pfs_global.h
index 6b73fd9f8a5..53425cdd4d7 100644
--- a/storage/perfschema/pfs_global.h
+++ b/storage/perfschema/pfs_global.h
@@ -24,6 +24,8 @@
 #ifndef PFS_GLOBAL_H
 #define PFS_GLOBAL_H
 
+#include <atomic>
+
 #include "my_compiler.h"
 
 /**
@@ -44,7 +46,7 @@ extern size_t pfs_allocated_memory;
 */
 struct PFS_cacheline_uint32
 {
-  uint32 m_u32;
+  std::atomic<uint32> m_u32;
   char m_full_cache_line[CPU_LEVEL1_DCACHE_LINESIZE - sizeof(uint32)];
 
   PFS_cacheline_uint32()
@@ -58,7 +60,7 @@ struct PFS_cacheline_uint32
 */
 struct PFS_cacheline_uint64
 {
-  uint64 m_u64;
+  std::atomic<uint64> m_u64;
   char m_full_cache_line[CPU_LEVEL1_DCACHE_LINESIZE - sizeof(uint64)];
 
   PFS_cacheline_uint64()
diff --git a/storage/perfschema/pfs_host.cc b/storage/perfschema/pfs_host.cc
index d54725fe9a8..42c0620a39f 100644
--- a/storage/perfschema/pfs_host.cc
+++ b/storage/perfschema/pfs_host.cc
@@ -350,7 +350,7 @@ public:
     : m_thread(thread)
   {}
 
-  virtual void operator()(PFS_host *pfs)
+  void operator()(PFS_host *pfs) override
   {
     pfs->aggregate(true);
     if (pfs->get_refcount() == 0)
diff --git a/storage/perfschema/pfs_host.h b/storage/perfschema/pfs_host.h
index 56bcccb94ac..89dd05df864 100644
--- a/storage/perfschema/pfs_host.h
+++ b/storage/perfschema/pfs_host.h
@@ -28,6 +28,8 @@
   Performance schema host (declarations).
 */
 
+#include <atomic>
+
 #include "pfs_lock.h"
 #include "lf.h"
 #include "pfs_con_slice.h"
@@ -58,22 +60,22 @@ struct PFS_ALIGNED PFS_host : PFS_connection_slice
 public:
   inline void init_refcount(void)
   {
-    PFS_atomic::store_32(& m_refcount, 1);
+    m_refcount.store(1);
   }
 
   inline int get_refcount(void)
   {
-    return PFS_atomic::load_32(& m_refcount);
+    return m_refcount.load();
   }
 
   inline void inc_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, 1);
+    m_refcount.fetch_add(1);
   }
 
   inline void dec_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, -1);
+    m_refcount.fetch_sub(1);
   }
 
   void aggregate(bool alive);
@@ -97,7 +99,7 @@ public:
   ulonglong m_disconnected_count;
 
 private:
-  int m_refcount;
+  std::atomic<int> m_refcount;
 };
 
 int init_host(const PFS_global_param *param);
diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc
index f08d1a25174..d34afcb1393 100644
--- a/storage/perfschema/pfs_instr.cc
+++ b/storage/perfschema/pfs_instr.cc
@@ -527,7 +527,7 @@ PFS_thread* create_thread(PFS_thread_class *klass, const void *identity,
   if (pfs != NULL)
   {
     pfs->m_thread_internal_id=
-      PFS_atomic::add_u64(&thread_internal_id_counter.m_u64, 1);
+      thread_internal_id_counter.m_u64.fetch_add(1);
     pfs->m_parent_thread_internal_id= 0;
     pfs->m_processlist_id= static_cast<ulong>(processlist_id);
     pfs->m_thread_os_id= my_thread_os_id();
diff --git a/storage/perfschema/pfs_instr_class.cc b/storage/perfschema/pfs_instr_class.cc
index 5f1fa9680d5..d7f7bc7dc50 100644
--- a/storage/perfschema/pfs_instr_class.cc
+++ b/storage/perfschema/pfs_instr_class.cc
@@ -25,6 +25,7 @@
   @file storage/perfschema/pfs_instr_class.cc
   Performance schema instruments meta data (implementation).
 */
+#include <atomic>
 
 #include "my_global.h"
 #include "my_sys.h"
@@ -36,7 +37,6 @@
 #include "pfs_timer.h"
 #include "pfs_events_waits.h"
 #include "pfs_setup_object.h"
-#include "pfs_atomic.h"
 #include "pfs_program.h"
 #include "pfs_buffer_container.h"
 #include "mysql/psi/mysql_thread.h"
@@ -76,12 +76,12 @@ static void init_instr_class(PFS_instr_class *klass,
   - the performance schema initialization
   - a plugin initialization
 */
-static uint32 mutex_class_dirty_count= 0;
-static uint32 mutex_class_allocated_count= 0;
-static uint32 rwlock_class_dirty_count= 0;
-static uint32 rwlock_class_allocated_count= 0;
-static uint32 cond_class_dirty_count= 0;
-static uint32 cond_class_allocated_count= 0;
+static std::atomic<uint32> mutex_class_dirty_count(0);
+static std::atomic<uint32> mutex_class_allocated_count(0);
+static std::atomic<uint32> rwlock_class_dirty_count(0);
+static std::atomic<uint32> rwlock_class_allocated_count(0);
+static std::atomic<uint32> cond_class_dirty_count(0);
+static std::atomic<uint32> cond_class_allocated_count(0);
 
 /** Size of the mutex class array. @sa mutex_class_array */
 ulong mutex_class_max= 0;
@@ -137,8 +137,8 @@ PFS_cond_class *cond_class_array= NULL;
   - the performance schema initialization
   - a plugin initialization
 */
-static uint32 thread_class_dirty_count= 0;
-static uint32 thread_class_allocated_count= 0;
+static std::atomic<uint32> thread_class_dirty_count(0);
+static std::atomic<uint32> thread_class_allocated_count(0);
 
 static PFS_thread_class *thread_class_array= NULL;
 
@@ -185,28 +185,28 @@ LF_HASH table_share_hash;
 /** True if table_share_hash is initialized. */
 static bool table_share_hash_inited= false;
 
-static uint32 file_class_dirty_count= 0;
-static uint32 file_class_allocated_count= 0;
+static std::atomic<uint32> file_class_dirty_count(0);
+static std::atomic<uint32> file_class_allocated_count(0);
 
 PFS_file_class *file_class_array= NULL;
 
-static uint32 stage_class_dirty_count= 0;
-static uint32 stage_class_allocated_count= 0;
+static std::atomic<uint32> stage_class_dirty_count(0);
+static std::atomic<uint32> stage_class_allocated_count(0);
 
 static PFS_stage_class *stage_class_array= NULL;
 
-static uint32 statement_class_dirty_count= 0;
-static uint32 statement_class_allocated_count= 0;
+static std::atomic<uint32> statement_class_dirty_count(0);
+static std::atomic<uint32> statement_class_allocated_count(0);
 
 static PFS_statement_class *statement_class_array= NULL;
 
-static uint32 socket_class_dirty_count= 0;
-static uint32 socket_class_allocated_count= 0;
+static std::atomic<uint32> socket_class_dirty_count(0);
+static std::atomic<uint32> socket_class_allocated_count(0);
 
 static PFS_socket_class *socket_class_array= NULL;
 
-static uint32 memory_class_dirty_count= 0;
-static uint32 memory_class_allocated_count= 0;
+static std::atomic<uint32> memory_class_dirty_count(0);
+static std::atomic<uint32> memory_class_allocated_count(0);
 
 static PFS_memory_class *memory_class_array= NULL;
 
@@ -1078,7 +1078,7 @@ PFS_sync_key register_mutex_class(const char *name, uint name_length,
     mutex_class_dirty_count is incremented *before* an entry is added
     mutex_class_allocated_count is incremented *after* an entry is added
   */
-  index= PFS_atomic::add_u32(&mutex_class_dirty_count, 1);
+  index= mutex_class_dirty_count.fetch_add(1);
 
   if (index < mutex_class_max)
   {
@@ -1134,7 +1134,7 @@ PFS_sync_key register_mutex_class(const char *name, uint name_length,
       empty/NULL/zero, but this won't cause a crash
       (mutex_class_array is initialized with MY_ZEROFILL).
     */
-    PFS_atomic::add_u32(&mutex_class_allocated_count, 1);
+    mutex_class_allocated_count.fetch_add(1);
     return (index + 1);
   }
 
@@ -1164,7 +1164,7 @@ PFS_sync_key register_rwlock_class(const char *name, uint name_length,
   REGISTER_CLASS_BODY_PART(index, rwlock_class_array, rwlock_class_max,
                            name, name_length)
 
-  index= PFS_atomic::add_u32(&rwlock_class_dirty_count, 1);
+  index= rwlock_class_dirty_count.fetch_add(1);
 
   if (index < rwlock_class_max)
   {
@@ -1177,7 +1177,7 @@ PFS_sync_key register_rwlock_class(const char *name, uint name_length,
     entry->m_timed= false;
     /* Set user-defined configuration options for this instrument */
     configure_instr_class(entry);
-    PFS_atomic::add_u32(&rwlock_class_allocated_count, 1);
+    rwlock_class_allocated_count.fetch_add(1);
     return (index + 1);
   }
 
@@ -1203,7 +1203,7 @@ PFS_sync_key register_cond_class(const char *name, uint name_length,
   REGISTER_CLASS_BODY_PART(index, cond_class_array, cond_class_max,
                            name, name_length)
 
-  index= PFS_atomic::add_u32(&cond_class_dirty_count, 1);
+  index= cond_class_dirty_count.fetch_add(1);
 
   if (index < cond_class_max)
   {
@@ -1215,7 +1215,7 @@ PFS_sync_key register_cond_class(const char *name, uint name_length,
     entry->m_timed= false;
     /* Set user-defined configuration options for this instrument */
     configure_instr_class(entry);
-    PFS_atomic::add_u32(&cond_class_allocated_count, 1);
+    cond_class_allocated_count.fetch_add(1);
     return (index + 1);
   }
 
@@ -1297,7 +1297,7 @@ PFS_thread_key register_thread_class(const char *name, uint name_length,
       return (index + 1);
   }
 
-  index= PFS_atomic::add_u32(&thread_class_dirty_count, 1);
+  index= thread_class_dirty_count.fetch_add(1);
 
   if (index < thread_class_max)
   {
@@ -1306,7 +1306,7 @@ PFS_thread_key register_thread_class(const char *name, uint name_length,
     strncpy(entry->m_name, name, name_length);
     entry->m_name_length= name_length;
     entry->m_enabled= true;
-    PFS_atomic::add_u32(&thread_class_allocated_count, 1);
+    thread_class_allocated_count.fetch_add(1);
     return (index + 1);
   }
 
@@ -1347,7 +1347,7 @@ PFS_file_key register_file_class(const char *name, uint name_length,
   REGISTER_CLASS_BODY_PART(index, file_class_array, file_class_max,
                            name, name_length)
 
-  index= PFS_atomic::add_u32(&file_class_dirty_count, 1);
+  index= file_class_dirty_count.fetch_add(1);
 
   if (index < file_class_max)
   {
@@ -1359,7 +1359,7 @@ PFS_file_key register_file_class(const char *name, uint name_length,
     entry->m_timed= true;
     /* Set user-defined configuration options for this instrument */
     configure_instr_class(entry);
-    PFS_atomic::add_u32(&file_class_allocated_count, 1);
+    file_class_allocated_count.fetch_add(1);
 
     return (index + 1);
   }
@@ -1389,7 +1389,7 @@ PFS_stage_key register_stage_class(const char *name,
   REGISTER_CLASS_BODY_PART(index, stage_class_array, stage_class_max,
                            name, name_length)
 
-  index= PFS_atomic::add_u32(&stage_class_dirty_count, 1);
+  index= stage_class_dirty_count.fetch_add(1);
 
   if (index < stage_class_max)
   {
@@ -1413,7 +1413,7 @@ PFS_stage_key register_stage_class(const char *name,
 
     /* Set user-defined configuration options for this instrument */
     configure_instr_class(entry);
-    PFS_atomic::add_u32(&stage_class_allocated_count, 1);
+    stage_class_allocated_count.fetch_add(1);
 
     return (index + 1);
   }
@@ -1440,7 +1440,7 @@ PFS_statement_key register_statement_class(const char *name, uint name_length,
   REGISTER_CLASS_BODY_PART(index, statement_class_array, statement_class_max,
                            name, name_length)
 
-  index= PFS_atomic::add_u32(&statement_class_dirty_count, 1);
+  index= statement_class_dirty_count.fetch_add(1);
 
   if (index < statement_class_max)
   {
@@ -1451,7 +1451,7 @@ PFS_statement_key register_statement_class(const char *name, uint name_length,
     entry->m_timed= true;
     /* Set user-defined configuration options for this instrument */
     configure_instr_class(entry);
-    PFS_atomic::add_u32(&statement_class_allocated_count, 1);
+    statement_class_allocated_count.fetch_add(1);
 
     return (index + 1);
   }
@@ -1523,7 +1523,7 @@ PFS_socket_key register_socket_class(const char *name, uint name_length,
   REGISTER_CLASS_BODY_PART(index, socket_class_array, socket_class_max,
                            name, name_length)
 
-  index= PFS_atomic::add_u32(&socket_class_dirty_count, 1);
+  index= socket_class_dirty_count.fetch_add(1);
 
   if (index < socket_class_max)
   {
@@ -1535,7 +1535,7 @@ PFS_socket_key register_socket_class(const char *name, uint name_length,
     entry->m_timed= false;
     /* Set user-defined configuration options for this instrument */
     configure_instr_class(entry);
-    PFS_atomic::add_u32(&socket_class_allocated_count, 1);
+    socket_class_allocated_count.fetch_add(1);
     return (index + 1);
   }
 
@@ -1576,7 +1576,7 @@ PFS_memory_key register_memory_class(const char *name, uint name_length,
   REGISTER_CLASS_BODY_PART(index, memory_class_array, memory_class_max,
                            name, name_length)
 
-  index= PFS_atomic::add_u32(&memory_class_dirty_count, 1);
+  index= memory_class_dirty_count.fetch_add(1);
 
   if (index < memory_class_max)
   {
@@ -1587,7 +1587,7 @@ PFS_memory_key register_memory_class(const char *name, uint name_length,
     /* Set user-defined configuration options for this instrument */
     configure_instr_class(entry);
     entry->m_timed= false; /* Immutable */
-    PFS_atomic::add_u32(&memory_class_allocated_count, 1);
+    memory_class_allocated_count.fetch_add(1);
     return (index + 1);
   }
 
@@ -2007,7 +2007,7 @@ public:
     : m_thread(thread)
   {}
 
-  virtual void operator()(PFS_table_share *pfs)
+  void operator()(PFS_table_share *pfs) override
   {
     pfs->refresh_setup_object_flags(m_thread);
   }
@@ -2030,7 +2030,7 @@ public:
     : m_thread(thread)
   {}
 
-  virtual void operator()(PFS_program *pfs)
+  void operator()(PFS_program *pfs) override
   {
     pfs->refresh_setup_object_flags(m_thread);
   }
diff --git a/storage/perfschema/pfs_instr_class.h b/storage/perfschema/pfs_instr_class.h
index 6f39e75beff..69be67e4c3f 100644
--- a/storage/perfschema/pfs_instr_class.h
+++ b/storage/perfschema/pfs_instr_class.h
@@ -23,11 +23,12 @@
 #ifndef PFS_INSTR_CLASS_H
 #define PFS_INSTR_CLASS_H
 
+#include <atomic>
+
 #include "my_global.h"
 #include "mysql_com.h"                          /* NAME_LEN */
 #include "lf.h"
 #include "pfs_global.h"
-#include "pfs_atomic.h"
 #include "sql_array.h"
 
 /**
@@ -369,22 +370,22 @@ public:
 
   inline void init_refcount(void)
   {
-    PFS_atomic::store_32(& m_refcount, 1);
+    m_refcount.store(1);
   }
 
   inline int get_refcount(void)
   {
-    return PFS_atomic::load_32(& m_refcount);
+    return m_refcount.load();
   }
 
   inline void inc_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, 1);
+    m_refcount.fetch_add(1);
   }
 
   inline void dec_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, -1);
+    m_refcount.fetch_sub(1);
   }
 
   void refresh_setup_object_flags(PFS_thread *thread);
@@ -427,7 +428,7 @@ public:
 
 private:
   /** Number of opened table handles. */
-  int m_refcount;
+  std::atomic<int> m_refcount;
   /** Table locks statistics. */
   PFS_table_share_lock *m_race_lock_stat;
   /** Table indexes' stats. */
diff --git a/storage/perfschema/pfs_lock.h b/storage/perfschema/pfs_lock.h
index 0f4bcb6de8f..4d3c7c040e8 100644
--- a/storage/perfschema/pfs_lock.h
+++ b/storage/perfschema/pfs_lock.h
@@ -28,9 +28,9 @@
   Performance schema internal locks (declarations).
 */
 
-#include "my_global.h"
+#include <atomic>
 
-#include "pfs_atomic.h"
+#include "my_global.h"
 
 /* to cause bugs, testing */
 // #define MEM(X) std::memory_order_relaxed
@@ -103,7 +103,7 @@ struct pfs_lock
     The version number is stored in the high 30 bits.
     The state is stored in the low 2 bits.
   */
-  uint32 m_version_state;
+  std::atomic<uint32> m_version_state;
 
   uint32 copy_version_state()
   {
@@ -119,7 +119,7 @@ struct pfs_lock
   {
     uint32 copy;
 
-    copy= PFS_atomic::load_u32(&m_version_state);
+    copy= m_version_state.load();
 
     return ((copy & STATE_MASK) == PFS_LOCK_FREE);
   }
@@ -129,7 +129,7 @@ struct pfs_lock
   {
     uint32 copy;
 
-    copy= PFS_atomic::load_u32(&m_version_state);
+    copy= m_version_state.load();
 
     return ((copy & STATE_MASK) == PFS_LOCK_ALLOCATED);
   }
@@ -144,7 +144,7 @@ struct pfs_lock
   {
     uint32 old_val;
 
-    old_val= PFS_atomic::load_u32(&m_version_state);
+    old_val= m_version_state.load();
 
     if ((old_val & STATE_MASK) != PFS_LOCK_FREE)
     {
@@ -154,7 +154,7 @@ struct pfs_lock
     uint32 new_val= (old_val & VERSION_MASK) + PFS_LOCK_DIRTY;
     bool pass;
 
-    pass= PFS_atomic::cas_u32(&m_version_state, &old_val, new_val);
+    pass= m_version_state.compare_exchange_strong(old_val, new_val);
 
     if (pass)
     {
@@ -178,7 +178,7 @@ struct pfs_lock
     uint32 new_val= (copy & VERSION_MASK) + PFS_LOCK_DIRTY;
     /* We own the record, no need to use compare and swap. */
 
-    PFS_atomic::store_u32(&m_version_state, new_val);
+    m_version_state.store(new_val);
 
     copy_ptr->m_version_state= new_val;
   }
@@ -195,7 +195,7 @@ struct pfs_lock
     /* Increment the version, set the ALLOCATED state */
     uint32 new_val= (copy->m_version_state & VERSION_MASK) + VERSION_INC + PFS_LOCK_ALLOCATED;
 
-    PFS_atomic::store_u32(&m_version_state, new_val);
+    m_version_state.store(new_val);
   }
 
   /**
@@ -210,7 +210,7 @@ struct pfs_lock
     /* Increment the version, set the ALLOCATED state */
     uint32 new_val= (copy & VERSION_MASK) + VERSION_INC + PFS_LOCK_ALLOCATED;
 
-    PFS_atomic::store_u32(&m_version_state, new_val);
+    m_version_state.store(new_val);
   }
 
   /**
@@ -219,10 +219,10 @@ struct pfs_lock
   void set_dirty(pfs_dirty_state *copy_ptr)
   {
     /* Do not set the version to 0, read the previous value. */
-    uint32 copy= PFS_atomic::load_u32(&m_version_state);
+    uint32 copy= m_version_state.load();
     /* Increment the version, set the DIRTY state */
     uint32 new_val= (copy & VERSION_MASK) + VERSION_INC + PFS_LOCK_DIRTY;
-    PFS_atomic::store_u32(&m_version_state, new_val);
+    m_version_state.store(new_val);
 
     copy_ptr->m_version_state= new_val;
   }
@@ -238,7 +238,7 @@ struct pfs_lock
     /* Keep the same version, set the FREE state */
     uint32 new_val= (copy->m_version_state & VERSION_MASK) + PFS_LOCK_FREE;
 
-    PFS_atomic::store_u32(&m_version_state, new_val);
+    m_version_state.store(new_val);
   }
 
   /**
@@ -258,7 +258,7 @@ struct pfs_lock
     /* Keep the same version, set the FREE state */
     uint32 new_val= (copy & VERSION_MASK) + PFS_LOCK_FREE;
 
-    PFS_atomic::store_u32(&m_version_state, new_val);
+    m_version_state.store(new_val);
   }
 
   /**
@@ -268,7 +268,7 @@ struct pfs_lock
   */
   void begin_optimistic_lock(struct pfs_optimistic_state *copy)
   {
-    copy->m_version_state= PFS_atomic::load_u32(&m_version_state);
+    copy->m_version_state= m_version_state.load();
   }
 
   /**
@@ -285,7 +285,7 @@ struct pfs_lock
     if ((copy->m_version_state & STATE_MASK) != PFS_LOCK_ALLOCATED)
       return false;
 
-    version_state= PFS_atomic::load_u32(&m_version_state);
+    version_state= m_version_state.load();
 
     /* Check the version + state has not changed. */
     if (copy->m_version_state != version_state)
@@ -298,7 +298,7 @@ struct pfs_lock
   {
     uint32 version_state;
 
-    version_state= PFS_atomic::load_u32(&m_version_state);
+    version_state= m_version_state.load();
 
     return (version_state & VERSION_MASK);
   }
diff --git a/storage/perfschema/pfs_memory.cc b/storage/perfschema/pfs_memory.cc
index 0ee8e3dd7df..7cb932b3502 100644
--- a/storage/perfschema/pfs_memory.cc
+++ b/storage/perfschema/pfs_memory.cc
@@ -33,7 +33,6 @@
 #include "pfs_account.h"
 #include "pfs_host.h"
 #include "pfs_user.h"
-#include "pfs_atomic.h"
 #include "pfs_buffer_container.h"
 #include "m_string.h"
 
diff --git a/storage/perfschema/pfs_setup_actor.cc b/storage/perfschema/pfs_setup_actor.cc
index efe19b3c8b3..c2b53bf2d1e 100644
--- a/storage/perfschema/pfs_setup_actor.cc
+++ b/storage/perfschema/pfs_setup_actor.cc
@@ -231,7 +231,7 @@ public:
     : m_pins(pins)
   {}
 
-  virtual void operator()(PFS_setup_actor *pfs)
+  void operator()(PFS_setup_actor *pfs) override
   {
     lf_hash_delete(&setup_actor_hash, m_pins,
                    pfs->m_key.m_hash_key, pfs->m_key.m_key_length);
diff --git a/storage/perfschema/pfs_setup_object.cc b/storage/perfschema/pfs_setup_object.cc
index 78617d1b2c6..b18bc2fd5ba 100644
--- a/storage/perfschema/pfs_setup_object.cc
+++ b/storage/perfschema/pfs_setup_object.cc
@@ -231,7 +231,7 @@ public:
     : m_pins(pins)
   {}
 
-  virtual void operator()(PFS_setup_object *pfs)
+  void operator()(PFS_setup_object *pfs) override
   {
     lf_hash_delete(&setup_object_hash, m_pins,
                    pfs->m_key.m_hash_key, pfs->m_key.m_key_length);
diff --git a/storage/perfschema/pfs_status.cc b/storage/perfschema/pfs_status.cc
index 2596c53c4ad..9d3bcd43ec3 100644
--- a/storage/perfschema/pfs_status.cc
+++ b/storage/perfschema/pfs_status.cc
@@ -34,7 +34,6 @@
 #include "pfs_host.h"
 #include "pfs_user.h"
 #include "pfs_status.h"
-#include "pfs_atomic.h"
 #include "pfs_buffer_container.h"
 
 #include "sql_show.h" /* reset_status_vars */
diff --git a/storage/perfschema/pfs_user.cc b/storage/perfschema/pfs_user.cc
index 1f299d9b9b6..fa39b330f75 100644
--- a/storage/perfschema/pfs_user.cc
+++ b/storage/perfschema/pfs_user.cc
@@ -314,7 +314,7 @@ public:
     : m_thread(thread)
   {}
 
-  virtual void operator()(PFS_user *pfs)
+  void operator()(PFS_user *pfs) override
   {
     pfs->aggregate(true);
     if (pfs->get_refcount() == 0)
diff --git a/storage/perfschema/pfs_user.h b/storage/perfschema/pfs_user.h
index e15e733e5ac..e92629e4dd7 100644
--- a/storage/perfschema/pfs_user.h
+++ b/storage/perfschema/pfs_user.h
@@ -28,6 +28,8 @@
   Performance schema user (declarations).
 */
 
+#include <atomic>
+
 #include "pfs_lock.h"
 #include "lf.h"
 #include "pfs_con_slice.h"
@@ -58,22 +60,22 @@ struct PFS_ALIGNED PFS_user : public PFS_connection_slice
 public:
   inline void init_refcount(void)
   {
-    PFS_atomic::store_32(& m_refcount, 1);
+    m_refcount.store(1);
   }
 
   inline int get_refcount(void)
   {
-    return PFS_atomic::load_32(& m_refcount);
+    return m_refcount.load();
   }
 
   inline void inc_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, 1);
+    m_refcount.fetch_add(1);
   }
 
   inline void dec_refcount(void)
   {
-    PFS_atomic::add_32(& m_refcount, -1);
+    m_refcount.fetch_sub(1);
   }
 
   void aggregate(bool alive);
@@ -97,7 +99,7 @@ public:
   ulonglong m_disconnected_count;
 
 private:
-  int m_refcount;
+  std::atomic<int> m_refcount;
 };
 
 int init_user(const PFS_global_param *param);
diff --git a/storage/perfschema/pfs_variable.h b/storage/perfschema/pfs_variable.h
index 7dc248269b3..03004f82da3 100644
--- a/storage/perfschema/pfs_variable.h
+++ b/storage/perfschema/pfs_variable.h
@@ -205,7 +205,7 @@ public:
   Find_THD_variable() : m_unsafe_thd(NULL) {}
   Find_THD_variable(THD *unsafe_thd) : m_unsafe_thd(unsafe_thd) {}
 
-  virtual bool operator()(THD *thd)
+  bool operator()(THD *thd) override
   {
     //TODO: filter bg threads?
     if (thd != m_unsafe_thd)
@@ -612,18 +612,18 @@ public:
 private:
   /* Build SHOW_var array. */
   bool init_show_var_array(enum_var_type scope, bool strict);
-  bool do_initialize_session(void);
+  bool do_initialize_session(void) override;
 
   /* Global */
-  int do_materialize_global(void);
+  int do_materialize_global(void) override;
   /* Global and Session - THD */
-  int do_materialize_all(THD* thd);
+  int do_materialize_all(THD* thd) override;
   /* Session - THD */
-  int do_materialize_session(THD* thd);
+  int do_materialize_session(THD* thd) override;
   /* Session -  PFS_thread */
-  int do_materialize_session(PFS_thread *thread);
+  int do_materialize_session(PFS_thread *thread) override;
   /* Single variable -  PFS_thread */
-  int do_materialize_session(PFS_thread *pfs_thread, uint index);
+  int do_materialize_session(PFS_thread *pfs_thread, uint index) override;
 
   /* Temporary mem_root to use for materialization. */
   MEM_ROOT m_mem_sysvar;
@@ -664,14 +664,14 @@ protected:
   bool m_show_command;
 
 private:
-  bool do_initialize_session(void);
+  bool do_initialize_session(void) override;
 
-  int do_materialize_global(void);
+  int do_materialize_global(void) override;
   /* Global and Session - THD */
-  int do_materialize_all(THD* thd);
-  int do_materialize_session(THD *thd);
-  int do_materialize_session(PFS_thread *thread);
-  int do_materialize_session(PFS_thread *thread, uint index) { return 0; }
+  int do_materialize_all(THD* thd) override;
+  int do_materialize_session(THD *thd) override;
+  int do_materialize_session(PFS_thread *thread) override;
+  int do_materialize_session(PFS_thread *thread, uint index) override { return 0; }
   int do_materialize_client(PFS_client *pfs_client);
 
   /* Callback to sum user, host or account status variables. */
diff --git a/storage/perfschema/pfs_visitor.cc b/storage/perfschema/pfs_visitor.cc
index 7e3027ac9a6..be22795df24 100644
--- a/storage/perfschema/pfs_visitor.cc
+++ b/storage/perfschema/pfs_visitor.cc
@@ -49,7 +49,7 @@ public:
     : m_visitor(visitor)
   {}
 
-  virtual void operator()(THD *thd)
+  void operator()(THD *thd) override
   {
     m_visitor->visit_THD(thd);
   }
@@ -132,7 +132,7 @@ public:
     : m_visitor(visitor), m_host(host)
   {}
 
-  virtual void operator()(THD *thd)
+  void operator()(THD *thd) override
   {
     PSI_thread *psi= thd->get_psi();
     PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@@ -221,7 +221,7 @@ public:
     : m_visitor(visitor), m_user(user)
   {}
 
-  virtual void operator()(THD *thd)
+  void operator()(THD *thd) override
   {
     PSI_thread *psi= thd->get_psi();
     PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@@ -310,7 +310,7 @@ public:
     : m_visitor(visitor), m_account(account)
   {}
 
-  virtual void operator()(THD *thd)
+  void operator()(THD *thd) override
   {
     PSI_thread *psi= thd->get_psi();
     PFS_thread *pfs= reinterpret_cast<PFS_thread*>(psi);
@@ -752,7 +752,7 @@ public:
     : m_visitor(visitor)
   {}
 
-  virtual void operator()(PFS_table_share *pfs)
+  void operator()(PFS_table_share *pfs) override
   {
     if (pfs->m_enabled)
     {
@@ -772,7 +772,7 @@ public:
     : m_visitor(visitor)
   {}
 
-  virtual void operator()(PFS_table *pfs)
+  void operator()(PFS_table *pfs) override
   {
     PFS_table_share *safe_share= sanitize_table_share(pfs->m_share);
     if (safe_share != NULL)
@@ -811,7 +811,7 @@ public:
     : m_visitor(visitor), m_share(share)
   {}
 
-  virtual void operator()(PFS_table *pfs)
+  void operator()(PFS_table *pfs) override
   {
     if (pfs->m_share == m_share)
     {
@@ -852,7 +852,7 @@ public:
     : m_visitor(visitor), m_share(share), m_index(index)
   {}
 
-  virtual void operator()(PFS_table *pfs)
+  void operator()(PFS_table *pfs) override
   {
     if (pfs->m_share == m_share)
     {
diff --git a/storage/perfschema/pfs_visitor.h b/storage/perfschema/pfs_visitor.h
index 03684ba9ca6..9de6c4217c6 100644
--- a/storage/perfschema/pfs_visitor.h
+++ b/storage/perfschema/pfs_visitor.h
@@ -314,11 +314,11 @@ public:
   /** Constructor. */
   PFS_connection_wait_visitor(PFS_instr_class *klass);
   virtual ~PFS_connection_wait_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** EVENT_NAME instrument index. */
   uint m_index;
@@ -336,11 +336,11 @@ public:
   /** Constructor. */
   PFS_connection_all_wait_visitor();
   virtual ~PFS_connection_all_wait_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** Wait statistic collected. */
   PFS_single_stat m_stat;
@@ -359,11 +359,11 @@ public:
   /** Constructor. */
   PFS_connection_stage_visitor(PFS_stage_class *klass);
   virtual ~PFS_connection_stage_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** EVENT_NAME instrument index. */
   uint m_index;
@@ -381,11 +381,11 @@ public:
   /** Constructor. */
   PFS_connection_statement_visitor(PFS_statement_class *klass);
   virtual ~PFS_connection_statement_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** EVENT_NAME instrument index. */
   uint m_index;
@@ -403,11 +403,11 @@ public:
   /** Constructor. */
   PFS_connection_all_statement_visitor();
   virtual ~PFS_connection_all_statement_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** Statement statistic collected. */
   PFS_statement_stat m_stat;
@@ -426,11 +426,11 @@ public:
   /** Constructor. */
   PFS_connection_transaction_visitor(PFS_transaction_class *klass);
   virtual ~PFS_connection_transaction_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** EVENT_NAME instrument index. */
   uint m_index;
@@ -450,11 +450,11 @@ public:
   /** Constructor. */
   PFS_connection_all_transaction_visitor();
   virtual ~PFS_connection_all_transaction_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** Statement statistic collected. */
   PFS_transaction_stat m_stat;
@@ -474,11 +474,11 @@ public:
   /** Constructor. */
   PFS_connection_stat_visitor();
   virtual ~PFS_connection_stat_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** Connection statistic collected. */
   PFS_connection_stat m_stat;
@@ -494,11 +494,11 @@ public:
   /** Constructor. */
   PFS_connection_memory_visitor(PFS_memory_class *klass);
   virtual ~PFS_connection_memory_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
 
   /** EVENT_NAME instrument index. */
   uint m_index;
@@ -516,12 +516,12 @@ public:
   /** Constructor. */
   PFS_connection_status_visitor(STATUS_VAR *status_vars);
   virtual ~PFS_connection_status_visitor();
-  virtual void visit_global();
-  virtual void visit_host(PFS_host *pfs);
-  virtual void visit_account(PFS_account *pfs);
-  virtual void visit_user(PFS_user *pfs);
-  virtual void visit_thread(PFS_thread *pfs);
-  virtual void visit_THD(THD *thd);
+  void visit_global() override;
+  void visit_host(PFS_host *pfs) override;
+  void visit_account(PFS_account *pfs) override;
+  void visit_user(PFS_user *pfs) override;
+  void visit_thread(PFS_thread *pfs) override;
+  void visit_THD(THD *thd) override;
 
 private:
   STATUS_VAR *m_status_vars;
@@ -536,16 +536,16 @@ class PFS_instance_wait_visitor : public PFS_instance_visitor
 public:
   PFS_instance_wait_visitor();
   virtual ~PFS_instance_wait_visitor();
-  virtual void visit_mutex_class(PFS_mutex_class *pfs);
-  virtual void visit_rwlock_class(PFS_rwlock_class *pfs);
-  virtual void visit_cond_class(PFS_cond_class *pfs);
-  virtual void visit_file_class(PFS_file_class *pfs);
-  virtual void visit_socket_class(PFS_socket_class *pfs);
-  virtual void visit_mutex(PFS_mutex *pfs);
-  virtual void visit_rwlock(PFS_rwlock *pfs);
-  virtual void visit_cond(PFS_cond *pfs);
-  virtual void visit_file(PFS_file *pfs);
-  virtual void visit_socket(PFS_socket *pfs);
+  void visit_mutex_class(PFS_mutex_class *pfs) override;
+  void visit_rwlock_class(PFS_rwlock_class *pfs) override;
+  void visit_cond_class(PFS_cond_class *pfs) override;
+  void visit_file_class(PFS_file_class *pfs) override;
+  void visit_socket_class(PFS_socket_class *pfs) override;
+  void visit_mutex(PFS_mutex *pfs) override;
+  void visit_rwlock(PFS_rwlock *pfs) override;
+  void visit_cond(PFS_cond *pfs) override;
+  void visit_file(PFS_file *pfs) override;
+  void visit_socket(PFS_socket *pfs) override;
 
   /** Wait statistic collected. */
   PFS_single_stat m_stat;
@@ -560,9 +560,9 @@ class PFS_object_wait_visitor : public PFS_object_visitor
 public:
   PFS_object_wait_visitor();
   virtual ~PFS_object_wait_visitor();
-  virtual void visit_global();
-  virtual void visit_table_share(PFS_table_share *pfs);
-  virtual void visit_table(PFS_table *pfs);
+  void visit_global() override;
+  void visit_table_share(PFS_table_share *pfs) override;
+  void visit_table(PFS_table *pfs) override;
 
   /** Object wait statistic collected. */
   PFS_single_stat m_stat;
@@ -577,9 +577,9 @@ class PFS_table_io_wait_visitor : public PFS_object_visitor
 public:
   PFS_table_io_wait_visitor();
   virtual ~PFS_table_io_wait_visitor();
-  virtual void visit_global();
-  virtual void visit_table_share(PFS_table_share *pfs);
-  virtual void visit_table(PFS_table *pfs);
+  void visit_global() override;
+  void visit_table_share(PFS_table_share *pfs) override;
+  void visit_table(PFS_table *pfs) override;
 
   /** Table io wait statistic collected. */
   PFS_single_stat m_stat;
@@ -594,8 +594,8 @@ class PFS_table_io_stat_visitor : public PFS_object_visitor
 public:
   PFS_table_io_stat_visitor();
   virtual ~PFS_table_io_stat_visitor();
-  virtual void visit_table_share(PFS_table_share *pfs);
-  virtual void visit_table(PFS_table *pfs);
+  void visit_table_share(PFS_table_share *pfs) override;
+  void visit_table(PFS_table *pfs) override;
 
   /** Table io statistic collected. */
   PFS_table_io_stat m_stat;
@@ -610,8 +610,8 @@ class PFS_index_io_stat_visitor : public PFS_object_visitor
 public:
   PFS_index_io_stat_visitor();
   virtual ~PFS_index_io_stat_visitor();
-  virtual void visit_table_share_index(PFS_table_share *pfs, uint index);
-  virtual void visit_table_index(PFS_table *pfs, uint index);
+  void visit_table_share_index(PFS_table_share *pfs, uint index) override;
+  void visit_table_index(PFS_table *pfs, uint index) override;
 
   /** Index io statistic collected. */
   PFS_table_io_stat m_stat;
@@ -626,9 +626,9 @@ class PFS_table_lock_wait_visitor : public PFS_object_visitor
 public:
   PFS_table_lock_wait_visitor();
   virtual ~PFS_table_lock_wait_visitor();
-  virtual void visit_global();
-  virtual void visit_table_share(PFS_table_share *pfs);
-  virtual void visit_table(PFS_table *pfs);
+  void visit_global() override;
+  void visit_table_share(PFS_table_share *pfs) override;
+  void visit_table(PFS_table *pfs) override;
 
   /** Table lock wait statistic collected. */
   PFS_single_stat m_stat;
@@ -643,8 +643,8 @@ class PFS_table_lock_stat_visitor : public PFS_object_visitor
 public:
   PFS_table_lock_stat_visitor();
   virtual ~PFS_table_lock_stat_visitor();
-  virtual void visit_table_share(PFS_table_share *pfs);
-  virtual void visit_table(PFS_table *pfs);
+  void visit_table_share(PFS_table_share *pfs) override;
+  void visit_table(PFS_table *pfs) override;
 
   /** Table lock statistic collected. */
   PFS_table_lock_stat m_stat;
@@ -659,8 +659,8 @@ class PFS_instance_socket_io_stat_visitor : public PFS_instance_visitor
 public:
   PFS_instance_socket_io_stat_visitor();
   virtual ~PFS_instance_socket_io_stat_visitor();
-  virtual void visit_socket_class(PFS_socket_class *pfs);
-  virtual void visit_socket(PFS_socket *pfs);
+  void visit_socket_class(PFS_socket_class *pfs) override;
+  void visit_socket(PFS_socket *pfs) override;
 
   /** Wait and byte count statistics collected. */
   PFS_socket_io_stat m_socket_io_stat;
@@ -675,8 +675,8 @@ class PFS_instance_file_io_stat_visitor : public PFS_instance_visitor
 public:
   PFS_instance_file_io_stat_visitor();
   virtual ~PFS_instance_file_io_stat_visitor();
-  virtual void visit_file_class(PFS_file_class *pfs);
-  virtual void visit_file(PFS_file *pfs);
+  void visit_file_class(PFS_file_class *pfs) override;
+  void visit_file(PFS_file *pfs) override;
 
   /** Wait and byte count statistics collected. */
   PFS_file_io_stat m_file_io_stat;
diff --git a/storage/perfschema/table_accounts.h b/storage/perfschema/table_accounts.h
index 28348190e69..77d2940a411 100644
--- a/storage/perfschema/table_accounts.h
+++ b/storage/perfschema/table_accounts.h
@@ -57,10 +57,10 @@ public:
   static int delete_all_rows();
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
 
 protected:
@@ -70,7 +70,7 @@ public:
   ~table_accounts() = default;
 
 private:
-  virtual void make_row(PFS_account *pfs);
+  void make_row(PFS_account *pfs) override;
 
   /** Table share lock. */
   static THR_LOCK m_table_lock;
diff --git a/storage/perfschema/table_all_instr.h b/storage/perfschema/table_all_instr.h
index d7f3fe6aa1a..803cb9b5005 100644
--- a/storage/perfschema/table_all_instr.h
+++ b/storage/perfschema/table_all_instr.h
@@ -76,9 +76,9 @@ class table_all_instr : public PFS_engine_table
 public:
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override; 
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_all_instr(const PFS_engine_table_share *share);
diff --git a/storage/perfschema/table_esgs_by_account_by_event_name.h b/storage/perfschema/table_esgs_by_account_by_event_name.h
index fa0c7d8ec2d..3c0e2f29413 100644
--- a/storage/perfschema/table_esgs_by_account_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_account_by_event_name.h
@@ -91,16 +91,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esgs_by_account_by_event_name();
 
diff --git a/storage/perfschema/table_esgs_by_host_by_event_name.h b/storage/perfschema/table_esgs_by_host_by_event_name.h
index f71a479c8fa..0f5892fe288 100644
--- a/storage/perfschema/table_esgs_by_host_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_host_by_event_name.h
@@ -91,16 +91,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esgs_by_host_by_event_name();
 
diff --git a/storage/perfschema/table_esgs_by_thread_by_event_name.h b/storage/perfschema/table_esgs_by_thread_by_event_name.h
index f9a52ebe189..848ace7609f 100644
--- a/storage/perfschema/table_esgs_by_thread_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_thread_by_event_name.h
@@ -95,16 +95,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esgs_by_thread_by_event_name();
 
diff --git a/storage/perfschema/table_esgs_by_user_by_event_name.h b/storage/perfschema/table_esgs_by_user_by_event_name.h
index e8b421089c8..df96dd48e8a 100644
--- a/storage/perfschema/table_esgs_by_user_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_user_by_event_name.h
@@ -96,16 +96,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esgs_by_user_by_event_name();
 
diff --git a/storage/perfschema/table_esgs_global_by_event_name.h b/storage/perfschema/table_esgs_global_by_event_name.h
index bfcd70174ec..d5fe9b676e0 100644
--- a/storage/perfschema/table_esgs_global_by_event_name.h
+++ b/storage/perfschema/table_esgs_global_by_event_name.h
@@ -62,16 +62,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esgs_global_by_event_name();
 
diff --git a/storage/perfschema/table_esms_by_account_by_event_name.h b/storage/perfschema/table_esms_by_account_by_event_name.h
index 638cc28ed7b..e87e27d7688 100644
--- a/storage/perfschema/table_esms_by_account_by_event_name.h
+++ b/storage/perfschema/table_esms_by_account_by_event_name.h
@@ -91,16 +91,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esms_by_account_by_event_name();
 
diff --git a/storage/perfschema/table_esms_by_digest.h b/storage/perfschema/table_esms_by_digest.h
index 4711ffc56bf..ab4c7341bcb 100644
--- a/storage/perfschema/table_esms_by_digest.h
+++ b/storage/perfschema/table_esms_by_digest.h
@@ -65,15 +65,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esms_by_digest();
 
diff --git a/storage/perfschema/table_esms_by_host_by_event_name.h b/storage/perfschema/table_esms_by_host_by_event_name.h
index 65a7256b9cb..cb29690805d 100644
--- a/storage/perfschema/table_esms_by_host_by_event_name.h
+++ b/storage/perfschema/table_esms_by_host_by_event_name.h
@@ -91,16 +91,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esms_by_host_by_event_name();
 
diff --git a/storage/perfschema/table_esms_by_program.h b/storage/perfschema/table_esms_by_program.h
index f9e686efc6f..a27f2ab5432 100644
--- a/storage/perfschema/table_esms_by_program.h
+++ b/storage/perfschema/table_esms_by_program.h
@@ -75,15 +75,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esms_by_program();
 
diff --git a/storage/perfschema/table_esms_by_thread_by_event_name.h b/storage/perfschema/table_esms_by_thread_by_event_name.h
index 87a4e3c3ed4..f629e229403 100644
--- a/storage/perfschema/table_esms_by_thread_by_event_name.h
+++ b/storage/perfschema/table_esms_by_thread_by_event_name.h
@@ -95,16 +95,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esms_by_thread_by_event_name();
 
diff --git a/storage/perfschema/table_esms_by_user_by_event_name.h b/storage/perfschema/table_esms_by_user_by_event_name.h
index cbd388ef606..4d2d4a3fdff 100644
--- a/storage/perfschema/table_esms_by_user_by_event_name.h
+++ b/storage/perfschema/table_esms_by_user_by_event_name.h
@@ -91,16 +91,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esms_by_user_by_event_name();
 
diff --git a/storage/perfschema/table_esms_global_by_event_name.h b/storage/perfschema/table_esms_global_by_event_name.h
index 21a6b1a18b9..e63f341e759 100644
--- a/storage/perfschema/table_esms_global_by_event_name.h
+++ b/storage/perfschema/table_esms_global_by_event_name.h
@@ -62,16 +62,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_esms_global_by_event_name();
 
diff --git a/storage/perfschema/table_ets_by_account_by_event_name.h b/storage/perfschema/table_ets_by_account_by_event_name.h
index a5202b299e0..46734d04753 100644
--- a/storage/perfschema/table_ets_by_account_by_event_name.h
+++ b/storage/perfschema/table_ets_by_account_by_event_name.h
@@ -95,16 +95,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ets_by_account_by_event_name();
 
diff --git a/storage/perfschema/table_ets_by_host_by_event_name.h b/storage/perfschema/table_ets_by_host_by_event_name.h
index 00b4dbd02f8..e5e89a0f2a7 100644
--- a/storage/perfschema/table_ets_by_host_by_event_name.h
+++ b/storage/perfschema/table_ets_by_host_by_event_name.h
@@ -95,16 +95,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ets_by_host_by_event_name();
 
diff --git a/storage/perfschema/table_ets_by_thread_by_event_name.h b/storage/perfschema/table_ets_by_thread_by_event_name.h
index 1fa62f84e51..e7837d7000c 100644
--- a/storage/perfschema/table_ets_by_thread_by_event_name.h
+++ b/storage/perfschema/table_ets_by_thread_by_event_name.h
@@ -99,16 +99,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ets_by_thread_by_event_name();
 
diff --git a/storage/perfschema/table_ets_by_user_by_event_name.h b/storage/perfschema/table_ets_by_user_by_event_name.h
index 9bd5b859ef9..98e8d97c69c 100644
--- a/storage/perfschema/table_ets_by_user_by_event_name.h
+++ b/storage/perfschema/table_ets_by_user_by_event_name.h
@@ -95,16 +95,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ets_by_user_by_event_name();
 
diff --git a/storage/perfschema/table_ets_global_by_event_name.h b/storage/perfschema/table_ets_global_by_event_name.h
index d5a67f43505..14994984a30 100644
--- a/storage/perfschema/table_ets_global_by_event_name.h
+++ b/storage/perfschema/table_ets_global_by_event_name.h
@@ -66,16 +66,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ets_global_by_event_name();
 
diff --git a/storage/perfschema/table_events_stages.h b/storage/perfschema/table_events_stages.h
index d8b973acc8b..193fa4b40bc 100644
--- a/storage/perfschema/table_events_stages.h
+++ b/storage/perfschema/table_events_stages.h
@@ -100,10 +100,10 @@ struct pos_events_stages_history : public PFS_double_index
 class table_events_stages_common : public PFS_engine_table
 {
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_events_stages_common(const PFS_engine_table_share *share, void *pos);
 
@@ -128,10 +128,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_stages_current();
@@ -163,10 +163,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_stages_history();
@@ -195,10 +195,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_stages_history_long();
diff --git a/storage/perfschema/table_events_statements.h b/storage/perfschema/table_events_statements.h
index 6acad7bb90d..61b5b28805d 100644
--- a/storage/perfschema/table_events_statements.h
+++ b/storage/perfschema/table_events_statements.h
@@ -183,10 +183,10 @@ struct pos_events_statements_history : public PFS_double_index
 class table_events_statements_common : public PFS_engine_table
 {
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_events_statements_common(const PFS_engine_table_share *share, void *pos);
 
@@ -215,10 +215,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_statements_current();
@@ -252,10 +252,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_statements_history();
@@ -286,10 +286,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_statements_history_long();
diff --git a/storage/perfschema/table_events_transactions.h b/storage/perfschema/table_events_transactions.h
index f6024c63766..0911fd63cb7 100644
--- a/storage/perfschema/table_events_transactions.h
+++ b/storage/perfschema/table_events_transactions.h
@@ -127,10 +127,10 @@ struct pos_events_transactions_history : public PFS_double_index
 class table_events_transactions_common : public PFS_engine_table
 {
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_events_transactions_common(const PFS_engine_table_share *share, void *pos);
 
@@ -156,10 +156,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_transactions_current();
@@ -198,10 +198,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_transactions_history();
@@ -231,10 +231,10 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_transactions_history_long();
diff --git a/storage/perfschema/table_events_waits.h b/storage/perfschema/table_events_waits.h
index 62df9ae2521..85a9b146745 100644
--- a/storage/perfschema/table_events_waits.h
+++ b/storage/perfschema/table_events_waits.h
@@ -139,10 +139,10 @@ struct pos_events_waits_history : public PFS_double_index
 class table_events_waits_common : public PFS_engine_table
 {
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_events_waits_common(const PFS_engine_table_share *share, void *pos);
 
@@ -173,9 +173,9 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_waits_current();
@@ -209,9 +209,9 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
   table_events_waits_history();
@@ -242,9 +242,9 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+    int rnd_pos(const void *pos) override;
+    void reset_position(void) override;;
 
 protected:
   table_events_waits_history_long();
diff --git a/storage/perfschema/table_events_waits_summary.h b/storage/perfschema/table_events_waits_summary.h
index d84a79effc1..74f3a9ac959 100644
--- a/storage/perfschema/table_events_waits_summary.h
+++ b/storage/perfschema/table_events_waits_summary.h
@@ -67,16 +67,16 @@ protected:
   void make_instr_row(PFS_instr *pfs, PFS_instr_class *klass,
                       const void *object_instance_begin,
                       PFS_single_stat *pfs_stat);
-  virtual void make_mutex_row(PFS_mutex *pfs);
-  virtual void make_rwlock_row(PFS_rwlock *pfs);
-  virtual void make_cond_row(PFS_cond *pfs);
-  virtual void make_file_row(PFS_file *pfs);
-  virtual void make_socket_row(PFS_socket *pfs);
+  void make_mutex_row(PFS_mutex *pfs) override;
+  void make_rwlock_row(PFS_rwlock *pfs) override;
+  void make_cond_row(PFS_cond *pfs) override;
+  void make_file_row(PFS_file *pfs) override;
+  void make_socket_row(PFS_socket *pfs) override;
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_events_waits_summary_by_instance();
 
diff --git a/storage/perfschema/table_ews_by_account_by_event_name.h b/storage/perfschema/table_ews_by_account_by_event_name.h
index df72f25809b..b4e2df513b2 100644
--- a/storage/perfschema/table_ews_by_account_by_event_name.h
+++ b/storage/perfschema/table_ews_by_account_by_event_name.h
@@ -103,15 +103,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ews_by_account_by_event_name();
 
diff --git a/storage/perfschema/table_ews_by_host_by_event_name.h b/storage/perfschema/table_ews_by_host_by_event_name.h
index c88b3d77a3f..588244109be 100644
--- a/storage/perfschema/table_ews_by_host_by_event_name.h
+++ b/storage/perfschema/table_ews_by_host_by_event_name.h
@@ -103,15 +103,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ews_by_host_by_event_name();
 
diff --git a/storage/perfschema/table_ews_by_thread_by_event_name.h b/storage/perfschema/table_ews_by_thread_by_event_name.h
index 7ac6638a1cd..8dc51ddc579 100644
--- a/storage/perfschema/table_ews_by_thread_by_event_name.h
+++ b/storage/perfschema/table_ews_by_thread_by_event_name.h
@@ -102,15 +102,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ews_by_thread_by_event_name();
 
diff --git a/storage/perfschema/table_ews_by_user_by_event_name.h b/storage/perfschema/table_ews_by_user_by_event_name.h
index 82c7319c19a..5422d493df4 100644
--- a/storage/perfschema/table_ews_by_user_by_event_name.h
+++ b/storage/perfschema/table_ews_by_user_by_event_name.h
@@ -103,15 +103,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ews_by_user_by_event_name();
 
diff --git a/storage/perfschema/table_ews_global_by_event_name.h b/storage/perfschema/table_ews_global_by_event_name.h
index 84d8a742b3c..4e40923f2af 100644
--- a/storage/perfschema/table_ews_global_by_event_name.h
+++ b/storage/perfschema/table_ews_global_by_event_name.h
@@ -91,15 +91,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_ews_global_by_event_name();
 
diff --git a/storage/perfschema/table_file_instances.h b/storage/perfschema/table_file_instances.h
index 5b1b9016f41..1adc4896b9b 100644
--- a/storage/perfschema/table_file_instances.h
+++ b/storage/perfschema/table_file_instances.h
@@ -61,15 +61,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_file_instances();
 
diff --git a/storage/perfschema/table_file_summary_by_event_name.h b/storage/perfschema/table_file_summary_by_event_name.h
index 80b08773b55..0d660ffe216 100644
--- a/storage/perfschema/table_file_summary_by_event_name.h
+++ b/storage/perfschema/table_file_summary_by_event_name.h
@@ -62,15 +62,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_file_summary_by_event_name();
 
diff --git a/storage/perfschema/table_file_summary_by_instance.h b/storage/perfschema/table_file_summary_by_instance.h
index 750ba904484..09f4383394d 100644
--- a/storage/perfschema/table_file_summary_by_instance.h
+++ b/storage/perfschema/table_file_summary_by_instance.h
@@ -70,15 +70,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_file_summary_by_instance();
 
diff --git a/storage/perfschema/table_global_status.h b/storage/perfschema/table_global_status.h
index 5b5f6e60c37..16fc7c82877 100644
--- a/storage/perfschema/table_global_status.h
+++ b/storage/perfschema/table_global_status.h
@@ -75,16 +75,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_global_status();
 
 public:
diff --git a/storage/perfschema/table_global_variables.h b/storage/perfschema/table_global_variables.h
index 49083e63292..5172f215f72 100644
--- a/storage/perfschema/table_global_variables.h
+++ b/storage/perfschema/table_global_variables.h
@@ -74,16 +74,16 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_global_variables();
 
 public:
diff --git a/storage/perfschema/table_host_cache.h b/storage/perfschema/table_host_cache.h
index 59e3a973421..dc2d9916817 100644
--- a/storage/perfschema/table_host_cache.h
+++ b/storage/perfschema/table_host_cache.h
@@ -114,15 +114,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_host_cache();
 
diff --git a/storage/perfschema/table_hosts.h b/storage/perfschema/table_hosts.h
index 1f82cc5c60b..3d4dddbfa07 100644
--- a/storage/perfschema/table_hosts.h
+++ b/storage/perfschema/table_hosts.h
@@ -57,11 +57,11 @@ public:
   static int delete_all_rows();
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
-
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
+    
 
 protected:
   table_hosts();
@@ -70,7 +70,7 @@ public:
   ~table_hosts() = default;
 
 private:
-  virtual void make_row(PFS_host *pfs);
+  void make_row(PFS_host *pfs) override;
 
   /** Table share lock. */
   static THR_LOCK m_table_lock;
diff --git a/storage/perfschema/table_md_locks.h b/storage/perfschema/table_md_locks.h
index 5c9ad9b5638..62f681435f6 100644
--- a/storage/perfschema/table_md_locks.h
+++ b/storage/perfschema/table_md_locks.h
@@ -69,15 +69,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_metadata_locks();
 
diff --git a/storage/perfschema/table_mems_by_account_by_event_name.h b/storage/perfschema/table_mems_by_account_by_event_name.h
index e242bc40ac6..e393ba9d2f9 100644
--- a/storage/perfschema/table_mems_by_account_by_event_name.h
+++ b/storage/perfschema/table_mems_by_account_by_event_name.h
@@ -92,15 +92,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_mems_by_account_by_event_name();
 
diff --git a/storage/perfschema/table_mems_by_host_by_event_name.h b/storage/perfschema/table_mems_by_host_by_event_name.h
index 7920b362b5e..cc1c4a0f2d9 100644
--- a/storage/perfschema/table_mems_by_host_by_event_name.h
+++ b/storage/perfschema/table_mems_by_host_by_event_name.h
@@ -92,15 +92,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_mems_by_host_by_event_name();
 
diff --git a/storage/perfschema/table_mems_by_thread_by_event_name.h b/storage/perfschema/table_mems_by_thread_by_event_name.h
index 0f698990b47..ba23d790c17 100644
--- a/storage/perfschema/table_mems_by_thread_by_event_name.h
+++ b/storage/perfschema/table_mems_by_thread_by_event_name.h
@@ -92,15 +92,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_mems_by_thread_by_event_name();
 
diff --git a/storage/perfschema/table_mems_by_user_by_event_name.h b/storage/perfschema/table_mems_by_user_by_event_name.h
index c17f5d3302b..4be0f659453 100644
--- a/storage/perfschema/table_mems_by_user_by_event_name.h
+++ b/storage/perfschema/table_mems_by_user_by_event_name.h
@@ -92,15 +92,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_mems_by_user_by_event_name();
 
diff --git a/storage/perfschema/table_mems_global_by_event_name.h b/storage/perfschema/table_mems_global_by_event_name.h
index ae3cd0435d6..0cc426523b0 100644
--- a/storage/perfschema/table_mems_global_by_event_name.h
+++ b/storage/perfschema/table_mems_global_by_event_name.h
@@ -94,15 +94,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_mems_global_by_event_name();
 
diff --git a/storage/perfschema/table_os_global_by_type.h b/storage/perfschema/table_os_global_by_type.h
index 7d0ed58ce5b..f8d407ae321 100644
--- a/storage/perfschema/table_os_global_by_type.h
+++ b/storage/perfschema/table_os_global_by_type.h
@@ -93,15 +93,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_os_global_by_type();
 
diff --git a/storage/perfschema/table_performance_timers.h b/storage/perfschema/table_performance_timers.h
index a28b4d3f2c9..b16af7c22ec 100644
--- a/storage/perfschema/table_performance_timers.h
+++ b/storage/perfschema/table_performance_timers.h
@@ -59,15 +59,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
 protected:
   table_performance_timers();
diff --git a/storage/perfschema/table_prepared_stmt_instances.h b/storage/perfschema/table_prepared_stmt_instances.h
index 8bd9acafce5..838deec55a0 100644
--- a/storage/perfschema/table_prepared_stmt_instances.h
+++ b/storage/perfschema/table_prepared_stmt_instances.h
@@ -94,15 +94,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_prepared_stmt_instances();
 
diff --git a/storage/perfschema/table_replication_applier_configuration.h b/storage/perfschema/table_replication_applier_configuration.h
index 580b78cfb3b..cec084b1891 100644
--- a/storage/perfschema/table_replication_applier_configuration.h
+++ b/storage/perfschema/table_replication_applier_configuration.h
@@ -81,10 +81,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_applier_configuration();
 
@@ -96,9 +96,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_replication_applier_status.h b/storage/perfschema/table_replication_applier_status.h
index 5e97dba5c45..a563f1bbf99 100644
--- a/storage/perfschema/table_replication_applier_status.h
+++ b/storage/perfschema/table_replication_applier_status.h
@@ -92,10 +92,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_applier_status();
 
@@ -107,9 +107,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_replication_applier_status_by_coordinator.h b/storage/perfschema/table_replication_applier_status_by_coordinator.h
index 991e46afe50..d4ab387efca 100644
--- a/storage/perfschema/table_replication_applier_status_by_coordinator.h
+++ b/storage/perfschema/table_replication_applier_status_by_coordinator.h
@@ -101,10 +101,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_applier_status_by_coordinator();
 
@@ -116,9 +116,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_replication_applier_status_by_worker.h b/storage/perfschema/table_replication_applier_status_by_worker.h
index 2e400783c61..77c649ad252 100644
--- a/storage/perfschema/table_replication_applier_status_by_worker.h
+++ b/storage/perfschema/table_replication_applier_status_by_worker.h
@@ -130,10 +130,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_applier_status_by_worker();
 
@@ -145,9 +145,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_replication_connection_configuration.h b/storage/perfschema/table_replication_connection_configuration.h
index 5390c51e596..c9ff121be2b 100644
--- a/storage/perfschema/table_replication_connection_configuration.h
+++ b/storage/perfschema/table_replication_connection_configuration.h
@@ -153,10 +153,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_connection_configuration();
 
@@ -168,9 +168,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_replication_connection_status.h b/storage/perfschema/table_replication_connection_status.h
index 57cc9a944df..d8c1a430037 100644
--- a/storage/perfschema/table_replication_connection_status.h
+++ b/storage/perfschema/table_replication_connection_status.h
@@ -126,10 +126,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_connection_status();
 
@@ -141,9 +141,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_replication_group_member_stats.h b/storage/perfschema/table_replication_group_member_stats.h
index d3d00a7a5f2..af78971fbb8 100644
--- a/storage/perfschema/table_replication_group_member_stats.h
+++ b/storage/perfschema/table_replication_group_member_stats.h
@@ -91,10 +91,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_group_member_stats();
 
@@ -106,9 +106,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_replication_group_members.h b/storage/perfschema/table_replication_group_members.h
index 3ea5787877a..f8c205ef2e2 100644
--- a/storage/perfschema/table_replication_group_members.h
+++ b/storage/perfschema/table_replication_group_members.h
@@ -84,10 +84,10 @@ protected:
     @param read_all         true if all columns are read.
   */
 
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_replication_group_members();
 
@@ -99,9 +99,9 @@ public:
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
   static ha_rows get_row_count();
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 };
 
diff --git a/storage/perfschema/table_session_account_connect_attrs.h b/storage/perfschema/table_session_account_connect_attrs.h
index 6a405db6cef..9c2acd714a9 100644
--- a/storage/perfschema/table_session_account_connect_attrs.h
+++ b/storage/perfschema/table_session_account_connect_attrs.h
@@ -46,7 +46,7 @@ public:
   ~table_session_account_connect_attrs() = default;
 
 protected:
-  virtual bool thread_fits(PFS_thread *thread);
+  bool thread_fits(PFS_thread *thread) override;
 
 private:
   /** Table share lock. */
diff --git a/storage/perfschema/table_session_connect.h b/storage/perfschema/table_session_connect.h
index bcc42beb574..9f077160780 100644
--- a/storage/perfschema/table_session_connect.h
+++ b/storage/perfschema/table_session_connect.h
@@ -69,10 +69,10 @@ public:
   ~table_session_connect();
 
 protected:
-  virtual void make_row(PFS_thread *pfs, uint ordinal);
+  void make_row(PFS_thread *pfs, uint ordinal) override;
   virtual bool thread_fits(PFS_thread *thread);
-  virtual int read_row_values(TABLE *table, unsigned char *buf,
-                              Field **fields, bool read_all);
+  int read_row_values(TABLE *table, unsigned char *buf,
+                      Field **fields, bool read_all) override;
 protected:
   /** Current row. */
   row_session_connect_attrs m_row;
diff --git a/storage/perfschema/table_session_status.h b/storage/perfschema/table_session_status.h
index 0b3e16c6011..f8b93dcc945 100644
--- a/storage/perfschema/table_session_status.h
+++ b/storage/perfschema/table_session_status.h
@@ -76,16 +76,16 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_session_status();
 
 public:
diff --git a/storage/perfschema/table_session_variables.h b/storage/perfschema/table_session_variables.h
index f46d9967e5c..1f27b1796ce 100644
--- a/storage/perfschema/table_session_variables.h
+++ b/storage/perfschema/table_session_variables.h
@@ -74,16 +74,16 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_session_variables();
 
 public:
diff --git a/storage/perfschema/table_setup_actors.h b/storage/perfschema/table_setup_actors.h
index 1909d41e24b..dcd7eabd808 100644
--- a/storage/perfschema/table_setup_actors.h
+++ b/storage/perfschema/table_setup_actors.h
@@ -71,24 +71,24 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
-  virtual int update_row_values(TABLE *table,
-                                const unsigned char *old_buf,
-                                const unsigned char *new_buf,
-                                Field **fields);
+  int update_row_values(TABLE *table,
+                        const unsigned char *old_buf,
+                        const unsigned char *new_buf,
+                        Field **fields) override;
 
-  virtual int delete_row_values(TABLE *table,
-                                const unsigned char *buf,
-                                Field **fields);
+  int delete_row_values(TABLE *table,
+                        const unsigned char *buf,
+                        Field **fields) override;
 
   table_setup_actors();
 
diff --git a/storage/perfschema/table_setup_consumers.h b/storage/perfschema/table_setup_consumers.h
index c7386d7a050..2e5cc618609 100644
--- a/storage/perfschema/table_setup_consumers.h
+++ b/storage/perfschema/table_setup_consumers.h
@@ -59,20 +59,20 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
-  virtual int update_row_values(TABLE *table,
-                                const unsigned char *old_buf,
-                                const unsigned char *new_buf,
-                                Field **fields);
+  int update_row_values(TABLE *table,
+                        const unsigned char *old_buf,
+                        const unsigned char *new_buf,
+                        Field **fields) override;
 
   table_setup_consumers();
 
diff --git a/storage/perfschema/table_setup_instruments.h b/storage/perfschema/table_setup_instruments.h
index 9ea142857ce..40266900283 100644
--- a/storage/perfschema/table_setup_instruments.h
+++ b/storage/perfschema/table_setup_instruments.h
@@ -97,21 +97,21 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
-
-  virtual int update_row_values(TABLE *table,
-                                const unsigned char *old_buf,
-                                const unsigned char *new_buf,
-                                Field **fields);
-
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
+    
+  int update_row_values(TABLE *table,
+                        const unsigned char *old_buf,
+                        const unsigned char *new_buf,
+                        Field **fields) override;
+    
   table_setup_instruments();
 
 public:
diff --git a/storage/perfschema/table_setup_objects.h b/storage/perfschema/table_setup_objects.h
index 32853b36497..5409e3d8813 100644
--- a/storage/perfschema/table_setup_objects.h
+++ b/storage/perfschema/table_setup_objects.h
@@ -70,24 +70,24 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
-  virtual int update_row_values(TABLE *table,
-                                const unsigned char *old_buf,
-                                const unsigned char *new_buf,
-                                Field **fields);
-
-  virtual int delete_row_values(TABLE *table,
-                                const unsigned char *buf,
-                                Field **fields);
+  int update_row_values(TABLE *table,
+                        const unsigned char *old_buf,
+                        const unsigned char *new_buf,
+                        Field **fields) override;
+    
+  int delete_row_values(TABLE *table,
+                        const unsigned char *buf,
+                        Field **fields) override;
 
   table_setup_objects();
 
diff --git a/storage/perfschema/table_setup_timers.h b/storage/perfschema/table_setup_timers.h
index e606fcbfa8b..d66fa548584 100644
--- a/storage/perfschema/table_setup_timers.h
+++ b/storage/perfschema/table_setup_timers.h
@@ -55,20 +55,20 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
-  virtual int update_row_values(TABLE *table,
-                                const unsigned char *old_buf,
-                                const unsigned char *new_buf,
-                                Field **fields);
+  int update_row_values(TABLE *table,
+                        const unsigned char *old_buf,
+                        const unsigned char *new_buf,
+                        Field **fields) override;
 
   table_setup_timers();
 
diff --git a/storage/perfschema/table_socket_instances.h b/storage/perfschema/table_socket_instances.h
index c8a4a5b6a5d..61cb121afd4 100644
--- a/storage/perfschema/table_socket_instances.h
+++ b/storage/perfschema/table_socket_instances.h
@@ -73,15 +73,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_socket_instances();
 
diff --git a/storage/perfschema/table_socket_summary_by_event_name.h b/storage/perfschema/table_socket_summary_by_event_name.h
index 726d16abb0a..ab0f8bb8fae 100644
--- a/storage/perfschema/table_socket_summary_by_event_name.h
+++ b/storage/perfschema/table_socket_summary_by_event_name.h
@@ -63,15 +63,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_socket_summary_by_event_name();
 
diff --git a/storage/perfschema/table_socket_summary_by_instance.h b/storage/perfschema/table_socket_summary_by_instance.h
index 21e811baabf..2f51d8b5e39 100644
--- a/storage/perfschema/table_socket_summary_by_instance.h
+++ b/storage/perfschema/table_socket_summary_by_instance.h
@@ -66,15 +66,15 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_socket_summary_by_instance();
 
diff --git a/storage/perfschema/table_status_by_account.h b/storage/perfschema/table_status_by_account.h
index c8d270c5926..e06885bbfad 100644
--- a/storage/perfschema/table_status_by_account.h
+++ b/storage/perfschema/table_status_by_account.h
@@ -111,16 +111,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_status_by_account();
 
 public:
diff --git a/storage/perfschema/table_status_by_host.h b/storage/perfschema/table_status_by_host.h
index 4e28966c016..41810ee3969 100644
--- a/storage/perfschema/table_status_by_host.h
+++ b/storage/perfschema/table_status_by_host.h
@@ -109,16 +109,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_status_by_host();
 
 public:
diff --git a/storage/perfschema/table_status_by_thread.h b/storage/perfschema/table_status_by_thread.h
index 770490438f1..c8fb8c4f095 100644
--- a/storage/perfschema/table_status_by_thread.h
+++ b/storage/perfschema/table_status_by_thread.h
@@ -107,16 +107,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_status_by_thread();
 
 public:
diff --git a/storage/perfschema/table_status_by_user.h b/storage/perfschema/table_status_by_user.h
index 1954b15d820..69cc3a6c14e 100644
--- a/storage/perfschema/table_status_by_user.h
+++ b/storage/perfschema/table_status_by_user.h
@@ -109,16 +109,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_status_by_user();
 
 public:
diff --git a/storage/perfschema/table_sync_instances.h b/storage/perfschema/table_sync_instances.h
index 75424d56540..1a6cf81a173 100644
--- a/storage/perfschema/table_sync_instances.h
+++ b/storage/perfschema/table_sync_instances.h
@@ -65,15 +65,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_mutex_instances();
 
@@ -123,15 +123,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_rwlock_instances();
 
@@ -175,15 +175,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 private:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_cond_instances();
 
diff --git a/storage/perfschema/table_table_handles.h b/storage/perfschema/table_table_handles.h
index 7e184deb9a0..d2330104e5d 100644
--- a/storage/perfschema/table_table_handles.h
+++ b/storage/perfschema/table_table_handles.h
@@ -69,16 +69,16 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_table_handles();
 
diff --git a/storage/perfschema/table_threads.h b/storage/perfschema/table_threads.h
index 1f981ded4d7..b71fb47e7b8 100644
--- a/storage/perfschema/table_threads.h
+++ b/storage/perfschema/table_threads.h
@@ -95,16 +95,16 @@ public:
   static PFS_engine_table* create();
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
+    
 
-
-  virtual int update_row_values(TABLE *table,
-                                const unsigned char *old_buf,
-                                const unsigned char *new_buf,
-                                Field **fields);
+  int update_row_values(TABLE *table,
+                        const unsigned char *old_buf,
+                        const unsigned char *new_buf,
+                        Field **fields) override;
 
 protected:
   table_threads();
@@ -113,7 +113,7 @@ public:
   ~table_threads() = default;
 
 private:
-  virtual void make_row(PFS_thread *pfs);
+  void make_row(PFS_thread *pfs) override;
 
   /** Table share lock. */
   static THR_LOCK m_table_lock;
diff --git a/storage/perfschema/table_tiws_by_index_usage.h b/storage/perfschema/table_tiws_by_index_usage.h
index 6bc009fcf20..70095921d3b 100644
--- a/storage/perfschema/table_tiws_by_index_usage.h
+++ b/storage/perfschema/table_tiws_by_index_usage.h
@@ -87,16 +87,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_tiws_by_index_usage();
 
diff --git a/storage/perfschema/table_tiws_by_table.h b/storage/perfschema/table_tiws_by_table.h
index 2970ee64b06..e28704ec270 100644
--- a/storage/perfschema/table_tiws_by_table.h
+++ b/storage/perfschema/table_tiws_by_table.h
@@ -62,16 +62,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_tiws_by_table();
 
diff --git a/storage/perfschema/table_tlws_by_table.h b/storage/perfschema/table_tlws_by_table.h
index 5755e33f7a7..6d2a77f0f3b 100644
--- a/storage/perfschema/table_tlws_by_table.h
+++ b/storage/perfschema/table_tlws_by_table.h
@@ -62,16 +62,16 @@ public:
   static int delete_all_rows();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_tlws_by_table();
 
diff --git a/storage/perfschema/table_users.h b/storage/perfschema/table_users.h
index 9255ec9546a..7a16284c088 100644
--- a/storage/perfschema/table_users.h
+++ b/storage/perfschema/table_users.h
@@ -57,10 +57,10 @@ public:
   static int delete_all_rows();
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
 
 protected:
@@ -70,7 +70,7 @@ public:
   ~table_users() = default;
 
 private:
-  virtual void make_row(PFS_user *pfs);
+  void make_row(PFS_user *pfs) override;
 
   /** Table share lock. */
   static THR_LOCK m_table_lock;
diff --git a/storage/perfschema/table_uvar_by_thread.cc b/storage/perfschema/table_uvar_by_thread.cc
index 74b6165d039..ed4ed039481 100644
--- a/storage/perfschema/table_uvar_by_thread.cc
+++ b/storage/perfschema/table_uvar_by_thread.cc
@@ -46,7 +46,7 @@ public:
     : m_unsafe_thd(unsafe_thd)
   {}
 
-  virtual bool operator()(THD *thd)
+  bool operator()(THD *thd) override
   {
     if (thd != m_unsafe_thd)
       return false;
diff --git a/storage/perfschema/table_uvar_by_thread.h b/storage/perfschema/table_uvar_by_thread.h
index 61c521069c7..37427a0d201 100644
--- a/storage/perfschema/table_uvar_by_thread.h
+++ b/storage/perfschema/table_uvar_by_thread.h
@@ -154,15 +154,15 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
 
   table_uvar_by_thread();
 
diff --git a/storage/perfschema/table_variables_by_thread.h b/storage/perfschema/table_variables_by_thread.h
index 99adcda4e98..87f284429eb 100644
--- a/storage/perfschema/table_variables_by_thread.h
+++ b/storage/perfschema/table_variables_by_thread.h
@@ -107,16 +107,16 @@ public:
   static PFS_engine_table* create();
   static ha_rows get_row_count();
 
-  virtual int rnd_init(bool scan);
-  virtual int rnd_next();
-  virtual int rnd_pos(const void *pos);
-  virtual void reset_position(void);
+  int rnd_init(bool scan) override;
+  int rnd_next() override;
+  int rnd_pos(const void *pos) override;
+  void reset_position(void) override;
 
 protected:
-  virtual int read_row_values(TABLE *table,
-                              unsigned char *buf,
-                              Field **fields,
-                              bool read_all);
+  int read_row_values(TABLE *table,
+                      unsigned char *buf,
+                      Field **fields,
+                      bool read_all) override;
   table_variables_by_thread();
 
 public:
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index 1262788aaa7..ae697574433 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -3170,7 +3170,7 @@ class Rdb_transaction_impl : public Rdb_transaction {
     }
   }
 
-  virtual bool is_writebatch_trx() const override { return false; }
+  bool is_writebatch_trx() const override { return false; }
 
   bool is_prepared() override {
     return m_rocksdb_tx && rocksdb::Transaction::PREPARED == m_rocksdb_tx->GetState();
@@ -3515,7 +3515,7 @@ private:
     m_notifier = std::make_shared<Rdb_snapshot_notifier>(this);
   }
 
-  virtual ~Rdb_transaction_impl() override {
+  ~Rdb_transaction_impl() override {
     rollback();
 
     // Theoretically the notifier could outlive the Rdb_transaction_impl
@@ -3721,7 +3721,7 @@ class Rdb_writebatch_impl : public Rdb_transaction {
                                                true);
   }
 
-  virtual ~Rdb_writebatch_impl() override {
+  ~Rdb_writebatch_impl() override {
     rollback();
     delete m_batch;
   }
diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h
index eeb2ddfe94f..29bda530689 100644
--- a/storage/rocksdb/ha_rocksdb.h
+++ b/storage/rocksdb/ha_rocksdb.h
@@ -441,7 +441,7 @@ class ha_rocksdb : public my_core::handler {
 
   ha_rocksdb(my_core::handlerton *const hton,
              my_core::TABLE_SHARE *const table_arg);
-  virtual ~ha_rocksdb() override {
+  ~ha_rocksdb() override {
     int err MY_ATTRIBUTE((__unused__));
     err = finalize_bulk_load(false);
     if (err != 0) {
@@ -458,7 +458,7 @@ class ha_rocksdb : public my_core::handler {
 
     const char *table_type() const
 
-    is non-virtual in class handler, so there's no point to override it.
+    is non-in class handler, so there's no point to override it.
   */
 
   /* The following is only used by SHOW KEYS: */
@@ -984,11 +984,11 @@ public:
 
 #ifdef MARIAROCKS_NOT_YET // MDEV-10976
  public:
-  virtual void rpl_before_delete_rows() override;
-  virtual void rpl_after_delete_rows() override;
-  virtual void rpl_before_update_rows() override;
-  virtual void rpl_after_update_rows() override;
-  virtual bool use_read_free_rpl() const override;
+  void rpl_before_delete_rows() override;
+  void rpl_after_delete_rows() override;
+  void rpl_before_update_rows() override;
+  void rpl_after_update_rows() override;
+  bool use_read_free_rpl() const override;
 #endif // MARIAROCKS_NOT_YET
 
  private:
diff --git a/storage/rocksdb/properties_collector.h b/storage/rocksdb/properties_collector.h
index ce2773cd618..a924227d5b1 100644
--- a/storage/rocksdb/properties_collector.h
+++ b/storage/rocksdb/properties_collector.h
@@ -128,7 +128,7 @@ class Rdb_tbl_prop_coll : public rocksdb::TablePropertiesCollector {
   virtual rocksdb::Status Finish(
       rocksdb::UserCollectedProperties *properties) override;
 
-  virtual const char *Name() const override { return "Rdb_tbl_prop_coll"; }
+  const char *Name() const override { return "Rdb_tbl_prop_coll"; }
 
   rocksdb::UserCollectedProperties GetReadableProperties() const override;
 
@@ -193,7 +193,7 @@ class Rdb_tbl_prop_coll_factory
                                  m_table_stats_sampling_pct);
   }
 
-  virtual const char *Name() const override {
+  const char *Name() const override {
     return "Rdb_tbl_prop_coll_factory";
   }
 
diff --git a/storage/rocksdb/rdb_compact_filter.h b/storage/rocksdb/rdb_compact_filter.h
index 93767b23787..cadd55e8c2f 100644
--- a/storage/rocksdb/rdb_compact_filter.h
+++ b/storage/rocksdb/rdb_compact_filter.h
@@ -105,9 +105,9 @@ class Rdb_compact_filter : public rocksdb::CompactionFilter {
     return false;
   }
 
-  virtual bool IgnoreSnapshots() const override { return true; }
+  bool IgnoreSnapshots() const override { return true; }
 
-  virtual const char *Name() const override { return "Rdb_compact_filter"; }
+  const char *Name() const override { return "Rdb_compact_filter"; }
 
   void get_ttl_duration_and_offset(const GL_INDEX_ID &gl_index_id,
                                    uint64 *ttl_duration,
diff --git a/storage/rocksdb/rdb_datadic.h b/storage/rocksdb/rdb_datadic.h
index e9fc1da728e..6d605d82724 100644
--- a/storage/rocksdb/rdb_datadic.h
+++ b/storage/rocksdb/rdb_datadic.h
@@ -1584,7 +1584,7 @@ class Rdb_system_merge_op : public rocksdb::AssociativeMergeOperator {
     return true;
   }
 
-  virtual const char *Name() const override { return "Rdb_system_merge_op"; }
+  const char *Name() const override { return "Rdb_system_merge_op"; }
 
  private:
   /*
diff --git a/storage/rocksdb/rdb_mutex_wrapper.h b/storage/rocksdb/rdb_mutex_wrapper.h
index fd0790aa8e6..bcc92533e73 100644
--- a/storage/rocksdb/rdb_mutex_wrapper.h
+++ b/storage/rocksdb/rdb_mutex_wrapper.h
@@ -39,7 +39,7 @@ class Rdb_mutex : public rocksdb::TransactionDBMutex {
 
  public:
   Rdb_mutex();
-  virtual ~Rdb_mutex() override;
+  ~Rdb_mutex() override;
 
   /*
     Override parent class's virtual methods of interrest.
@@ -47,7 +47,7 @@ class Rdb_mutex : public rocksdb::TransactionDBMutex {
 
   // Attempt to acquire lock.  Return OK on success, or other Status on failure.
   // If returned status is OK, TransactionDB will eventually call UnLock().
-  virtual rocksdb::Status Lock() override;
+  rocksdb::Status Lock() override;
 
   // Attempt to acquire lock.  If timeout is non-negative, operation should be
   // failed after this many microseconds.
@@ -59,7 +59,7 @@ class Rdb_mutex : public rocksdb::TransactionDBMutex {
       int64_t timeout_time MY_ATTRIBUTE((__unused__))) override;
 
   // Unlock Mutex that was successfully locked by Lock() or TryLockUntil()
-  virtual void UnLock() override;
+  void UnLock() override;
 
  private:
   mysql_mutex_t m_mutex;
@@ -77,7 +77,7 @@ class Rdb_cond_var : public rocksdb::TransactionDBCondVar {
 
  public:
   Rdb_cond_var();
-  virtual ~Rdb_cond_var() override;
+  ~Rdb_cond_var() override;
 
   /*
     Override parent class's virtual methods of interrest.
@@ -109,10 +109,10 @@ class Rdb_cond_var : public rocksdb::TransactionDBCondVar {
 
   // If any threads are waiting on *this, unblock at least one of the
   // waiting threads.
-  virtual void Notify() override;
+  void Notify() override;
 
   // Unblocks all threads waiting on *this.
-  virtual void NotifyAll() override;
+  void NotifyAll() override;
 
  private:
   mysql_cond_t m_cond;
@@ -137,7 +137,7 @@ class Rdb_mutex_factory : public rocksdb::TransactionDBMutexFactory {
     return std::make_shared<Rdb_cond_var>();
   }
 
-  virtual ~Rdb_mutex_factory() override = default;
+  ~Rdb_mutex_factory() override = default;
 };
 
 }  // namespace myrocks
diff --git a/storage/rocksdb/rdb_threads.h b/storage/rocksdb/rdb_threads.h
index d23419df3b9..36ce4620343 100644
--- a/storage/rocksdb/rdb_threads.h
+++ b/storage/rocksdb/rdb_threads.h
@@ -148,7 +148,7 @@ class Rdb_background_thread : public Rdb_thread {
   }
 
  public:
-  virtual void run() override;
+  void run() override;
 
   void request_save_stats() {
     RDB_MUTEX_LOCK_CHECK(m_signal_mutex);
@@ -175,7 +175,7 @@ class Rdb_manual_compaction_thread : public Rdb_thread {
   std::map<int, Manual_compaction_request> m_requests;
 
  public:
-  virtual void run() override;
+  void run() override;
   int request_manual_compaction(rocksdb::ColumnFamilyHandle *cf,
                                 rocksdb::Slice *start, rocksdb::Slice *limit,
                                 int concurrency = 0);
@@ -189,7 +189,7 @@ class Rdb_manual_compaction_thread : public Rdb_thread {
 */
 
 struct Rdb_drop_index_thread : public Rdb_thread {
-  virtual void run() override;
+  void run() override;
 };
 
 }  // namespace myrocks
diff --git a/storage/sequence/sequence.cc b/storage/sequence/sequence.cc
index 85de9e17b9b..fe9d92a7535 100644
--- a/storage/sequence/sequence.cc
+++ b/storage/sequence/sequence.cc
@@ -48,7 +48,7 @@ public:
   {
     thr_lock_init(&lock);
   }
-  ~Sequence_share()
+  ~Sequence_share() override
   {
     thr_lock_delete(&lock);
   }
@@ -392,10 +392,10 @@ public:
       // Reset limit because we are handling it now
       orig_lim->set_unlimited();
     }
-  ~ha_seq_group_by_handler() = default;
-  int init_scan() { first_row= 1 ; return 0; }
-  int next_row();
-  int end_scan()  { return 0; }
+  ~ha_seq_group_by_handler() override = default;
+  int init_scan() override { first_row= 1 ; return 0; }
+  int next_row() override;
+  int end_scan() override  { return 0; }
 };
 
 static group_by_handler *
diff --git a/storage/sphinx/ha_sphinx.h b/storage/sphinx/ha_sphinx.h
index db41b7bd2fb..848c9a18651 100644
--- a/storage/sphinx/ha_sphinx.h
+++ b/storage/sphinx/ha_sphinx.h
@@ -55,24 +55,24 @@ public:
 #endif
 					~ha_sphinx ();
 
-	const char *	table_type () const		{ return "SPHINX"; }	///< SE name for display purposes
-	const char *	index_type ( uint )		{ return "HASH"; }		///< index type name for display purposes
+	const char *	table_type () const override		{ return "SPHINX"; }	///< SE name for display purposes
+	const char *	index_type ( uint ) override		{ return "HASH"; }		///< index type name for display purposes
 
 	#if MYSQL_VERSION_ID>50100
-	ulonglong		table_flags () const	{ return HA_CAN_INDEX_BLOBS | 
+	ulonglong		table_flags () const override	{ return HA_CAN_INDEX_BLOBS | 
                                                                  HA_CAN_TABLE_CONDITION_PUSHDOWN; } ///< bitmap of implemented flags (see handler.h for more info)
 	#else
 	ulong			table_flags () const	{ return HA_CAN_INDEX_BLOBS; }			///< bitmap of implemented flags (see handler.h for more info)
 	#endif
 
-	ulong			index_flags ( uint, uint, bool ) const	{ return 0; }	///< bitmap of flags that says how SE implements indexes
-	uint			max_supported_record_length () const	{ return HA_MAX_REC_LENGTH; }
-	uint			max_supported_keys () const				{ return 1; }
-	uint			max_supported_key_parts () const		{ return 1; }
-	uint			max_supported_key_length () const		{ return MAX_KEY_LENGTH; }
-	uint			max_supported_key_part_length () const	{ return MAX_KEY_LENGTH; }
+	ulong			index_flags ( uint, uint, bool ) const override	{ return 0; }	///< bitmap of flags that says how SE implements indexes
+	uint			max_supported_record_length () const override	{ return HA_MAX_REC_LENGTH; }
+	uint			max_supported_keys () const override				{ return 1; }
+	uint			max_supported_key_parts () const override		{ return 1; }
+	uint			max_supported_key_length () const override		{ return MAX_KEY_LENGTH; }
+	uint			max_supported_key_part_length () const override	{ return MAX_KEY_LENGTH; }
 
-	IO_AND_CPU_COST	scan_time ()
+	IO_AND_CPU_COST	scan_time () override
 	{
           IO_AND_CPU_COST cost;
           cost.io= 0;
@@ -80,14 +80,14 @@ public:
           return cost;
         }
         IO_AND_CPU_COST keyread_time(uint index, ulong ranges, ha_rows rows,
-                                    ulonglong blocks)
+                                    ulonglong blocks) override
 	{
           IO_AND_CPU_COST cost;
           cost.io= ranges;
           cost.cpu= 0;
           return cost;
         }
-        IO_AND_CPU_COST rnd_pos_time(ha_rows rows)
+        IO_AND_CPU_COST rnd_pos_time(ha_rows rows) override
 	{
           IO_AND_CPU_COST cost;
           cost.io= 0;
@@ -96,58 +96,58 @@ public:
         }
 
 public:
-	int				open ( const char * name, int mode, uint test_if_locked );
-	int				close ();
+	int				open ( const char * name, int mode, uint test_if_locked ) override;
+	int				close () override;
 
-	int				write_row ( const byte * buf );
-	int				update_row ( const byte * old_data, const byte * new_data );
-	int				delete_row ( const byte * buf );
-	int				extra ( enum ha_extra_function op );
+	int				write_row ( const byte * buf ) override;
+	int				update_row ( const byte * old_data, const byte * new_data ) override;
+	int				delete_row ( const byte * buf ) override;
+	int				extra ( enum ha_extra_function op ) override;
 
-	int				index_init ( uint keynr, bool sorted ); // 5.1.x
+	int				index_init ( uint keynr, bool sorted ) override; // 5.1.x
 	int				index_init ( uint keynr ) { return index_init ( keynr, false ); } // 5.0.x
 
-	int				index_end ();
-	int				index_read ( byte * buf, const byte * key, uint key_len, enum ha_rkey_function find_flag );
+	int				index_end () override;
+	int				index_read ( byte * buf, const byte * key, uint key_len, enum ha_rkey_function find_flag ) override;
 	int				index_read_idx ( byte * buf, uint idx, const byte * key, uint key_len, enum ha_rkey_function find_flag );
-	int				index_next ( byte * buf );
-	int				index_next_same ( byte * buf, const byte * key, uint keylen );
-	int				index_prev ( byte * buf );
-	int				index_first ( byte * buf );
-	int				index_last ( byte * buf );
+	int				index_next ( byte * buf ) override;
+	int				index_next_same ( byte * buf, const byte * key, uint keylen ) override;
+	int				index_prev ( byte * buf ) override;
+	int				index_first ( byte * buf ) override;
+	int				index_last ( byte * buf ) override;
 
 	int				get_rec ( byte * buf, const byte * key, uint keylen );
 
-	int				rnd_init ( bool scan );
-	int				rnd_end ();
-	int				rnd_next ( byte * buf );
-	int				rnd_pos ( byte * buf, byte * pos );
-	void			position ( const byte * record );
+	int				rnd_init ( bool scan ) override;
+	int				rnd_end () override;
+	int				rnd_next ( byte * buf ) override;
+	int				rnd_pos ( byte * buf, byte * pos ) override;
+	void			position ( const byte * record ) override;
 
 #if MYSQL_VERSION_ID>=50030
-	int				info ( uint );
+	int				info ( uint ) override;
 #else
 	void			info ( uint );
 #endif
 
-	int				reset();
-	int				external_lock ( THD * thd, int lock_type );
-	int				delete_all_rows ();
-	ha_rows			        records_in_range ( uint inx, const key_range * min_key, const key_range * max_key,  page_range *pages);
+	int				reset() override;
+	int				external_lock ( THD * thd, int lock_type ) override;
+	int				delete_all_rows () override;
+	ha_rows			        records_in_range ( uint inx, const key_range * min_key, const key_range * max_key,  page_range *pages) override;
 
-	int				delete_table ( const char * from );
-	int				rename_table ( const char * from, const char * to );
-	int				create ( const char * name, TABLE * form, HA_CREATE_INFO * create_info );
+	int				delete_table ( const char * from ) override;
+	int				rename_table ( const char * from, const char * to ) override;
+	int				create ( const char * name, TABLE * form, HA_CREATE_INFO * create_info ) override;
 
-	THR_LOCK_DATA **		store_lock ( THD * thd, THR_LOCK_DATA ** to, enum thr_lock_type lock_type );
+	THR_LOCK_DATA **		store_lock ( THD * thd, THR_LOCK_DATA ** to, enum thr_lock_type lock_type ) override;
 
 public:
 #if MYSQL_VERSION_ID<50610
 	virtual const COND *	cond_push ( const COND *cond );
 #else
-	virtual const Item *		cond_push ( const Item *cond );
+	const Item *		cond_push ( const Item *cond ) override;
 #endif	
-	virtual void			cond_pop ();
+	void			cond_pop () override;
 
 private:
 	uint32			m_iFields;
diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h
index 022f3c54321..d7bbeb22b01 100644
--- a/storage/spider/ha_spider.h
+++ b/storage/spider/ha_spider.h
@@ -172,14 +172,14 @@ public:
   handler *clone(
     const char *name,
     MEM_ROOT *mem_root
-  );
+  ) override;
   const char **bas_ext() const;
   int open(
     const char* name,
     int mode,
     uint test_if_locked
-  );
-  int close();
+  ) override;
+  int close() override;
   int check_access_kind_for_connection(
     THD *thd,
     bool write_request
@@ -191,59 +191,56 @@ public:
     THD *thd,
     THR_LOCK_DATA **to,
     enum thr_lock_type lock_type
-  );
+  ) override;
   int external_lock(
     THD *thd,
     int lock_type
-  );
+  ) override;
   int start_stmt(
     THD *thd,
     thr_lock_type lock_type
-  );
-  int reset();
+  ) override;
+  int reset() override;
   int extra(
     enum ha_extra_function operation
-  );
-  int index_init(
-    uint idx,
-    bool sorted
-  );
-  int index_end();
+  ) override;
+  int index_init(uint idx, bool sorted) override;
+  int index_end() override;
   int index_read_map(
     uchar *buf,
     const uchar *key,
     key_part_map keypart_map,
     enum ha_rkey_function find_flag
-  );
+  ) override;
   int index_read_last_map(
     uchar *buf,
     const uchar *key,
     key_part_map keypart_map
-  );
+  ) override;
   int index_next(
     uchar *buf
-  );
+  ) override;
   int index_prev(
     uchar *buf
-  );
+  ) override;
   int index_first(
     uchar *buf
-  );
+  ) override;
   int index_last(
     uchar *buf
-  );
+  ) override;
   int index_next_same(
     uchar *buf,
     const uchar *key,
     uint keylen
-  );
+  ) override;
   int read_range_first(
     const key_range *start_key,
     const key_range *end_key,
     bool eq_range,
     bool sorted
-  );
-  int read_range_next();
+  ) override;
+  int read_range_next() override;
   void reset_no_where_cond();
   bool check_no_where_cond();
   ha_rows multi_range_read_info_const(
@@ -255,7 +252,7 @@ public:
     uint *flags,
     ha_rows limit,
     Cost_estimate *cost
-  );
+  ) override;
   ha_rows multi_range_read_info(
     uint keyno,
     uint n_ranges,
@@ -264,110 +261,100 @@ public:
     uint *bufsz,
     uint *flags,
     Cost_estimate *cost
-  );
+  ) override;
   int multi_range_read_init(
     RANGE_SEQ_IF *seq,
     void *seq_init_param,
     uint n_ranges,
     uint mode,
     HANDLER_BUFFER *buf
-  );
+  ) override;
   int multi_range_read_next(
     range_id_t *range_info
-  );
+  ) override;
   int multi_range_read_next_first(
     range_id_t *range_info
   );
   int multi_range_read_next_next(
     range_id_t *range_info
   );
-  int rnd_init(
-    bool scan
-  );
-  int rnd_end();
+  int rnd_init(bool scan) override;
+  int rnd_end() override;
   int rnd_next(
     uchar *buf
-  );
+  ) override;
   void position(
     const uchar *record
-  );
+  ) override;
   int rnd_pos(
     uchar *buf,
     uchar *pos
-  );
+  ) override;
   int cmp_ref(
     const uchar *ref1,
     const uchar *ref2
-  );
-  int ft_init();
-  void ft_end();
+  ) override;
+  int ft_init() override;
+  void ft_end() override;
   FT_INFO *ft_init_ext(
     uint flags,
     uint inx,
     String *key
-  );
+  ) override;
   int ft_read(
     uchar *buf
-  );
+  ) override;
   int pre_index_read_map(
     const uchar *key,
     key_part_map keypart_map,
     enum ha_rkey_function find_flag,
     bool use_parallel
-  );
-  int pre_index_first(bool use_parallel);
-  int pre_index_last(bool use_parallel);
+  ) override;
+  int pre_index_first(bool use_parallel) override;
+  int pre_index_last(bool use_parallel) override;
   int pre_index_read_last_map(
     const uchar *key,
     key_part_map keypart_map,
     bool use_parallel
-  );
-  int pre_multi_range_read_next(
-    bool use_parallel
-  );
+  ) override;
+  int pre_multi_range_read_next(bool use_parallel) override;
   int pre_read_range_first(
     const key_range *start_key,
     const key_range *end_key,
     bool eq_range,
     bool sorted,
     bool use_parallel
-  );
-  int pre_ft_read(bool use_parallel);
-  int pre_rnd_next(bool use_parallel);
+  ) override;
+  int pre_ft_read(bool use_parallel) override;
+  int pre_rnd_next(bool use_parallel) override;
   int info(
     uint flag
-  );
+  ) override;
   ha_rows records_in_range(
     uint inx,
     const key_range *start_key,
     const key_range *end_key,
     page_range *pages
-  );
+  ) override;
   int check_crd();
-  int pre_records();
-  ha_rows records();
-  int pre_calculate_checksum();
-  int calculate_checksum();
-  const char *table_type() const;
-  ulonglong table_flags() const;
+  int pre_records() override;
+  ha_rows records() override;
+  int pre_calculate_checksum() override;
+  int calculate_checksum() override;
+  const char *table_type() const override;
+  ulonglong table_flags() const override;
   ulong table_flags_for_partition();
-  const char *index_type(
-    uint key_number
-  );
-  ulong index_flags(
-    uint idx,
-    uint part,
-    bool all_parts
-  ) const;
-  uint max_supported_record_length() const;
-  uint max_supported_keys() const;
-  uint max_supported_key_parts() const;
-  uint max_supported_key_length() const;
-  uint max_supported_key_part_length() const;
-  uint8 table_cache_type();
-  bool need_info_for_auto_inc();
+  const char *index_type(uint key_number) override;
+  ulong index_flags(uint idx, uint part, bool all_parts) const override;
+  uint max_supported_record_length() const override;
+  uint max_supported_keys() const override;
+  uint max_supported_key_parts() const override;
+  uint max_supported_key_length() const override;
+  uint max_supported_key_part_length() const override;
+  uint8 table_cache_type() override;
+  bool need_info_for_auto_inc() override;
 #ifdef HANDLER_HAS_CAN_USE_FOR_AUTO_INC_INIT
-  bool can_use_for_auto_inc_init();
+  bool can_use_for_auto_inc_init() override;
 #endif
   int update_auto_increment();
   void get_auto_increment(
@@ -376,38 +363,29 @@ public:
     ulonglong nb_desired_values,
     ulonglong *first_value,
     ulonglong *nb_reserved_values
-  );
-  int reset_auto_increment(
-    ulonglong value
-  );
-  void release_auto_increment();
-  void start_bulk_insert(
-    ha_rows rows,
-    uint flags
-  );
-  int end_bulk_insert();
-  int write_row(
-    const uchar *buf
-  );
+  ) override;
+  int reset_auto_increment(ulonglong value) override;
+  void release_auto_increment() override;
+  void start_bulk_insert(ha_rows rows, uint flags) override;
+  int end_bulk_insert() override;
+  int write_row(const uchar *buf) override;
   void direct_update_init(
     THD *thd,
     bool hs_request
   );
-  bool start_bulk_update();
-  int exec_bulk_update(
-    ha_rows *dup_key_found
-  );
-  int end_bulk_update();
+  bool start_bulk_update() override;
+  int exec_bulk_update(ha_rows *dup_key_found) override;
+  int end_bulk_update() override;
 #ifdef SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
   int bulk_update_row(
     const uchar *old_data,
     const uchar *new_data,
     ha_rows *dup_key_found
-  );
+  ) override;
   int update_row(
     const uchar *old_data,
     const uchar *new_data
-  );
+  ) override;
 #else
   int bulk_update_row(
     const uchar *old_data,
@@ -424,105 +402,95 @@ public:
     longlong select_limit,
     longlong offset_limit
   );
-  int direct_update_rows_init(
-    List<Item> *update_fields
-  );
-  int direct_update_rows(
-    ha_rows *update_rows,
-    ha_rows *found_row
-  );
-  bool start_bulk_delete();
-  int end_bulk_delete();
-  int delete_row(
-    const uchar *buf
-  );
+  int direct_update_rows_init(List<Item> *update_fields) override;
+  int direct_update_rows(ha_rows *update_rows, ha_rows *found_row) override;
+  bool start_bulk_delete() override;
+  int end_bulk_delete() override;
+  int delete_row(const uchar *buf) override;
   bool check_direct_delete_sql_part(
     st_select_lex *select_lex,
     longlong select_limit,
     longlong offset_limit
   );
-  int direct_delete_rows_init();
+  int direct_delete_rows_init() override;
   int direct_delete_rows(
     ha_rows *delete_rows
-  );
-  int delete_all_rows();
-  int truncate();
-  IO_AND_CPU_COST scan_time();
-  IO_AND_CPU_COST rnd_pos_time(ha_rows rows);
+  ) override;
+  int delete_all_rows() override;
+  int truncate() override;
+  IO_AND_CPU_COST scan_time() override;
+  IO_AND_CPU_COST rnd_pos_time(ha_rows rows) override;
   IO_AND_CPU_COST keyread_time(uint index, ulong ranges, ha_rows rows,
-                               ulonglong blocks);
-  const key_map *keys_to_use_for_scanning();
-  ha_rows estimate_rows_upper_bound();
+                               ulonglong blocks) override;
+  const key_map *keys_to_use_for_scanning() override;
+  ha_rows estimate_rows_upper_bound() override;
   void print_error(
     int error,
     myf errflag
-  );
+  ) override;
   bool get_error_message(
     int error,
     String *buf
-  );
+  ) override;
   int create(
     const char *name,
     TABLE *form,
     HA_CREATE_INFO *info
-  );
+  ) override;
   void update_create_info(
     HA_CREATE_INFO* create_info
-  );
+  ) override;
   int rename_table(
     const char *from,
     const char *to
-  );
+  ) override;
   int delete_table(
     const char *name
-  );
-  bool is_crashed() const;
+  ) override;
+  bool is_crashed() const override;
 #ifdef SPIDER_HANDLER_AUTO_REPAIR_HAS_ERROR
-  bool auto_repair(int error) const;
+  bool auto_repair(int error) const override;
 #else
   bool auto_repair() const;
 #endif
   int disable_indexes(
     key_map map, bool persist
-  );
+  ) override;
   int enable_indexes(
     key_map map, bool persist
-  );
+  ) override;
   int check(
     THD* thd,
     HA_CHECK_OPT* check_opt
-  );
+  ) override;
   int repair(
     THD* thd,
     HA_CHECK_OPT* check_opt
-  );
+  ) override;
   bool check_and_repair(
     THD *thd
-  );
+  ) override;
   int analyze(
     THD* thd,
     HA_CHECK_OPT* check_opt
-  );
+  ) override;
   int optimize(
     THD* thd,
     HA_CHECK_OPT* check_opt
-  );
+  ) override;
   bool is_fatal_error(
     int error_num,
     uint flags
-  );
+  ) override;
   Field *field_exchange(
     Field *field
   );
   const COND *cond_push(
     const COND* cond
-  );
-  void cond_pop();
-  int info_push(
-    uint info_type,
-    void *info
-  );
-  void return_record_by_parent();
+  ) override;
+  void cond_pop() override;
+  int info_push(uint info_type, void *info) override;
+  void return_record_by_parent() override;
   TABLE *get_table();
   void set_ft_discard_bitmap();
   void set_searched_bitmap();
diff --git a/storage/spider/mysql-test/spider/my.cnf b/storage/spider/mysql-test/spider/my.cnf
index 2f597ec8d83..d517840adf7 100644
--- a/storage/spider/mysql-test/spider/my.cnf
+++ b/storage/spider/mysql-test/spider/my.cnf
@@ -1,178 +1,11 @@
 # Use default setting for mysqld processes
 !include include/default_mysqld.cnf
 !include include/default_client.cnf
-
-[mysqld.1.1]
-log-bin=                  master-bin
-loose_handlersocket_port=                20000
-loose_handlersocket_port_wr=             20001
-loose_handlersocket_threads=             2
-loose_handlersocket_threads_wr=          1
-loose_handlersocket_support_merge_table= 0
-loose_handlersocket_direct_update_mode=  2
-loose_handlersocket_unlimited_boundary=  65536
-loose_handlersocket_bulk_insert=         0
-loose_handlersocket_bulk_insert_timeout= 0
-loose_handlersocket_general_log=         1
-loose_handlersocket_timeout=             30
-loose_handlersocket_close_table_interval=2
-open_files_limit=                        4096
-loose_partition=                         1
-
-[mysqld.2.1]
-loose_handlersocket_port=                20002
-loose_handlersocket_port_wr=             20003
-loose_handlersocket_threads=             2
-loose_handlersocket_threads_wr=          1
-loose_handlersocket_support_merge_table= 0
-loose_handlersocket_direct_update_mode=  2
-loose_handlersocket_unlimited_boundary=  65536
-loose_handlersocket_bulk_insert=         0
-loose_handlersocket_bulk_insert_timeout= 0
-loose_handlersocket_general_log=         1
-loose_handlersocket_timeout=             30
-loose_handlersocket_close_table_interval=2
-open_files_limit=                        4096
-
-[mysqld.2.2]
-loose_handlersocket_port=                20004
-loose_handlersocket_port_wr=             20005
-loose_handlersocket_threads=             2
-loose_handlersocket_threads_wr=          1
-loose_handlersocket_support_merge_table= 0
-loose_handlersocket_direct_update_mode=  2
-loose_handlersocket_unlimited_boundary=  65536
-loose_handlersocket_bulk_insert=         0
-loose_handlersocket_bulk_insert_timeout= 0
-loose_handlersocket_general_log=         1
-loose_handlersocket_timeout=             30
-loose_handlersocket_close_table_interval=2
-open_files_limit=                        4096
-
-[mysqld.2.3]
-
-[mysqld.3.1]
-loose_partition=                         1
-
-[mysqld.3.2]
-loose_partition=                         1
-
-[mysqld.3.3]
-loose_partition=                         1
-
-[mysqld.4.1]
-loose_partition=                         1
-
-
-[ENV]
-USE_GEOMETRY_TEST=        1
-USE_FULLTEXT_TEST=        1
-USE_HA_TEST=              1
-USE_GENERAL_LOG=          1
-USE_REPLICATION=          1
-MASTER_1_MYPORT=          @mysqld.1.1.port
-MASTER_1_HSRPORT=         20000
-MASTER_1_HSWPORT=         20001
-MASTER_1_MYSOCK=          @mysqld.1.1.socket
-MASTER_1_ENGINE_TYPE=     Spider
-#MASTER_1_ENGINE_TYPE=     MyISAM
-MASTER_1_ENGINE=          ENGINE=Spider
-MASTER_1_CHARSET=         DEFAULT CHARSET=utf8
-MASTER_1_ENGINE2=         ENGINE=MyISAM
-MASTER_1_CHARSET2=        DEFAULT CHARSET=utf8
-MASTER_1_CHARSET3=        DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-SLAVE1_1_MYPORT=          @mysqld.4.1.port
-SLAVE1_1_MYSOCK=          @mysqld.4.1.socket
-SLAVE1_1_ENGINE_TYPE=     MyISAM
-SLAVE1_1_ENGINE=          ENGINE=MyISAM
-SLAVE1_1_CHARSET=         DEFAULT CHARSET=utf8
-USE_CHILD_GROUP2=         1
-OUTPUT_CHILD_GROUP2=      0
-CHILD2_1_MYPORT=          @mysqld.2.1.port
-CHILD2_1_HSRPORT=         20002
-CHILD2_1_HSWPORT=         20003
-CHILD2_1_MYSOCK=          @mysqld.2.1.socket
-CHILD2_1_ENGINE_TYPE=     InnoDB
-CHILD2_1_ENGINE=          ENGINE=InnoDB
-CHILD2_1_CHARSET=         DEFAULT CHARSET=utf8
-CHILD2_1_CHARSET2=        DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-CHILD2_2_MYPORT=          @mysqld.2.2.port
-CHILD2_2_HSRPORT=         20004
-CHILD2_2_HSWPORT=         20005
-CHILD2_2_MYSOCK=          @mysqld.2.2.socket
-CHILD2_2_ENGINE_TYPE=     InnoDB
-CHILD2_2_ENGINE=          ENGINE=InnoDB
-CHILD2_2_CHARSET=         DEFAULT CHARSET=utf8
-CHILD2_3_MYPORT=          @mysqld.2.3.port
-CHILD2_3_MYSOCK=          @mysqld.2.3.socket
-CHILD2_3_ENGINE_TYPE=     InnoDB
-CHILD2_3_ENGINE=          ENGINE=InnoDB
-CHILD2_3_CHARSET=         DEFAULT CHARSET=utf8
-CHILD2_1_FT_MYPORT=       @mysqld.2.1.port
-CHILD2_1_FT_MYSOCK=       @mysqld.2.1.socket
-CHILD2_1_FT_ENGINE_TYPE=  MyISAM
-CHILD2_1_FT_ENGINE=       ENGINE=MyISAM
-CHILD2_1_FT_CHARSET=      DEFAULT CHARSET=utf8
-CHILD2_2_FT_MYPORT=       @mysqld.2.2.port
-CHILD2_2_FT_MYSOCK=       @mysqld.2.2.socket
-CHILD2_2_FT_ENGINE_TYPE=  MyISAM
-CHILD2_2_FT_ENGINE=       ENGINE=MyISAM
-CHILD2_2_FT_CHARSET=      DEFAULT CHARSET=utf8
-CHILD2_1_GM_MYPORT=       @mysqld.2.1.port
-CHILD2_1_GM_MYSOCK=       @mysqld.2.1.socket
-CHILD2_1_GM_ENGINE_TYPE=  MyISAM
-CHILD2_1_GM_ENGINE=       ENGINE=MyISAM
-CHILD2_1_GM_CHARSET=      DEFAULT CHARSET=utf8
-CHILD2_2_GM_MYPORT=       @mysqld.2.2.port
-CHILD2_2_GM_MYSOCK=       @mysqld.2.2.socket
-CHILD2_2_GM_ENGINE_TYPE=  MyISAM
-CHILD2_2_GM_ENGINE=       ENGINE=MyISAM
-CHILD2_2_GM_CHARSET=      DEFAULT CHARSET=utf8
-USE_CHILD_GROUP3=         1
-OUTPUT_CHILD_GROUP3=      0
-CHILD3_1_MYPORT=          @mysqld.3.1.port
-CHILD3_1_MYSOCK=          @mysqld.3.1.socket
-CHILD3_1_ENGINE_TYPE=     InnoDB
-CHILD3_1_ENGINE=          ENGINE=InnoDB
-CHILD3_1_CHARSET=         DEFAULT CHARSET=utf8
-CHILD3_2_MYPORT=          @mysqld.3.2.port
-CHILD3_2_MYSOCK=          @mysqld.3.2.socket
-CHILD3_2_ENGINE_TYPE=     InnoDB
-CHILD3_2_ENGINE=          ENGINE=InnoDB
-CHILD3_2_CHARSET=         DEFAULT CHARSET=utf8
-CHILD3_3_MYPORT=          @mysqld.3.3.port
-CHILD3_3_MYSOCK=          @mysqld.3.3.socket
-CHILD3_3_ENGINE_TYPE=     InnoDB
-CHILD3_3_ENGINE=          ENGINE=InnoDB
-CHILD3_3_CHARSET=         DEFAULT CHARSET=utf8
-
-STR_SEMICOLON=            ;
-
-#The followings are set in include/init_xxx.inc files
-# MASTER_1_COMMENT_2_1
-# MASTER_1_COMMENT2_2_1
-# MASTER_1_COMMENT3_2_1
-# MASTER_1_COMMENT4_2_1
-# MASTER_1_COMMENT5_2_1
-# MASTER_1_COMMENT_P_2_1
-# CHILD2_1_DROP_TABLES
-# CHILD2_1_CREATE_TABLES
-# CHILD2_1_SELECT_TABLES
-# CHILD2_1_DROP_TABLES2
-# CHILD2_1_CREATE_TABLES2
-# CHILD2_1_SELECT_TABLES2
-# CHILD2_1_DROP_TABLES3
-# CHILD2_1_CREATE_TABLES3
-# CHILD2_1_SELECT_TABLES3
-# CHILD2_1_DROP_TABLES4
-# CHILD2_1_CREATE_TABLES4
-# CHILD2_1_SELECT_TABLES4
-# CHILD2_1_DROP_TABLES5
-# CHILD2_1_CREATE_TABLES5
-# CHILD2_1_SELECT_TABLES5
-# CHILD2_1_DROP_TABLES6
-# CHILD2_1_CREATE_TABLES6
-# CHILD2_1_SELECT_TABLES6
-# CHILD2_2_DROP_TABLES
-# CHILD2_2_CREATE_TABLES
-# CHILD2_2_SELECT_TABLES
+!include my_1_1.cnf
+!include my_2_1.cnf
+!include my_2_2.cnf
+!include my_2_3.cnf
+!include my_3_1.cnf
+!include my_3_2.cnf
+!include my_3_3.cnf
+!include my_4_1.cnf
diff --git a/storage/spider/mysql-test/spider/my_1_1.cnf b/storage/spider/mysql-test/spider/my_1_1.cnf
new file mode 100644
index 00000000000..5f17295d895
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_1_1.cnf
@@ -0,0 +1,44 @@
+[mysqld.1.1]
+log-bin=                  master-bin
+loose_handlersocket_port=                20000
+loose_handlersocket_port_wr=             20001
+loose_handlersocket_threads=             2
+loose_handlersocket_threads_wr=          1
+loose_handlersocket_support_merge_table= 0
+loose_handlersocket_direct_update_mode=  2
+loose_handlersocket_unlimited_boundary=  65536
+loose_handlersocket_bulk_insert=         0
+loose_handlersocket_bulk_insert_timeout= 0
+loose_handlersocket_general_log=         1
+loose_handlersocket_timeout=             30
+loose_handlersocket_close_table_interval=2
+open_files_limit=                        4096
+loose_partition=                         1
+
+[ENV]
+USE_GEOMETRY_TEST=        1
+USE_FULLTEXT_TEST=        1
+USE_HA_TEST=              1
+USE_GENERAL_LOG=          1
+USE_REPLICATION=          1
+MASTER_1_MYPORT=          @mysqld.1.1.port
+MASTER_1_HSRPORT=         20000
+MASTER_1_HSWPORT=         20001
+MASTER_1_MYSOCK=          @mysqld.1.1.socket
+MASTER_1_ENGINE_TYPE=     Spider
+#MASTER_1_ENGINE_TYPE=     MyISAM
+MASTER_1_ENGINE=          ENGINE=Spider
+MASTER_1_CHARSET=         DEFAULT CHARSET=utf8
+MASTER_1_ENGINE2=         ENGINE=MyISAM
+MASTER_1_CHARSET2=        DEFAULT CHARSET=utf8
+MASTER_1_CHARSET3=        DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+
+STR_SEMICOLON=            ;
+
+#The followings are set in include/init_xxx.inc files
+# MASTER_1_COMMENT_2_1
+# MASTER_1_COMMENT2_2_1
+# MASTER_1_COMMENT3_2_1
+# MASTER_1_COMMENT4_2_1
+# MASTER_1_COMMENT5_2_1
+# MASTER_1_COMMENT_P_2_1
diff --git a/storage/spider/mysql-test/spider/my_2_1.cnf b/storage/spider/mysql-test/spider/my_2_1.cnf
new file mode 100644
index 00000000000..24161645607
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_2_1.cnf
@@ -0,0 +1,56 @@
+[mysqld.2.1]
+loose_handlersocket_port=                20002
+loose_handlersocket_port_wr=             20003
+loose_handlersocket_threads=             2
+loose_handlersocket_threads_wr=          1
+loose_handlersocket_support_merge_table= 0
+loose_handlersocket_direct_update_mode=  2
+loose_handlersocket_unlimited_boundary=  65536
+loose_handlersocket_bulk_insert=         0
+loose_handlersocket_bulk_insert_timeout= 0
+loose_handlersocket_general_log=         1
+loose_handlersocket_timeout=             30
+loose_handlersocket_close_table_interval=2
+open_files_limit=                        4096
+
+[ENV]
+USE_CHILD_GROUP2=         1
+OUTPUT_CHILD_GROUP2=      0
+CHILD2_1_MYPORT=          @mysqld.2.1.port
+CHILD2_1_HSRPORT=         20002
+CHILD2_1_HSWPORT=         20003
+CHILD2_1_MYSOCK=          @mysqld.2.1.socket
+CHILD2_1_ENGINE_TYPE=     InnoDB
+CHILD2_1_ENGINE=          ENGINE=InnoDB
+CHILD2_1_CHARSET=         DEFAULT CHARSET=utf8
+CHILD2_1_CHARSET2=        DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
+CHILD2_1_FT_MYPORT=       @mysqld.2.1.port
+CHILD2_1_FT_MYSOCK=       @mysqld.2.1.socket
+CHILD2_1_FT_ENGINE_TYPE=  MyISAM
+CHILD2_1_FT_ENGINE=       ENGINE=MyISAM
+CHILD2_1_FT_CHARSET=      DEFAULT CHARSET=utf8
+CHILD2_1_GM_MYPORT=       @mysqld.2.1.port
+CHILD2_1_GM_MYSOCK=       @mysqld.2.1.socket
+CHILD2_1_GM_ENGINE_TYPE=  MyISAM
+CHILD2_1_GM_ENGINE=       ENGINE=MyISAM
+CHILD2_1_GM_CHARSET=      DEFAULT CHARSET=utf8
+
+#The followings are set in include/init_xxx.inc files
+# CHILD2_1_DROP_TABLES
+# CHILD2_1_CREATE_TABLES
+# CHILD2_1_SELECT_TABLES
+# CHILD2_1_DROP_TABLES2
+# CHILD2_1_CREATE_TABLES2
+# CHILD2_1_SELECT_TABLES2
+# CHILD2_1_DROP_TABLES3
+# CHILD2_1_CREATE_TABLES3
+# CHILD2_1_SELECT_TABLES3
+# CHILD2_1_DROP_TABLES4
+# CHILD2_1_CREATE_TABLES4
+# CHILD2_1_SELECT_TABLES4
+# CHILD2_1_DROP_TABLES5
+# CHILD2_1_CREATE_TABLES5
+# CHILD2_1_SELECT_TABLES5
+# CHILD2_1_DROP_TABLES6
+# CHILD2_1_CREATE_TABLES6
+# CHILD2_1_SELECT_TABLES6
diff --git a/storage/spider/mysql-test/spider/my_2_2.cnf b/storage/spider/mysql-test/spider/my_2_2.cnf
new file mode 100644
index 00000000000..2d3c2a89a7d
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_2_2.cnf
@@ -0,0 +1,38 @@
+[mysqld.2.2]
+loose_handlersocket_port=                20004
+loose_handlersocket_port_wr=             20005
+loose_handlersocket_threads=             2
+loose_handlersocket_threads_wr=          1
+loose_handlersocket_support_merge_table= 0
+loose_handlersocket_direct_update_mode=  2
+loose_handlersocket_unlimited_boundary=  65536
+loose_handlersocket_bulk_insert=         0
+loose_handlersocket_bulk_insert_timeout= 0
+loose_handlersocket_general_log=         1
+loose_handlersocket_timeout=             30
+loose_handlersocket_close_table_interval=2
+open_files_limit=                        4096
+
+[ENV]
+CHILD2_2_MYPORT=          @mysqld.2.2.port
+CHILD2_2_HSRPORT=         20004
+CHILD2_2_HSWPORT=         20005
+CHILD2_2_MYSOCK=          @mysqld.2.2.socket
+CHILD2_2_ENGINE_TYPE=     InnoDB
+CHILD2_2_ENGINE=          ENGINE=InnoDB
+CHILD2_2_CHARSET=         DEFAULT CHARSET=utf8
+CHILD2_2_FT_MYPORT=       @mysqld.2.2.port
+CHILD2_2_FT_MYSOCK=       @mysqld.2.2.socket
+CHILD2_2_FT_ENGINE_TYPE=  MyISAM
+CHILD2_2_FT_ENGINE=       ENGINE=MyISAM
+CHILD2_2_FT_CHARSET=      DEFAULT CHARSET=utf8
+CHILD2_2_GM_MYPORT=       @mysqld.2.2.port
+CHILD2_2_GM_MYSOCK=       @mysqld.2.2.socket
+CHILD2_2_GM_ENGINE_TYPE=  MyISAM
+CHILD2_2_GM_ENGINE=       ENGINE=MyISAM
+CHILD2_2_GM_CHARSET=      DEFAULT CHARSET=utf8
+
+#The followings are set in include/init_xxx.inc files
+# CHILD2_2_DROP_TABLES
+# CHILD2_2_CREATE_TABLES
+# CHILD2_2_SELECT_TABLES
diff --git a/storage/spider/mysql-test/spider/my_2_3.cnf b/storage/spider/mysql-test/spider/my_2_3.cnf
new file mode 100644
index 00000000000..3e62d151b3d
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_2_3.cnf
@@ -0,0 +1,9 @@
+[mysqld.2.3]
+loose_partition=          1
+
+[ENV]
+CHILD2_3_MYPORT=          @mysqld.2.3.port
+CHILD2_3_MYSOCK=          @mysqld.2.3.socket
+CHILD2_3_ENGINE_TYPE=     InnoDB
+CHILD2_3_ENGINE=          ENGINE=InnoDB
+CHILD2_3_CHARSET=         DEFAULT CHARSET=utf8
diff --git a/storage/spider/mysql-test/spider/my_3_1.cnf b/storage/spider/mysql-test/spider/my_3_1.cnf
new file mode 100644
index 00000000000..fad21607789
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_3_1.cnf
@@ -0,0 +1,11 @@
+[mysqld.3.1]
+loose_partition=                         1
+
+[ENV]
+USE_CHILD_GROUP3=         1
+OUTPUT_CHILD_GROUP3=      0
+CHILD3_1_MYPORT=          @mysqld.3.1.port
+CHILD3_1_MYSOCK=          @mysqld.3.1.socket
+CHILD3_1_ENGINE_TYPE=     InnoDB
+CHILD3_1_ENGINE=          ENGINE=InnoDB
+CHILD3_1_CHARSET=         DEFAULT CHARSET=utf8
diff --git a/storage/spider/mysql-test/spider/my_3_2.cnf b/storage/spider/mysql-test/spider/my_3_2.cnf
new file mode 100644
index 00000000000..6f027b6f525
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_3_2.cnf
@@ -0,0 +1,9 @@
+[mysqld.3.2]
+loose_partition=                         1
+
+[ENV]
+CHILD3_2_MYPORT=          @mysqld.3.2.port
+CHILD3_2_MYSOCK=          @mysqld.3.2.socket
+CHILD3_2_ENGINE_TYPE=     InnoDB
+CHILD3_2_ENGINE=          ENGINE=InnoDB
+CHILD3_2_CHARSET=         DEFAULT CHARSET=utf8
diff --git a/storage/spider/mysql-test/spider/my_3_3.cnf b/storage/spider/mysql-test/spider/my_3_3.cnf
new file mode 100644
index 00000000000..fbb33694738
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_3_3.cnf
@@ -0,0 +1,9 @@
+[mysqld.3.3]
+loose_partition=                         1
+
+[ENV]
+CHILD3_3_MYPORT=          @mysqld.3.3.port
+CHILD3_3_MYSOCK=          @mysqld.3.3.socket
+CHILD3_3_ENGINE_TYPE=     InnoDB
+CHILD3_3_ENGINE=          ENGINE=InnoDB
+CHILD3_3_CHARSET=         DEFAULT CHARSET=utf8
diff --git a/storage/spider/mysql-test/spider/my_4_1.cnf b/storage/spider/mysql-test/spider/my_4_1.cnf
new file mode 100644
index 00000000000..d1812a48b68
--- /dev/null
+++ b/storage/spider/mysql-test/spider/my_4_1.cnf
@@ -0,0 +1,9 @@
+[mysqld.4.1]
+loose_partition=                         1
+
+[ENV]
+SLAVE1_1_MYPORT=          @mysqld.4.1.port
+SLAVE1_1_MYSOCK=          @mysqld.4.1.socket
+SLAVE1_1_ENGINE_TYPE=     MyISAM
+SLAVE1_1_ENGINE=          ENGINE=MyISAM
+SLAVE1_1_CHARSET=         DEFAULT CHARSET=utf8
diff --git a/storage/spider/spd_copy_tables.cc b/storage/spider/spd_copy_tables.cc
index 1a6bd861c0a..518a7c590de 100644
--- a/storage/spider/spd_copy_tables.cc
+++ b/storage/spider/spd_copy_tables.cc
@@ -52,7 +52,7 @@ int spider_udf_set_copy_tables_param_default(
     copy_tables->database_length = SPIDER_THD_db_length(copy_tables->trx->thd);
     if (
       !(copy_tables->database = spider_create_string(
-        SPIDER_THD_db_str(copy_tables->trx->thd),
+        copy_tables->trx->thd->get_db(),
         copy_tables->database_length))
     ) {
       my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
diff --git a/storage/spider/spd_db_mysql.h b/storage/spider/spd_db_mysql.h
index a8fa33125e8..e67f974a6bb 100644
--- a/storage/spider/spd_db_mysql.h
+++ b/storage/spider/spd_db_mysql.h
@@ -247,29 +247,29 @@ public:
   int store_to_field(
     Field *field,
     CHARSET_INFO *access_charset
-  );
+  ) override;
   int append_to_str(
     spider_string *str
-  );
+  ) override;
   int append_escaped_to_str(
     spider_string *str,
     uint dbton_id
-  );
-  void first();
-  void next();
-  bool is_null();
-  int val_int();
-  double val_real();
+  ) override;
+  void first() override;
+  void next() override;
+  bool is_null() override;
+  int val_int() override;
+  double val_real() override;
   my_decimal *val_decimal(
     my_decimal *decimal_value,
     CHARSET_INFO *access_charset
-  );
-  SPIDER_DB_ROW *clone();
+  ) override;
+  SPIDER_DB_ROW *clone() override;
   int store_to_tmp_table(
     TABLE *tmp_table,
     spider_string *str
-  );
-  uint get_byte_size();
+  ) override;
+  uint get_byte_size() override;
 };
 
 class spider_db_mysql_row: public spider_db_mbase_row
@@ -297,20 +297,20 @@ public:
     SPIDER_DB_CONN *in_db_conn
   );
   virtual ~spider_db_mbase_result();
-  bool has_result();
-  void free_result();
-  SPIDER_DB_ROW *current_row();
-  SPIDER_DB_ROW *fetch_row();
+  bool has_result() override;
+  void free_result() override;
+  SPIDER_DB_ROW *current_row() override;
+  SPIDER_DB_ROW *fetch_row() override;
   SPIDER_DB_ROW *fetch_row_from_result_buffer(
     spider_db_result_buffer *spider_res_buf
-  );
+  ) override;
   SPIDER_DB_ROW *fetch_row_from_tmp_table(
     TABLE *tmp_table
-  );
+  ) override;
   int fetch_table_status(
     int mode,
     ha_statistics &stat
-  );
+  ) override;
   int fetch_simple_action(
     uint simple_action,
     uint position,
@@ -319,20 +319,20 @@ public:
   int fetch_table_records(
     int mode,
     ha_rows &records
-  );
+  ) override;
   int fetch_table_checksum(
     ha_spider *spider
-  );
+  ) override;
   int fetch_table_cardinality(
     int mode,
     TABLE *table,
     longlong *cardinality,
     uchar *cardinality_upd,
     int bitmap_size
-  );
+  ) override;
   int fetch_table_mon_status(
     int &status
-  );
+  ) override;
   int fetch_show_master_status(
     const char **binlog_file_name,
     const char **binlog_pos
@@ -340,25 +340,23 @@ public:
   int fetch_select_binlog_gtid_pos(
     const char **gtid_pos
   );
-  longlong num_rows();
-  uint num_fields();
-  void move_to_pos(
-    longlong pos
-  );
-  int get_errno();
+  longlong num_rows() override;
+  uint num_fields() override;
+  void move_to_pos(longlong pos) override;
+  int get_errno() override;
   int fetch_columns_for_discover_table_structure(
     spider_string *str,
     CHARSET_INFO *access_charset
-  );
+  ) override;
   int fetch_index_for_discover_table_structure(
     spider_string *str,
     CHARSET_INFO *access_charset
-  );
+  ) override;
   int fetch_table_for_discover_table_structure(
     spider_string *str,
     SPIDER_SHARE *spider_share,
     CHARSET_INFO *access_charset
-  );
+  ) override;
 };
 
 class spider_db_mysql_result: public spider_db_mbase_result
@@ -397,9 +395,9 @@ public:
     spider_db_mbase_util *spider_db_mbase_utility
   );
   virtual ~spider_db_mbase();
-  int init();
-  bool is_connected();
-  void bg_connect();
+  int init() override;
+  bool is_connected() override;
+  void bg_connect() override;
   int connect(
     char *tgt_host,
     char *tgt_username,
@@ -409,120 +407,120 @@ public:
     char *server_name,
     int connect_retry_count,
     longlong connect_retry_interval
-  );
-  int ping();
-  void bg_disconnect();
-  void disconnect();
-  int set_net_timeout();
+  ) override;
+  int ping() override;
+  void bg_disconnect() override;
+  void disconnect() override;
+  int set_net_timeout() override;
   int exec_query(
     const char *query,
     uint length,
     int quick_mode
-  );
-  int get_errno();
-  const char *get_error();
+  ) override;
+  int get_errno() override;
+  const char *get_error() override;
   bool is_server_gone_error(
     int error_num
-  );
+  ) override;
   bool is_dup_entry_error(
     int error_num
-  );
+  ) override;
   bool is_xa_nota_error(
     int error_num
-  );
+  ) override;
   int fetch_and_print_warnings(struct tm *l_time);
   spider_db_result *store_result(
     spider_db_result_buffer **spider_res_buf,
     st_spider_db_request_key *request_key,
     int *error_num
-  );
+  ) override;
   spider_db_result *use_result(
     ha_spider *spider,
     st_spider_db_request_key *request_key,
     int *error_num
-  );
-  int next_result();
-  uint affected_rows();
-  uint matched_rows();
+  ) override;
+  int next_result() override;
+  uint affected_rows() override;
+  uint matched_rows() override;
   bool inserted_info(
     spider_db_handler *handler,
     ha_copy_info *copy_info
-  );
-  ulonglong last_insert_id();
+  ) override;
+  ulonglong last_insert_id() override;
   int set_character_set(
     const char *csname
-  );
+  ) override;
   int select_db(
     const char *dbname
-  );
+  ) override;
   int consistent_snapshot(
     int *need_mon
-  );
-  bool trx_start_in_bulk_sql();
+  ) override;
+  bool trx_start_in_bulk_sql() override;
   int start_transaction(
     int *need_mon
-  );
+  ) override;
   int commit(
     int *need_mon
-  );
+  ) override;
   int rollback(
     int *need_mon
-  );
-  bool xa_start_in_bulk_sql();
+  ) override;
+  bool xa_start_in_bulk_sql() override;
   int xa_start(
     XID *xid,
     int *need_mon
-  );
+  ) override;
   int xa_end(
     XID *xid,
     int *need_mon
-  );
+  ) override;
   int xa_prepare(
     XID *xid,
     int *need_mon
-  );
+  ) override;
   int xa_commit(
     XID *xid,
     int *need_mon
-  );
+  ) override;
   int xa_rollback(
     XID *xid,
     int *need_mon
-  );
-  bool set_trx_isolation_in_bulk_sql();
+  ) override;
+  bool set_trx_isolation_in_bulk_sql() override;
   int set_trx_isolation(
     int trx_isolation,
     int *need_mon
-  );
-  bool set_autocommit_in_bulk_sql();
+  ) override;
+  bool set_autocommit_in_bulk_sql() override;
   int set_autocommit(
     bool autocommit,
     int *need_mon
-  );
-  bool set_sql_log_off_in_bulk_sql();
+  ) override;
+  bool set_sql_log_off_in_bulk_sql() override;
   int set_sql_log_off(
     bool sql_log_off,
     int *need_mon
-  );
-  bool set_wait_timeout_in_bulk_sql();
+  ) override;
+  bool set_wait_timeout_in_bulk_sql() override;
   int set_wait_timeout(
     int wait_timeout,
     int *need_mon
-  );
+  ) override;
 
   /** Reset the global lock wait time out */
   int reset_lock_wait_timeout();
 
-  bool set_sql_mode_in_bulk_sql();
+  bool set_sql_mode_in_bulk_sql() override;
   int set_sql_mode(
     sql_mode_t sql_mode,
     int *need_mon
-  );
-  bool set_time_zone_in_bulk_sql();
+  ) override;
+  bool set_time_zone_in_bulk_sql() override;
   int set_time_zone(
     Time_zone *time_zone,
     int *need_mon
-  );
+  ) override;
   int exec_simple_sql_with_result(
     SPIDER_TRX *trx,
     SPIDER_SHARE *share,
@@ -542,7 +540,7 @@ public:
     int mode,
     SPIDER_DB_RESULT **res1,
     SPIDER_DB_RESULT **res2
-  );
+  ) override;
   int select_binlog_gtid_pos(
     SPIDER_TRX *trx,
     SPIDER_SHARE *share,
@@ -560,23 +558,21 @@ public:
     char *to,
     const char *from,
     size_t from_length
-  );
-  bool have_lock_table_list();
+  ) override;
+  bool have_lock_table_list() override;
   int append_lock_tables(
     spider_string *str
-  );
-  int append_unlock_tables(
-    spider_string *str
-  );
-  uint get_lock_table_hash_count();
-  void reset_lock_table_hash();
+  ) override;
+  int append_unlock_tables(spider_string *str) override;
+  uint get_lock_table_hash_count() override;
+  void reset_lock_table_hash() override;
   void set_dup_key_idx(
     ha_spider *spider,
     int link_idx
-  );
+  ) override;
   bool cmp_request_key_to_snd(
     st_spider_db_request_key *request_key
-  );
+  ) override;
 };
 
 class spider_db_mysql: public spider_db_mbase
@@ -629,20 +625,20 @@ public:
     spider_db_mbase_util *spider_db_mbase_utility
   );
   virtual ~spider_mbase_share();
-  int init();
+  int init() override;
   uint get_column_name_length(
     uint field_index
-  );
+  ) override;
   int append_column_name(
     spider_string *str,
     uint field_index
-  );
+  ) override;
   int append_column_name_with_alias(
     spider_string *str,
     uint field_index,
     const char *alias,
     uint alias_length
-  );
+  ) override;
   int append_table_name(
     spider_string *str,
     int all_link_idx
@@ -655,13 +651,13 @@ public:
     spider_string *str,
     int *table_name_pos
   );
-  bool need_change_db_table_name();
+  bool need_change_db_table_name() override;
   int discover_table_structure(
     SPIDER_TRX *trx,
     SPIDER_SHARE *spider_share,
     spider_string *str
-  );
-  bool checksum_support();
+  ) override;
+  bool checksum_support() override;
 protected:
   int create_table_names_str();
   void free_table_names_str();
@@ -751,17 +747,17 @@ public:
     spider_db_mbase_util *spider_db_mbase_utility
   );
   virtual ~spider_mbase_handler();
-  int init();
+  int init() override;
   int append_index_hint(
     spider_string *str,
     int link_idx,
     ulong sql_type
-    );
+  ) override;
   int append_table_name_with_adjusting(
     spider_string *str,
     int link_idx,
     ulong sql_type
-  );
+  ) override;
   int append_key_column_types(
     const key_range *start_key,
     spider_string *str
@@ -774,8 +770,8 @@ public:
   );
   int append_tmp_table_and_sql_for_bka(
     const key_range *start_key
-  );
-  int reuse_tmp_table_and_sql_for_bka();
+  ) override;
+  int reuse_tmp_table_and_sql_for_bka() override;
   void create_tmp_bka_table_name(
     char *tmp_table_name,
     int *tmp_table_name_length,
@@ -806,61 +802,61 @@ public:
   );
   int append_union_table_and_sql_for_bka(
     const key_range *start_key
-  );
-  int reuse_union_table_and_sql_for_bka();
+  ) override;
+  int reuse_union_table_and_sql_for_bka() override;
   int append_insert_for_recovery(
     ulong sql_type,
     int link_idx
-  );
+  ) override;
   int append_update(
     const TABLE *table,
     my_ptrdiff_t ptr_diff
-  );
+  ) override;
   int append_update(
     const TABLE *table,
     my_ptrdiff_t ptr_diff,
     int link_idx
-  );
+  ) override;
   int append_delete(
     const TABLE *table,
     my_ptrdiff_t ptr_diff
-  );
+  ) override;
   int append_delete(
     const TABLE *table,
     my_ptrdiff_t ptr_diff,
     int link_idx
-  );
-  int append_insert_part();
+  ) override;
+  int append_insert_part() override;
   int append_insert(
     spider_string *str,
     int link_idx
   );
-  int append_update_part();
+  int append_update_part() override;
   int append_update(
     spider_string *str,
     int link_idx
   );
-  int append_delete_part();
+  int append_delete_part() override;
   int append_delete(
     spider_string *str
   );
-  int append_update_set_part();
+  int append_update_set_part() override;
   int append_update_set(
     spider_string *str
   );
-  int append_direct_update_set_part();
+  int append_direct_update_set_part() override;
   int append_direct_update_set(
     spider_string *str
   );
   int append_dup_update_pushdown_part(
     const char *alias,
     uint alias_length
-  );
+  ) override;
   int append_update_columns_part(
     const char *alias,
     uint alias_length
-  );
-  int check_update_columns_part();
+  ) override;
+  int check_update_columns_part() override;
   int append_update_columns(
     spider_string *str,
     const char *alias,
@@ -868,28 +864,28 @@ public:
   );
   int append_select_part(
     ulong sql_type
-  );
+  ) override;
   int append_select(
     spider_string *str,
     ulong sql_type
-  );
+  ) override;
   int append_table_select_part(
     ulong sql_type
-  );
+  ) override;
   int append_table_select(
     spider_string *str
   );
   int append_key_select_part(
     ulong sql_type,
     uint idx
-  );
+  ) override;
   int append_key_select(
     spider_string *str,
     uint idx
   );
   int append_minimum_select_part(
     ulong sql_type
-  );
+  ) override;
   int append_minimum_select(
     spider_string *str,
     ulong sql_type
@@ -917,47 +913,47 @@ public:
   );
   int append_hint_after_table_part(
     ulong sql_type
-  );
+  ) override;
   int append_hint_after_table(
     spider_string *str
   );
   void set_where_pos(
     ulong sql_type
-  );
+  ) override;
   void set_where_to_pos(
     ulong sql_type
-  );
+  ) override;
   int check_item_type(
     Item *item
-  );
+  ) override;
   int append_values_connector_part(
     ulong sql_type
-  );
+  ) override;
   int append_values_connector(
     spider_string *str
   );
   int append_values_terminator_part(
     ulong sql_type
-  );
+  ) override;
   int append_values_terminator(
     spider_string *str
   );
   int append_union_table_connector_part(
     ulong sql_type
-  );
+  ) override;
   int append_union_table_connector(
     spider_string *str
   );
   int append_union_table_terminator_part(
     ulong sql_type
-  );
+  ) override;
   int append_union_table_terminator(
     spider_string *str
   );
   int append_key_column_values_part(
     const key_range *start_key,
     ulong sql_type
-  );
+  ) override;
   int append_key_column_values(
     spider_string *str,
     const key_range *start_key
@@ -965,7 +961,7 @@ public:
   int append_key_column_values_with_name_part(
     const key_range *start_key,
     ulong sql_type
-  );
+  ) override;
   int append_key_column_values_with_name(
     spider_string *str,
     const key_range *start_key
@@ -974,7 +970,7 @@ public:
     const key_range *start_key,
     const key_range *end_key,
     ulong sql_type
-  );
+  ) override;
   int append_key_where(
     spider_string *str,
     spider_string *str_part,
@@ -991,7 +987,7 @@ public:
     const uchar **ptr,
     bool key_eq,
     bool tgt_final
-  );
+  ) override;
   int append_is_null(
     ulong sql_type,
     spider_string *str,
@@ -1007,7 +1003,7 @@ public:
     ulong sql_type,
     bool set_order,
     int key_count
-  );
+  ) override;
   int append_where_terminator(
     ulong sql_type,
     spider_string *str,
@@ -1018,7 +1014,7 @@ public:
   );
   int append_match_where_part(
     ulong sql_type
-  );
+  ) override;
   int append_match_where(
     spider_string *str
   );
@@ -1032,7 +1028,7 @@ public:
     uint alias_length,
     ulong sql_type,
     bool test_flg
-  );
+  ) override;
   int append_condition(
     spider_string *str,
     const char *alias,
@@ -1056,7 +1052,7 @@ public:
     ulong sql_type,
     const char *alias,
     uint alias_length
-  );
+  ) override;
   int append_match_select(
     spider_string *str,
     const char *alias,
@@ -1066,7 +1062,7 @@ public:
     ulong sql_type,
     const char *alias,
     uint alias_length
-  );
+  ) override;
   int append_sum_select(
     spider_string *str,
     const char *alias,
@@ -1074,15 +1070,13 @@ public:
   );
   void set_order_pos(
     ulong sql_type
-  );
-  void set_order_to_pos(
-    ulong sql_type
-  );
+  ) override;
+  void set_order_to_pos(ulong sql_type) override;
   int append_group_by_part(
     const char *alias,
     uint alias_length,
     ulong sql_type
-  );
+  ) override;
   int append_group_by(
     spider_string *str,
     const char *alias,
@@ -1092,7 +1086,7 @@ public:
     const char *alias,
     uint alias_length,
     ulong sql_type
-  );
+  ) override;
   int append_key_order_for_merge_with_alias(
     spider_string *str,
     const char *alias,
@@ -1102,7 +1096,7 @@ public:
     const char *alias,
     uint alias_length,
     ulong sql_type
-  );
+  ) override;
   int append_key_order_for_direct_order_limit_with_alias(
     spider_string *str,
     const char *alias,
@@ -1112,7 +1106,7 @@ public:
     const char *alias,
     uint alias_length,
     ulong sql_type
-  );
+  ) override;
   int append_key_order_for_handler(
     spider_string *str,
     const char *alias,
@@ -1127,12 +1121,12 @@ public:
     longlong offset,
     longlong limit,
     ulong sql_type
-  );
+  ) override;
   int reappend_limit_part(
     longlong offset,
     longlong limit,
     ulong sql_type
-  );
+  ) override;
   int append_limit(
     spider_string *str,
     longlong offset,
@@ -1140,25 +1134,25 @@ public:
   );
   int append_select_lock_part(
     ulong sql_type
-  );
+  ) override;
   int append_select_lock(
     spider_string *str
   );
   int append_union_all_start_part(
     ulong sql_type
-  );
+  ) override;
   int append_union_all_start(
     spider_string *str
   );
   int append_union_all_part(
     ulong sql_type
-  );
+  ) override;
   int append_union_all(
     spider_string *str
   );
   int append_union_all_end_part(
     ulong sql_type
-  );
+  ) override;
   int append_union_all_end(
     spider_string *str
   );
@@ -1166,7 +1160,7 @@ public:
     ulong sql_type,
     uint multi_range_cnt,
     bool with_comma
-  );
+  ) override;
   int append_multi_range_cnt(
     spider_string *str,
     uint multi_range_cnt,
@@ -1175,36 +1169,36 @@ public:
   int append_multi_range_cnt_with_name_part(
     ulong sql_type,
     uint multi_range_cnt
-  );
+  ) override;
   int append_multi_range_cnt_with_name(
     spider_string *str,
     uint multi_range_cnt
   );
   int append_insert_terminator_part(
     ulong sql_type
-  );
+  ) override;
   int append_insert_terminator(
     spider_string *str
   );
   int append_insert_values_part(
     ulong sql_type
-  );
+  ) override;
   int append_insert_values(
     spider_string *str
   );
   int append_into_part(
     ulong sql_type
-  );
+  ) override;
   int append_into(
     spider_string *str
   );
   void set_insert_to_pos(
     ulong sql_type
-  );
+  ) override;
   int append_from_part(
     ulong sql_type,
     int link_idx
-  );
+  ) override;
   int append_from(
     spider_string *str,
     ulong sql_type,
@@ -1250,7 +1244,7 @@ public:
   );
   int append_delete_all_rows_part(
     ulong sql_type
-  );
+  ) override;
   int append_delete_all_rows(
     spider_string *str,
     ulong sql_type
@@ -1265,7 +1259,7 @@ public:
     const key_range *end_key,
     ulong sql_type,
     int link_idx
-  );
+  ) override;
   int append_explain_select(
     spider_string *str,
     const key_range *start_key,
@@ -1275,32 +1269,32 @@ public:
   );
   bool is_sole_projection_field(
     uint16 field_index
-  );
+  ) override;
   bool is_bulk_insert_exec_period(
     bool bulk_end
-  );
+  ) override;
   bool sql_is_filled_up(
     ulong sql_type
-  );
+  ) override;
   bool sql_is_empty(
     ulong sql_type
-  );
-  bool support_multi_split_read();
-  bool support_bulk_update();
-  int bulk_tmp_table_insert();
+  ) override;
+  bool support_multi_split_read() override;
+  bool support_bulk_update() override;
+  int bulk_tmp_table_insert() override;
   int bulk_tmp_table_insert(
     int link_idx
-  );
-  int bulk_tmp_table_end_bulk_insert();
-  int bulk_tmp_table_rnd_init();
-  int bulk_tmp_table_rnd_next();
-  int bulk_tmp_table_rnd_end();
+  ) override;
+  int bulk_tmp_table_end_bulk_insert() override;
+  int bulk_tmp_table_rnd_init() override;
+  int bulk_tmp_table_rnd_next() override;
+  int bulk_tmp_table_rnd_end() override;
   bool need_copy_for_update(
     int link_idx
-  );
-  bool bulk_tmp_table_created();
-  int mk_bulk_tmp_table_and_bulk_start();
-  void rm_bulk_tmp_table();
+  ) override;
+  bool bulk_tmp_table_created() override;
+  int mk_bulk_tmp_table_and_bulk_start() override;
+  void rm_bulk_tmp_table() override;
   int store_sql_to_bulk_tmp_table(
     spider_string *str,
     TABLE *tmp_table
@@ -1312,140 +1306,126 @@ public:
   int insert_lock_tables_list(
     SPIDER_CONN *conn,
     int link_idx
-  );
+  ) override;
   int append_lock_tables_list(
     SPIDER_CONN *conn,
     int link_idx,
     int *appended
-  );
+  ) override;
   int realloc_sql(
     ulong *realloced
-  );
-  int reset_sql(
-    ulong sql_type
-  );
+  ) override;
+  int reset_sql(ulong sql_type) override;
   int set_sql_for_exec(
     ulong sql_type,
     int link_idx,
     SPIDER_LINK_IDX_CHAIN *link_idx_chain
-  );
+  ) override;
   int set_sql_for_exec(
     ulong sql_type,
     int link_idx
-  );
+  ) override;
   int set_sql_for_exec(
     spider_db_copy_table *tgt_ct,
     ulong sql_type
-  );
+  ) override;
   int execute_sql(
     ulong sql_type,
     SPIDER_CONN *conn,
     int quick_mode,
     int *need_mon
-  );
-  int reset();
+  ) override;
+  int reset() override;
   int sts_mode_exchange(
     int sts_mode
-  );
+  ) override;
   int show_table_status(
     int link_idx,
     int sts_mode,
     uint flag
-  );
-  int crd_mode_exchange(
-    int crd_mode
-  );
-  int show_index(
-    int link_idx,
-    int crd_mode
-  );
+  ) override;
+  int crd_mode_exchange(int crd_mode) override;
+  int show_index(int link_idx, int crd_mode) override;
   int simple_action(
     uint simple_action,
     int link_idx
   );
-  int show_records(
-    int link_idx
-  );
-  int checksum_table(
-    int link_idx
-  );
-  int show_last_insert_id(
-    int link_idx,
-    ulonglong &last_insert_id
-  );
+  int show_records(int link_idx) override;
+  int checksum_table(int link_idx) override;
+  int show_last_insert_id(int link_idx, ulonglong &last_insert_id) override;
   ha_rows explain_select(
     const key_range *start_key,
     const key_range *end_key,
     int link_idx
-  );
+  ) override;
   int lock_tables(
     int link_idx
-  );
+  ) override;
   int unlock_tables(
     int link_idx
-  );
+  ) override;
   int disable_keys(
     SPIDER_CONN *conn,
     int link_idx
-  );
+  ) override;
   int enable_keys(
     SPIDER_CONN *conn,
     int link_idx
-  );
+  ) override;
   int check_table(
     SPIDER_CONN *conn,
     int link_idx,
     HA_CHECK_OPT* check_opt
-  );
+  ) override;
   int repair_table(
     SPIDER_CONN *conn,
     int link_idx,
     HA_CHECK_OPT* check_opt
-  );
+  ) override;
   int analyze_table(
     SPIDER_CONN *conn,
     int link_idx
-  );
+  ) override;
   int optimize_table(
     SPIDER_CONN *conn,
     int link_idx
-  );
+  ) override;
   int flush_tables(
     SPIDER_CONN *conn,
     int link_idx,
     bool lock
-  );
+  ) override;
   int flush_logs(
     SPIDER_CONN *conn,
     int link_idx
-  );
+  ) override;
   int sync_from_clone_source(
     spider_db_handler *dbton_hdl
-  );
+  ) override;
   void minimum_select_bitmap_create();
   bool minimum_select_bit_is_set(
     uint field_index
-  );
+  ) override;
   void copy_minimum_select_bitmap(
     uchar *bitmap
-  );
-  int init_union_table_name_pos();
-  int set_union_table_name_pos();
+  ) override;
+  int init_union_table_name_pos() override;
+  int set_union_table_name_pos() override;
   int reset_union_table_name(
     spider_string *str,
     int link_idx,
     ulong sql_type
-  );
+  ) override;
   int append_from_and_tables_part(
     spider_fields *fields,
     ulong sql_type
-  );
+  ) override;
   int append_where_part(
     ulong sql_type
-  );
+  ) override;
   int append_having_part(
     ulong sql_type
-  );
+  ) override;
   int append_item_type_part(
     Item *item,
     const char *alias,
@@ -1453,7 +1433,7 @@ public:
     bool use_fields,
     spider_fields *fields,
     ulong sql_type
-  );
+  ) override;
   int append_list_item_select_part(
     List<Item> *select,
     const char *alias,
@@ -1461,7 +1441,7 @@ public:
     bool use_fields,
     spider_fields *fields,
     ulong sql_type
-  );
+  ) override;
   int append_list_item_select(
     List<Item> *select,
     spider_string *str,
@@ -1477,7 +1457,7 @@ public:
     bool use_fields,
     spider_fields *fields,
     ulong sql_type
-  );
+  ) override;
   int append_group_by(
     ORDER *order,
     spider_string *str,
@@ -1493,7 +1473,7 @@ public:
     bool use_fields,
     spider_fields *fields,
     ulong sql_type
-  );
+  ) override;
   int append_order_by(
     ORDER *order,
     spider_string *str,
@@ -1506,12 +1486,12 @@ public:
     st_select_lex *select_lex,
     longlong select_limit,
     longlong offset_limit
-  );
+  ) override;
   bool check_direct_delete(
     st_select_lex *select_lex,
     longlong select_limit,
     longlong offset_limit
-  );
+  ) override;
 };
 
 class spider_mysql_handler: public spider_mbase_handler
@@ -1544,49 +1524,49 @@ public:
     spider_mbase_share *db_share
   );
   virtual ~spider_mbase_copy_table();
-  int init();
+  int init() override;
   void set_sql_charset(
     CHARSET_INFO *cs
-  );
-  int append_select_str();
+  ) override;
+  int append_select_str() override;
   int append_insert_str(
     int insert_flg
-  );
+  ) override;
   int append_table_columns(
     TABLE_SHARE *table_share
-  );
-  int append_from_str();
+  ) override;
+  int append_from_str() override;
   int append_table_name(
     int link_idx
-  );
-  void set_sql_pos();
-  void set_sql_to_pos();
+  ) override;
+  void set_sql_pos() override;
+  void set_sql_to_pos() override;
   int append_copy_where(
     spider_db_copy_table *source_ct,
     KEY *key_info,
     ulong *last_row_pos,
     ulong *last_lengths
-  );
+  ) override;
   int append_key_order_str(
     KEY *key_info,
     int start_pos,
     bool desc_flg
-  );
+  ) override;
   int append_limit(
     longlong offset,
     longlong limit
-  );
-  int append_into_str();
-  int append_open_paren_str();
-  int append_values_str();
+  ) override;
+  int append_into_str() override;
+  int append_open_paren_str() override;
+  int append_values_str() override;
   int append_select_lock_str(
     int lock_mode
-  );
+  ) override;
   int exec_query(
     SPIDER_CONN *conn,
     int quick_mode,
     int *need_mon
-  );
+  ) override;
   int copy_key_row(
     spider_db_copy_table *source_ct,
     Field *field,
@@ -1604,15 +1584,15 @@ public:
     SPIDER_DB_ROW *row,
     ulong **last_row_pos,
     ulong **last_lengths
-  );
+  ) override;
   int copy_rows(
     TABLE *table,
     SPIDER_DB_ROW *row
-  );
-  int append_insert_terminator();
+  ) override;
+  int append_insert_terminator() override;
   int copy_insert_values(
     spider_db_copy_table *source_ct
-  );
+  ) override;
 };
 
 class spider_mysql_copy_table: public spider_mbase_copy_table
diff --git a/storage/spider/spd_direct_sql.cc b/storage/spider/spd_direct_sql.cc
index 6d0af8cc015..1a15ce0246a 100644
--- a/storage/spider/spd_direct_sql.cc
+++ b/storage/spider/spd_direct_sql.cc
@@ -1165,7 +1165,7 @@ int spider_udf_set_direct_sql_param_default(
     direct_sql->tgt_default_db_name_length = SPIDER_THD_db_length(trx->thd);
     if (
       !(direct_sql->tgt_default_db_name = spider_create_string(
-        SPIDER_THD_db_str(trx->thd),
+          trx->thd->get_db(),
         direct_sql->tgt_default_db_name_length))
     ) {
       my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
diff --git a/storage/spider/spd_group_by_handler.h b/storage/spider/spd_group_by_handler.h
index b8e85a3d417..094a094a298 100644
--- a/storage/spider/spd_group_by_handler.h
+++ b/storage/spider/spd_group_by_handler.h
@@ -31,9 +31,9 @@ public:
     spider_fields *fields_arg
   );
   ~spider_group_by_handler();
-  int init_scan();
-  int next_row();
-  int end_scan();
+  int init_scan() override;
+  int next_row() override;
+  int end_scan() override;
 };
 
 group_by_handler *spider_create_group_by_handler(
diff --git a/storage/test_sql_discovery/test_sql_discovery.cc b/storage/test_sql_discovery/test_sql_discovery.cc
index 0758d5f503f..0e009fca59b 100644
--- a/storage/test_sql_discovery/test_sql_discovery.cc
+++ b/storage/test_sql_discovery/test_sql_discovery.cc
@@ -48,7 +48,7 @@ public:
   {
     thr_lock_init(&lock);
   }
-  ~TSD_share()
+  ~TSD_share() override
   {
     thr_lock_delete(&lock);
   }
@@ -64,17 +64,17 @@ private:
 public:
   ha_tsd(handlerton *hton, TABLE_SHARE *table_arg)
     : handler(hton, table_arg) { }
-  ulonglong table_flags() const
+  ulonglong table_flags() const override
   { // NO_TRANSACTIONS and everything that affects CREATE TABLE
     return HA_NO_TRANSACTIONS | HA_CAN_GEOMETRY | HA_NULL_IN_KEY |
            HA_CAN_INDEX_BLOBS | HA_AUTO_PART_KEY | HA_CAN_RTREEKEYS |
            HA_CAN_FULLTEXT;
   }
 
-  ulong index_flags(uint inx, uint part, bool all_parts) const { return 0; }
+  ulong index_flags(uint inx, uint part, bool all_parts) const override { return 0; }
 
   THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
-                             enum thr_lock_type lock_type)
+                             enum thr_lock_type lock_type) override
   {
     if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)
       lock.type = lock_type;
@@ -82,17 +82,17 @@ public:
     return to;
   }
 
-  int rnd_init(bool scan) { return 0; }
-  int rnd_next(unsigned char *buf) { return HA_ERR_END_OF_FILE; }
-  void position(const uchar *record) { }
-  int rnd_pos(uchar *buf, uchar *pos) { return HA_ERR_END_OF_FILE; }
-  int info(uint flag) { return 0; }
-  uint max_supported_keys() const { return 16; }
+  int rnd_init(bool scan) override { return 0; }
+  int rnd_next(unsigned char *buf) override { return HA_ERR_END_OF_FILE; }
+  void position(const uchar *record) override { }
+  int rnd_pos(uchar *buf, uchar *pos) override { return HA_ERR_END_OF_FILE; }
+  int info(uint flag) override { return 0; }
+  uint max_supported_keys() const override { return 16; }
   int create(const char *name, TABLE *table_arg,
-             HA_CREATE_INFO *create_info) { return HA_ERR_WRONG_COMMAND; }
+             HA_CREATE_INFO *create_info) override { return HA_ERR_WRONG_COMMAND; }
 
-  int open(const char *name, int mode, uint test_if_locked);
-  int close(void);
+  int open(const char *name, int mode, uint test_if_locked) override;
+  int close(void) override;
 };
 
 TSD_share *ha_tsd::get_share()
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 79c8b9a8cca..e47a67f6880 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -80,7 +80,7 @@ PermissionsStartOnly=true
 # Do not panic if galera_recovery script is not available. (MDEV-10538)
 ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION"
 ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
- VAR=`cd @bindir@/..; @bindir@/galera_recovery`; [ $? -eq 0 ] \
+ VAR=`@bindir@/galera_recovery`; [ $? -eq 0 ] \
  && systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1"
 
 # Needed to create system tables etc.
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 20ceea8c5d5..c2f0406f3fc 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -21873,6 +21873,103 @@ static void test_mdev19838()
   rc = mysql_query(mysql, "drop table mdev19838");
   myquery(rc);
 }
+
+static void test_mdev_24411()
+{
+  int        rc;
+  MYSQL_STMT *stmt;
+  MYSQL_BIND bind;
+  MYSQL_RES *result;
+  MYSQL_ROW row;
+  my_ulonglong row_count;
+  unsigned int vals[] = { 1, 2, 3};
+  unsigned int vals_array_len = 3;
+  const char *insert_stmt= "INSERT INTO t1 VALUES (?)";
+
+  myheader("test_mdev_24411");
+
+  rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "DROP TABLE IF EXISTS t2");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "CREATE TABLE t1 (a INT)");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "CREATE TABLE t2 (a INT)");
+  myquery(rc);
+
+  rc= mysql_query(mysql,
+  "CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW "
+  "BEGIN INSERT INTO t2 (a) VALUES (NEW.a); END;");
+  myquery(rc);
+
+  stmt= mysql_stmt_init(mysql);
+  check_stmt(stmt);
+
+  rc= mysql_stmt_prepare(stmt, insert_stmt, strlen(insert_stmt));
+  check_execute(stmt, rc);
+
+  memset(&bind, 0, sizeof(bind));
+  bind.buffer_type= MYSQL_TYPE_LONG;
+  bind.buffer= vals;
+
+  rc= mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &vals_array_len);
+  check_execute(stmt, rc);
+
+  rc= mysql_stmt_bind_param(stmt, &bind);
+  check_execute(stmt, rc);
+
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+
+  /*
+    It's expected that the INSERT statement adds three rows into
+    the table t1
+  */
+  row_count = mysql_stmt_affected_rows(stmt);
+  DIE_UNLESS(row_count == 3);
+
+  /*
+   * Check that the BEFORE INSERT trigger of the table t1 does work correct
+   * and inserted the rows (1), (2), (3) into the table t2.
+  */
+  rc= mysql_query(mysql, "SELECT 't1' tname, a FROM t1 "
+                  "UNION SELECT 't2' tname, a FROM t2 ORDER BY tname,a");
+  myquery(rc);
+
+  result= mysql_store_result(mysql);
+
+  row = mysql_fetch_row(result);
+  DIE_UNLESS(strcmp(row[0], "t1") == 0 && atoi(row[1]) == 1);
+
+  row = mysql_fetch_row(result);
+  DIE_UNLESS(strcmp(row[0], "t1") == 0 && atoi(row[1]) == 2);
+
+  row = mysql_fetch_row(result);
+  DIE_UNLESS(strcmp(row[0], "t1") == 0 && atoi(row[1]) == 3);
+
+  row = mysql_fetch_row(result);
+  DIE_UNLESS(strcmp(row[0], "t2") == 0 && atoi(row[1]) == 1);
+
+  row = mysql_fetch_row(result);
+  DIE_UNLESS(strcmp(row[0], "t2") == 0 && atoi(row[1]) == 2);
+
+  row = mysql_fetch_row(result);
+  DIE_UNLESS(strcmp(row[0], "t2") == 0 && atoi(row[1]) == 3);
+
+  row= mysql_fetch_row(result);
+  DIE_UNLESS(row == NULL);
+
+  mysql_free_result(result);
+
+  mysql_stmt_close(stmt);
+
+  rc= mysql_query(mysql, "DROP TABLE t1, t2");
+  myquery(rc);
+}
+
 #endif // EMBEDDED_LIBRARY
 
 
@@ -22531,6 +22628,9 @@ static struct my_tests_st my_tests[]= {
   { "test_connect_autocommit", test_connect_autocommit},
   { "test_execute_direct", test_execute_direct },
   { "test_cache_metadata", test_cache_metadata},
+#ifndef EMBEDDED_LIBRARY
+  { "test_mdev_24411", test_mdev_24411},
+#endif
   { "test_mdev_10075", test_mdev_10075},
   { 0, 0 }
 };
diff --git a/tpool/CMakeLists.txt b/tpool/CMakeLists.txt
index 115e3d58634..cf35633b090 100644
--- a/tpool/CMakeLists.txt
+++ b/tpool/CMakeLists.txt
@@ -7,7 +7,7 @@ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   IF(WITH_URING)
     SET(URING_REQUIRED REQUIRED)
   ELSEIF(WITH_LIBAIO)
-    SET(LIBAIO_REQIRED REQUIRED)
+    SET(LIBAIO_REQUIRED REQUIRED)
   ENDIF()
   FIND_PACKAGE(URING QUIET ${URING_REQUIRED})
   IF(URING_FOUND)
diff --git a/tpool/aio_simulated.cc b/tpool/aio_simulated.cc
index 4bc58c2930c..4167b8cdd1a 100644
--- a/tpool/aio_simulated.cc
+++ b/tpool/aio_simulated.cc
@@ -142,7 +142,7 @@ public:
     pool->submit_task(&cb->m_internal_task);
   }
 
-  virtual int submit_io(aiocb *aiocb) override
+  int submit_io(aiocb *aiocb) override
   {
     aiocb->m_internal_task.m_func = simulated_aio_callback;
     aiocb->m_internal_task.m_arg = aiocb;
@@ -152,8 +152,8 @@ public:
     return 0;
   }
 
-  virtual int bind(native_file_handle &fd) override { return 0; }
-  virtual int unbind(const native_file_handle &fd) override { return 0; }
+  int bind(native_file_handle &fd) override { return 0; }
+  int unbind(const native_file_handle &fd) override { return 0; }
 };
 
 aio *create_simulated_aio(thread_pool *tp)
diff --git a/tpool/aio_win.cc b/tpool/aio_win.cc
index b44f705bd1e..eec37383152 100644
--- a/tpool/aio_win.cc
+++ b/tpool/aio_win.cc
@@ -102,7 +102,7 @@ public:
     m_thread.join();
   }
 
-  virtual int submit_io(aiocb* cb) override
+  int submit_io(aiocb* cb) override
   {
     memset((OVERLAPPED *)cb, 0, sizeof(OVERLAPPED));
     cb->m_internal = this;
@@ -123,12 +123,12 @@ public:
   }
 
   // Inherited via aio
-  virtual int bind(native_file_handle& fd) override
+  int bind(native_file_handle& fd) override
   {
     return CreateIoCompletionPort(fd, m_completion_port, 0, 0) ? 0
       : GetLastError();
   }
-  virtual int unbind(const native_file_handle& fd) override { return 0; }
+  int unbind(const native_file_handle& fd) override { return 0; }
 };
 
 aio* create_win_aio(thread_pool* pool, int max_io)
diff --git a/tpool/tpool_generic.cc b/tpool/tpool_generic.cc
index 774576d5cde..9ed832dd1ed 100644
--- a/tpool/tpool_generic.cc
+++ b/tpool/tpool_generic.cc
@@ -304,11 +304,11 @@ class thread_pool_generic : public thread_pool
   }
 public:
   thread_pool_generic(int min_threads, int max_threads);
-  ~thread_pool_generic();
+  ~thread_pool_generic() override;
   void wait_begin() override;
   void wait_end() override;
   void submit_task(task *task) override;
-  virtual aio *create_native_aio(int max_io) override
+  aio *create_native_aio(int max_io) override
   {
 #ifdef _WIN32
     return create_win_aio(this, max_io);
@@ -436,13 +436,13 @@ public:
       m_task.wait();
     }
 
-    virtual ~timer_generic()
+    ~timer_generic() override
     {
       disarm();
     }
   };
   timer_generic m_maintenance_timer;
-  virtual timer* create_timer(callback_func func, void *data) override
+  timer* create_timer(callback_func func, void *data) override
   {
     return new timer_generic(func, data, this);
   }
diff --git a/tpool/tpool_win.cc b/tpool/tpool_win.cc
index 88168b26eff..4e119332dd1 100644
--- a/tpool/tpool_win.cc
+++ b/tpool/tpool_win.cc
@@ -143,7 +143,7 @@ class thread_pool_win : public thread_pool
     /**
      Submit async IO.
     */
-    virtual int submit_io(aiocb* cb) override
+    int submit_io(aiocb* cb) override
     {
       memset((OVERLAPPED *)cb, 0, sizeof(OVERLAPPED));
 
@@ -191,7 +191,7 @@ class thread_pool_win : public thread_pool
     /**
       Binds the file handle via CreateThreadpoolIo().
     */
-    virtual int bind(native_file_handle& fd) override
+    int bind(native_file_handle& fd) override
     {
       fd.m_ptp_io =
         CreateThreadpoolIo(fd.m_handle, io_completion_callback, 0, &(m_pool.m_env));
@@ -203,7 +203,7 @@ class thread_pool_win : public thread_pool
     /**
       Unbind the file handle via CloseThreadpoolIo.
     */
-    virtual int unbind(const native_file_handle& fd) override
+    int unbind(const native_file_handle& fd) override
     {
       if (fd.m_ptp_io)
         CloseThreadpoolIo(fd.m_ptp_io);
@@ -261,7 +261,7 @@ public:
 
     task->execute();
   }
-  virtual void submit_task(task *task) override
+  void submit_task(task *task) override
   {
     auto entry= m_task_cache.get();
     task->add_ref();
diff --git a/unittest/sql/my_apc-t.cc b/unittest/sql/my_apc-t.cc
index 9edb209b1f6..e3f8293ffcb 100644
--- a/unittest/sql/my_apc-t.cc
+++ b/unittest/sql/my_apc-t.cc
@@ -123,7 +123,7 @@ public:
   int *where_to;  // Where to write it
   Apc_order(int a, int *b) : value(a), where_to(b) {}
 
-  void call_in_target_thread()
+  void call_in_target_thread() override
   {
     my_sleep(int_rand(1000));
     *where_to = value;