Collection of fixes for macOS

configure.cmake

@@ -590,6 +590,8 @@ CHECK_C_SOURCE_COMPILES("
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+/* macOS declares select() here and nowhere else that this test includes */
+#include <sys/select.h>
 #endif
 int main()
 {

mysql-test/include/have_sparse_files.inc

@@ -0,0 +1,55 @@
+# Skip the test unless the filesystem holding $sparse_file_dir stores files
+# with holes.  The caller sets $sparse_file_dir to a directory on the
+# filesystem where it builds its own sparse file, because vardir and datadir 
+# can be on different filesystems.
+#
+# A test that builds a large file by seeking past its end and writing a
+# single byte relies on the skipped range staying unallocated.  HFS on
+# macOS allocates every block of that range, so the file consumes its full
+# apparent size and the write fails with ENOSPC once the range exceeds the
+# free space on the volume.
+#
+# The probe writes one byte 64MB past the start of an empty file and compares
+# the allocated block count against that offset.  A filesystem that leaves a
+# hole allocates only the block holding the byte.  The offset has to stay well
+# above 16MB, since APFS fills the range of a file smaller than that rather
+# than recording a hole.
+
+if (!$sparse_file_dir)
+{
+  --die have_sparse_files.inc requires the caller to set sparse_file_dir
+}
+# The probe cannot tell a directory it may not write from a filesystem
+# without holes, thus a missing directory ends the test rather than skipping
+# it.
+--file_exists $sparse_file_dir
+# mysqltest keeps variables in a case insensitive hash and exports a value
+# under whichever spelling created the entry, so the exported name has to
+# differ from $sparse_file_dir by more than case.
+--let SPARSE_PROBE_DIR= $sparse_file_dir
+
+--error 0,1
+perl;
+use strict;
+use warnings;
+
+my $probe= "$ENV{SPARSE_PROBE_DIR}/sparse_probe";
+my $offset= 64 * 1024 * 1024;
+my $sparse= 0;
+
+if (open(my $fh, '>', $probe))
+{
+  binmode $fh;
+  if (seek($fh, $offset, 0) and print($fh chr(0)) and close($fh))
+  {
+    my $blocks= (stat $probe)[12];
+    $sparse= 1 if defined($blocks) and $blocks * 512 < $offset;
+  }
+}
+unlink $probe;
+exit($sparse ? 0 : 1);
+EOF
+if ($errno)
+{
+  --skip Requires a filesystem that stores files with holes
+}

mysql-test/include/not_mac.inc

@@ -0,0 +1,4 @@
+#
+# suite.pm will make sure that all tests including this file
+# will be skipped if run under macOS
+#

mysql-test/main/lowercase_routines.opt

@@ -0,0 +1 @@
+--lower-case-table-names=2

mysql-test/main/lowercase_routines.result

@@ -0,0 +1,46 @@
+#
+# MDEV-33616 Routines of a mixed case database are not listed when
+# lower_case_table_names is 2
+#
+CREATE DATABASE Db1;
+USE Db1;
+CREATE FUNCTION f1(a INT) RETURNS INT RETURN a;
+CREATE PROCEDURE p1(b INT) BEGIN END;
+SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='Db1';
+SCHEMA_NAME
+Db1
+SELECT db, name FROM mysql.proc WHERE name IN ('f1','p1');
+db	name
+db1	f1
+db1	p1
+SELECT ROUTINE_NAME FROM information_schema.ROUTINES
+WHERE ROUTINE_SCHEMA='Db1';
+ROUTINE_NAME
+f1
+p1
+SELECT SPECIFIC_NAME, ORDINAL_POSITION, PARAMETER_NAME
+FROM information_schema.PARAMETERS WHERE SPECIFIC_SCHEMA='Db1';
+SPECIFIC_NAME	ORDINAL_POSITION	PARAMETER_NAME
+f1	0	NULL
+f1	1	a
+p1	1	b
+SHOW FUNCTION STATUS WHERE Db='Db1';
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db1	f1	FUNCTION	root@localhost	#	#	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
+SHOW PROCEDURE STATUS WHERE Db='Db1';
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db1	p1	PROCEDURE	root@localhost	#	#	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
+SELECT ROUTINE_NAME FROM information_schema.ROUTINES
+WHERE ROUTINE_SCHEMA='Db1' ORDER BY ROUTINE_NAME;
+ROUTINE_NAME
+f1
+p1
+SELECT SPECIFIC_NAME, ORDINAL_POSITION, PARAMETER_NAME
+FROM information_schema.PARAMETERS WHERE SPECIFIC_SCHEMA='Db1'
+ ORDER BY SPECIFIC_NAME, ORDINAL_POSITION;
+SPECIFIC_NAME	ORDINAL_POSITION	PARAMETER_NAME
+f1	0	NULL
+f1	1	a
+p1	1	b
+USE test;
+DROP DATABASE Db1;

mysql-test/main/lowercase_routines.test

@@ -0,0 +1,47 @@
+#
+# Tests that require lower_case_table_names to be 2
+# (the default when the data directory is on a case insensitive file system)
+#
+--source include/have_lowercase2.inc
+
+--echo #
+--echo # MDEV-33616 Routines of a mixed case database are not listed when
+--echo # lower_case_table_names is 2
+--echo #
+
+CREATE DATABASE Db1;
+USE Db1;
+CREATE FUNCTION f1(a INT) RETURNS INT RETURN a;
+CREATE PROCEDURE p1(b INT) BEGIN END;
+
+# The database keeps the case it was created with, mysql.proc does not.
+SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='Db1';
+--sorted_result
+SELECT db, name FROM mysql.proc WHERE name IN ('f1','p1');
+
+# The name from the WHERE clause becomes the key of an index read on
+# mysql.proc.  mysql.proc.db is utf8mb3_bin and holds the folded name, so
+# an unfolded key finds nothing.
+--sorted_result
+SELECT ROUTINE_NAME FROM information_schema.ROUTINES
+ WHERE ROUTINE_SCHEMA='Db1';
+--sorted_result
+SELECT SPECIFIC_NAME, ORDINAL_POSITION, PARAMETER_NAME
+ FROM information_schema.PARAMETERS WHERE SPECIFIC_SCHEMA='Db1';
+--replace_column 5 # 6 #
+SHOW FUNCTION STATUS WHERE Db='Db1';
+--replace_column 5 # 6 #
+SHOW PROCEDURE STATUS WHERE Db='Db1';
+
+# ORDER BY keeps the condition from reaching the routine that fills the
+# table, so mysql.proc is read in full and the WHERE is applied afterwards
+# over a utf8mb3_general_ci column.  That shape returned the rows even
+# while the queries above returned none.
+SELECT ROUTINE_NAME FROM information_schema.ROUTINES
+ WHERE ROUTINE_SCHEMA='Db1' ORDER BY ROUTINE_NAME;
+SELECT SPECIFIC_NAME, ORDINAL_POSITION, PARAMETER_NAME
+ FROM information_schema.PARAMETERS WHERE SPECIFIC_SCHEMA='Db1'
+ ORDER BY SPECIFIC_NAME, ORDINAL_POSITION;
+
+USE test;
+DROP DATABASE Db1;

mysql-test/main/lowercase_routines0.result

@@ -0,0 +1,46 @@
+#
+# MDEV-33616 A statement cannot reference two routines whose databases
+# differ only in case
+#
+CREATE DATABASE Db1;
+CREATE DATABASE db1;
+CREATE FUNCTION Db1.f1() RETURNS INT RETURN 1;
+CREATE FUNCTION db1.f1() RETURNS INT RETURN 2;
+CREATE PROCEDURE test.p1() SELECT Db1.f1(), db1.f1();
+SELECT Db1.f1();
+Db1.f1()
+1
+SELECT db1.f1();
+db1.f1()
+2
+connect  con1,localhost,root,,test;
+SELECT Db1.f1(), db1.f1();
+Db1.f1()	db1.f1()
+1	2
+disconnect con1;
+connect  con2,localhost,root,,test;
+SELECT db1.f1(), Db1.f1();
+db1.f1()	Db1.f1()
+2	1
+disconnect con2;
+connect  con3,localhost,root,,test;
+CALL test.p1();
+Db1.f1()	db1.f1()
+1	2
+disconnect con3;
+connect  con4,localhost,root,,test;
+SELECT db1.f1();
+db1.f1()
+2
+connection default;
+DROP FUNCTION db1.f1;
+CREATE FUNCTION db1.f1() RETURNS INT RETURN 99;
+connection con4;
+SELECT Db1.f1(), db1.f1();
+Db1.f1()	db1.f1()
+1	99
+disconnect con4;
+connection default;
+DROP PROCEDURE test.p1;
+DROP DATABASE Db1;
+DROP DATABASE db1;

mysql-test/main/lowercase_routines0.test

@@ -0,0 +1,65 @@
+#
+# Tests that require lower_case_table_names to be 0
+# (the default when the data directory is on a case sensitive file system)
+#
+--source include/have_lowercase0.inc
+--source include/have_case_sensitive_file_system.inc
+
+--echo #
+--echo # MDEV-33616 A statement cannot reference two routines whose databases
+--echo # differ only in case
+--echo #
+
+CREATE DATABASE Db1;
+CREATE DATABASE db1;
+CREATE FUNCTION Db1.f1() RETURNS INT RETURN 1;
+CREATE FUNCTION db1.f1() RETURNS INT RETURN 2;
+CREATE PROCEDURE test.p1() SELECT Db1.f1(), db1.f1();
+
+SELECT Db1.f1();
+SELECT db1.f1();
+
+# Every routine a statement names joins one set, keyed by the database and
+# the routine name.  The database name is case sensitive here, so the two
+# routines have to stay apart and each reference has to reach its own.  A
+# connection that already holds one of them in its routine cache resolves
+# both either way, so every check below starts from a connection that holds
+# neither.
+connect (con1,localhost,root,,test);
+# A view compares its column names without regard to case, so under the
+# view protocol the second column of a query like this one is given a
+# generated name.
+--disable_view_protocol
+SELECT Db1.f1(), db1.f1();
+--enable_view_protocol
+disconnect con1;
+
+connect (con2,localhost,root,,test);
+--disable_view_protocol
+SELECT db1.f1(), Db1.f1();
+--enable_view_protocol
+disconnect con2;
+
+# A statement inside a routine body builds the same set.
+connect (con3,localhost,root,,test);
+CALL test.p1();
+disconnect con3;
+
+# A routine missing from the set is neither locked nor checked against the
+# version of the routine cache, so it could execute a definition that
+# another connection had already replaced.
+connect (con4,localhost,root,,test);
+SELECT db1.f1();
+connection default;
+DROP FUNCTION db1.f1;
+CREATE FUNCTION db1.f1() RETURNS INT RETURN 99;
+connection con4;
+--disable_view_protocol
+SELECT Db1.f1(), db1.f1();
+--enable_view_protocol
+disconnect con4;
+connection default;
+
+DROP PROCEDURE test.p1;
+DROP DATABASE Db1;
+DROP DATABASE db1;

mysql-test/suite.pm

@@ -49,6 +49,7 @@ sub skip_combinations {
 
   $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
   $skip{'include/not_aix.inc'} = 'Requires not AIX' if IS_AIX;
+  $skip{'include/not_mac.inc'} = 'Requires not macOS' if IS_MAC;
   $skip{'include/not_ssl.inc'} = 'Skipped if --ssl' if $::opt_ssl;
 
   $skip{'main/plugin_loaderr.test'} = 'needs compiled-in innodb'

mysql-test/suite/atomic/drop_db_long_names.result

@@ -1,11 +1,11 @@
 RESET MASTER;
 "engine: aria  crash point: ddl_log_drop_after_drop_tables  position: 1"
-master-bin.000002	#	Query	#	#	use `test2`; DROP TABLE IF EXISTS `tABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB`,`tACCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC`,`tADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD`,`tAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE`,`tAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF`,`tAGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG`,`tAHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH`,`tAIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII`,`tAJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ`,`tAKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK`,`tALLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL` /* generated by ddl recovery */
-master-bin.000002	#	Query	#	#	use `test2`; DROP VIEW IF EXISTS `tABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBv`,`tACCCCCCCCCCCCCCCCCCCCCCCCCCCCCCv`,`tADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDv`,`tAEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEv`,`tAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFv`,`tAGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGv`,`tAHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHv`,`tAIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIv`,`tAJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJv`,`tAKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKv` /* generated by ddl recovery */
-master-bin.000002	#	Query	#	#	use `test2`; DROP TABLE IF EXISTS `tAMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM`,`tANNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN`,`tAOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO`,`tAPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP`,`tAQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ`,`tARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR`,`tASSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS`,`tATTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT`,`tAUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU`,`tAVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV`,`tAWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW` /* generated by ddl recovery */
-master-bin.000002	#	Query	#	#	use `test2`; DROP VIEW IF EXISTS `tALLLLLLLLLLLLLLLLLLLLLLLLLLLLLLv`,`tAMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMv`,`tANNNNNNNNNNNNNNNNNNNNNNNNNNNNNNv`,`tAOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOv`,`tAPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPv`,`tAQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQv`,`tARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRv`,`tASSSSSSSSSSSSSSSSSSSSSSSSSSSSSSv`,`tATTTTTTTTTTTTTTTTTTTTTTTTTTTTTTv`,`tAUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUv`,`tAVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVv` /* generated by ddl recovery */
-master-bin.000002	#	Query	#	#	use `test2`; DROP TABLE IF EXISTS `tAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX`,`tAYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY`,`tAZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ`,`tBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA`,`tBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB`,`tBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC`,`tBDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD`,`tBEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE` /* generated by ddl recovery */
-master-bin.000002	#	Query	#	#	use `test2`; DROP VIEW IF EXISTS `tAWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWv`,`tAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXv`,`tAYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYv`,`tAZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZv`,`tBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv`,`tBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBv`,`tBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCv`,`tBDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDv`,`tBEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEv` /* generated by ddl recovery */
+master-bin.000002	#	Query	#	#	use `test2`; DROP TABLE IF EXISTS `tabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb`,`tacccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc`,`tadddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd`,`taeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee`,`taffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff`,`tagggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg`,`tahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh`,`taiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii`,`tajjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj`,`takkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk`,`tallllllllllllllllllllllllllllllllllllllllllllllllllllllllllll` /* generated by ddl recovery */
+master-bin.000002	#	Query	#	#	use `test2`; DROP VIEW IF EXISTS `tabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbv`,`taccccccccccccccccccccccccccccccv`,`taddddddddddddddddddddddddddddddv`,`taeeeeeeeeeeeeeeeeeeeeeeeeeeeeeev`,`taffffffffffffffffffffffffffffffv`,`taggggggggggggggggggggggggggggggv`,`tahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhv`,`taiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiv`,`tajjjjjjjjjjjjjjjjjjjjjjjjjjjjjjv`,`takkkkkkkkkkkkkkkkkkkkkkkkkkkkkkv` /* generated by ddl recovery */
+master-bin.000002	#	Query	#	#	use `test2`; DROP TABLE IF EXISTS `tammmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm`,`tannnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn`,`taoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo`,`tapppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp`,`taqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq`,`tarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr`,`tassssssssssssssssssssssssssssssssssssssssssssssssssssssssssss`,`tatttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt`,`tauuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu`,`tavvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv`,`tawwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww` /* generated by ddl recovery */
+master-bin.000002	#	Query	#	#	use `test2`; DROP VIEW IF EXISTS `tallllllllllllllllllllllllllllllv`,`tammmmmmmmmmmmmmmmmmmmmmmmmmmmmmv`,`tannnnnnnnnnnnnnnnnnnnnnnnnnnnnnv`,`taoooooooooooooooooooooooooooooov`,`tappppppppppppppppppppppppppppppv`,`taqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqv`,`tarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrv`,`tassssssssssssssssssssssssssssssv`,`tattttttttttttttttttttttttttttttv`,`tauuuuuuuuuuuuuuuuuuuuuuuuuuuuuuv`,`tavvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv`,`tawwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv` /* generated by ddl recovery */
+master-bin.000002	#	Query	#	#	use `test2`; DROP TABLE IF EXISTS `taxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`,`tayyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy`,`tazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz`,`tbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`,`tbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb`,`tbcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc`,`tbdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd`,`tbeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee` /* generated by ddl recovery */
+master-bin.000002	#	Query	#	#	use `test2`; DROP VIEW IF EXISTS `taxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxv`,`tayyyyyyyyyyyyyyyyyyyyyyyyyyyyyyv`,`tazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzv`,`tbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaav`,`tbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbv`,`tbccccccccccccccccccccccccccccccv`,`tbddddddddddddddddddddddddddddddv`,`tbeeeeeeeeeeeeeeeeeeeeeeeeeeeeeev` /* generated by ddl recovery */
 "engine: aria  crash point: ddl_log_drop_before_binlog  position: 1"
 master-bin.000002	#	Query	#	#	DROP DATABASE IF EXISTS `test2` /* generated by ddl recovery */
 Warnings:

mysql-test/suite/atomic/drop_db_long_names.test

@@ -58,8 +58,10 @@ while ($e < $engine_count)
       while ($t < $max_tables)
       {
         inc $t;
-        let $name=`select concat("t",char(floor(65+$t/26)),repeat(char(65+mod($t,26)),60))`;
-        let $view=`select concat("t",char(floor(65+$t/26)),repeat(char(65+mod($t,26)),30),'v')`;
+        # Generate the names in lower case so that they are unchanged by a
+        # lower_case_table_names setting of 1 or 2.
+        let $name=`select concat("t",char(floor(ascii('a')+$t/26)),repeat(char(ascii('a')+mod($t,26)),60))`;
+        let $view=`select concat("t",char(floor(ascii('a')+$t/26)),repeat(char(ascii('a')+mod($t,26)),30),'v')`;
         --eval create table $name (a int not null) $extra_option
         --eval create view $view as select * from $name
       }

mysql-test/suite/innodb/t/innodb_buffer_pool_resize_temporary.test

@@ -35,8 +35,8 @@ SET DEBUG_SYNC='buf_pool_shrink_before_wakeup SIGNAL blocked WAIT_FOR go';
 send SET GLOBAL innodb_buffer_pool_size=8388608;
 connection default;
 SET DEBUG_SYNC='now WAIT_FOR blocked';
-# adjust for 32-bit and SUX_LOCK_GENERIC
---replace_regex /(5..)\/\1/505\/505/
+# IA-32: 504 blocks; IA-32 glibc SUX_LOCK_GENERIC: 500; macOS SUX_LOCK_GENERIC: 498
+--replace_regex /([45]..)\/\1/505\/505/
 SHOW STATUS LIKE 'innodb_buffer_pool_resize_status';
 SET DEBUG_SYNC='now SIGNAL go';
 connection con1;

mysql-test/suite/innodb/t/log_upgrade.test

@@ -1,11 +1,14 @@
 --source include/have_innodb.inc
 --source include/have_innodb_16k.inc
+# include/shutdown_mysqld.inc does not work in ./mtr --embedded
+--source include/not_embedded.inc
 # Some operating systems or file systems do not support sparse files.
 # For example, tmpfs on FreeBSD does not support them.
+# On macOS, HFS allocates every block of the skipped range.  APFS allocates
+# the whole range for a file smaller than 16MB, and records a hole above that.
 # On Microsoft Windows, sparse files have to be created in a special way.
---source include/big_test.inc
-# include/shutdown_mysqld.inc does not work in ./mtr --embedded
---source include/not_embedded.inc
+--let $sparse_file_dir= $MYSQLTEST_VARDIR/tmp
+--source include/have_sparse_files.inc
 
 call mtr.add_suppression("InnoDB: The change buffer is corrupted");
 

mysql-test/suite/innodb/t/log_upgrade_101_flags.test

@@ -1,6 +1,7 @@
 --source include/have_innodb.inc
---source include/big_test.inc
 --source include/not_embedded.inc
+--let $sparse_file_dir= $MYSQLTEST_VARDIR/tmp
+--source include/have_sparse_files.inc
 call mtr.add_suppression("InnoDB: The change buffer is corrupted");
 call mtr.add_suppression("InnoDB: Tablespace size stored in header is 768 pages, but the sum of data file sizes is 384 pages");
 call mtr.add_suppression("InnoDB: adjusting FSP_SPACE_FLAGS of file");

mysql-test/suite/innodb_fts/t/index_table.test

@@ -17,6 +17,9 @@ CREATE TABLE articles (
 	content TEXT
 	) ENGINE= InnoDB;
 
+# The error number is reported through my_strerror(), whose text for 11
+# differs between systems, so normalize it
+--replace_regex /".*" from/"Resource temporarily unavailable" from/
 --error ER_GET_ERRNO
 SET STATEMENT debug_dbug='+d,innodb_report_deadlock' FOR
 CREATE FULLTEXT INDEX idx ON articles (title, content);