Merge 11.4 into 11.8

Author: dr-m

.github/workflows/windows-arm64.yml

@@ -48,4 +48,10 @@ jobs:
           $env:PATH = "C:\Strawberry\perl\bin;$env:PATH;C:\Program Files (x86)\Windows Kits\10\Debuggers\arm64"
           #Calculate parallel as 4 * number of processors
           $parallel = 4 * [int]$env:NUMBER_OF_PROCESSORS
-          perl bld\mysql-test\mysql-test-run.pl --force --parallel=$parallel --suite=main  --mysqld=--loose-innodb-flush-log-at-trx-commit=2
+          # create case-sensitive directory to run tests in
+          $tmp = (Get-Item $env:TEMP).FullName
+          $tmp = $tmp -replace '\\','/'
+          $cidir = "$tmp/ci"
+          mkdir $cidir
+          fsutil file setCaseSensitiveInfo $cidir enable
+          perl bld\mysql-test\mysql-test-run.pl --force --parallel=$parallel --suite=main,innodb --vardir=$cidir/var --mysqld=--lower-case-table-names=0  --mysqld=--loose-innodb-flush-log-at-trx-commit=2

mysql-test/main/foreign_key_lowercase0.result

@@ -0,0 +1,21 @@
+CREATE TABLE `FAMILY_PARENT` (
+`PARENT_ID` char(36) NOT NULL,
+`PARENT_NAME` varchar(200) NOT NULL,
+PRIMARY KEY (`PARENT_ID`)
+) ENGINE=InnoDB  CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+CREATE TABLE `FAMILY_CHILD` (
+`PARENT_ID` char(36) NOT NULL,
+`CHILD_NAME` varchar(200) NOT NULL,
+PRIMARY KEY (`PARENT_ID`,`CHILD_NAME`),
+CONSTRAINT `CHILD_FK` FOREIGN KEY (`PARENT_ID`) REFERENCES `FAMILY_PARENT` (`PARENT_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+SHOW CREATE TABLE FAMILY_CHILD;
+Table	Create Table
+FAMILY_CHILD	CREATE TABLE `FAMILY_CHILD` (
+  `PARENT_ID` char(36) NOT NULL,
+  `CHILD_NAME` varchar(200) NOT NULL,
+  PRIMARY KEY (`PARENT_ID`,`CHILD_NAME`),
+  CONSTRAINT `CHILD_FK` FOREIGN KEY (`PARENT_ID`) REFERENCES `FAMILY_PARENT` (`PARENT_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
+DROP TABLE FAMILY_CHILD;
+DROP TABLE FAMILY_PARENT;

mysql-test/main/foreign_key_lowercase0.test

@@ -0,0 +1,22 @@
+# echo MDEV-34953 tablename of CONSTRAINT FOREIGN KEY REFERENCES
+--source include/have_lowercase0.inc
+--source include/have_innodb.inc
+CREATE TABLE `FAMILY_PARENT` (
+  `PARENT_ID` char(36) NOT NULL,
+  `PARENT_NAME` varchar(200) NOT NULL,
+  PRIMARY KEY (`PARENT_ID`)
+) ENGINE=InnoDB  CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `FAMILY_CHILD` (
+  `PARENT_ID` char(36) NOT NULL,
+  `CHILD_NAME` varchar(200) NOT NULL,
+  PRIMARY KEY (`PARENT_ID`,`CHILD_NAME`),
+  CONSTRAINT `CHILD_FK` FOREIGN KEY (`PARENT_ID`) REFERENCES `FAMILY_PARENT` (`PARENT_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+# check that foreign key constraint name
+SHOW CREATE TABLE FAMILY_CHILD;
+
+DROP TABLE FAMILY_CHILD;
+DROP TABLE FAMILY_PARENT;
+

mysql-test/main/grant_lowercase.test

@@ -1,5 +1,6 @@
 # test cases for strmov(tmp_db, db) -> strnmov replacement in sql_acl.cc
 --source include/not_embedded.inc
+--source include/have_lowercase1.inc
 
 #
 # http://seclists.org/fulldisclosure/2012/Dec/4

mysql-test/main/grant_repair.result

@@ -88,15 +88,6 @@ create role r1;
 drop role r1;
 rename table mysql.roles_mapping_bak to mysql.roles_mapping;
 #
-# MDEV-35622 SEGV, ASAN use-after-poison when reading system table with less than expected number of columns
-#
-call mtr.add_suppression("mysql.servers");
-alter table mysql.servers drop column owner;
-insert into mysql.servers values(0,0,0,0,0,0,0,0,0);
-flush privileges;
-ERROR HY000: Cannot load from mysql.servers. The table is probably corrupted
-alter table mysql.servers add column Owner varchar(512) not null default '';
-#
 # MDEV-28482 SIGSEGV in get_access_value_from_val_int
 #
 create temporary table t1 select * from mysql.tables_priv;

mysql-test/main/grant_repair.test

@@ -104,16 +104,6 @@ create role r1;
 drop role r1;
 rename table mysql.roles_mapping_bak to mysql.roles_mapping;
 
---echo #
---echo # MDEV-35622 SEGV, ASAN use-after-poison when reading system table with less than expected number of columns
---echo #
-call mtr.add_suppression("mysql.servers");
-alter table mysql.servers drop column owner;
-insert into mysql.servers values(0,0,0,0,0,0,0,0,0);
---error ER_CANNOT_LOAD_FROM_TABLE_V2
-flush privileges;
-alter table mysql.servers add column Owner varchar(512) not null default '';
-
 --echo #
 --echo # MDEV-28482 SIGSEGV in get_access_value_from_val_int
 --echo #

mysql-test/main/lowercase_fs_off.test

@@ -3,6 +3,7 @@
 # i.e. lower_case_filesystem=OFF
 #
 -- source include/have_case_sensitive_file_system.inc
+-- source include/have_lowercase0.inc
 -- source include/not_embedded.inc
 -- source include/have_perfschema.inc
 

mysql-test/main/lowercase_table.test

@@ -1,3 +1,4 @@
+--source include/have_lowercase1.inc
 #
 # Test of --lower-case-table-names
 #

mysql-test/main/lowercase_table_grant.test

@@ -1,5 +1,6 @@
 # Don't test with embedded server
 -- source include/not_embedded.inc
+-- source include/have_lowercase1.inc
 
 # Test of grants when lower_case_table_names is on
 use mysql;

mysql-test/main/lowercase_table_qcache.test

@@ -2,6 +2,7 @@
 #
 # Test of query cache with --lower-case-table-names
 #
+-- source include/have_lowercase1.inc
 -- source include/no_view_protocol.inc
 
 set @save_query_cache_size=@@query_cache_size;