cleanup: don't ---replace_regex /#sql-.*/#sql-temporary/

no longer needed

mysql-test/include/check-testcase.test

@@ -83,7 +83,6 @@ call mtr.check_testcase();
 let $datadir=`select @@datadir`;
 list_files $datadir mysql_upgrade_info;
 list_files_write_file $datadir.tempfiles.txt $datadir/test #sql*;
---replace_regex /#sql-ib[0-9a-f]+-[0-9a-f]+\.ibd\n//
 cat_file $datadir.tempfiles.txt;
 remove_file $datadir.tempfiles.txt;
 list_files $datadir/mysql #sql*;

mysql-test/r/check_constraint.result

@@ -44,7 +44,7 @@ a	b
 103	103
 set check_constraint_checks=@save_check_constraint;
 alter table t1 add c int default 0 check (c < 10);
-ERROR 23000: CONSTRAINT `max` failed for table
+ERROR 23000: CONSTRAINT `max` failed for `test`.`t1`
 set check_constraint_checks=0;
 alter table t1 add c int default 0 check (c < 10);
 alter table t1 add check (a+b+c < 500);

mysql-test/r/error_simulation.result

@@ -1,6 +1,3 @@
-DROP TABLE IF EXISTS t1;
-Warnings:
-Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (
 a varchar(32) character set utf8 collate utf8_bin NOT NULL,
 b varchar(32) character set utf8 collate utf8_bin NOT NULL )
@@ -15,7 +12,7 @@ INSERT INTO t1 VALUES
 set tmp_table_size=1024;
 set session debug_dbug="+d,raise_error";
 SELECT MAX(a) FROM t1 GROUP BY a,b;
-ERROR 23000: Can't write; duplicate key in table 'tmp_table'
+ERROR 23000: Can't write; duplicate key in table '(temporary)'
 set tmp_table_size=default;
 DROP TABLE t1;
 #

mysql-test/suite/archive/partition_archive.result

@@ -30,7 +30,7 @@ partition by list (a)
 (partition p0 values in (1), partition p1 values in (2));
 insert into t1 values (1), (2);
 create index inx on t1 (a);
-ERROR HY000: Can't create table `db99`.`#sql-temporary` (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `db99`.`t1` (errno: 140 "Wrong create options")
 alter table t1 add partition (partition p2 values in (3));
 alter table t1 drop partition p2;
 use test;
@@ -141,7 +141,7 @@ t1	CREATE TABLE `t1` (
  PARTITION BY HASH (`fld1`)
 PARTITIONS 5
 ALTER TABLE t1 ENGINE= ARCHIVE;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 #After the patch, the ENGINE is correctly displayed as MyISAM
 SHOW CREATE TABLE t1;
 Table	Create Table

mysql-test/suite/archive/partition_archive.test

@@ -47,7 +47,7 @@ engine=archive
 partition by list (a)
 (partition p0 values in (1), partition p1 values in (2));
 insert into t1 values (1), (2);
---replace_regex /#sql-[0-9a-f_]+/#sql-temporary/ /Not owner/Operation not permitted/
+--replace_regex /Not owner/Operation not permitted/
 --error ER_CANT_CREATE_TABLE
 create index inx on t1 (a);
 alter table t1 add partition (partition p2 values in (3));
@@ -138,7 +138,6 @@ CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
 PARTITIONS 5;
 SHOW CREATE TABLE t1;
 
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ENGINE= ARCHIVE;
 

mysql-test/suite/encryption/r/innodb-encryption-alter.result

@@ -65,11 +65,11 @@ t1	CREATE TABLE `t1` (
 DROP TABLE t1;
 CREATE TABLE t2 (a int not null primary key) engine=innodb;
 ALTER TABLE t2 ENCRYPTION_KEY_ID=4, ALGORITHM=COPY;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	140	InnoDB: innodb_encrypt_tables=OFF only allows ENCRYPTION_KEY_ID=1
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
+Error	1005	Can't create table `test`.`t2` (errno: 140 "Wrong create options")
 Warning	1030	Got error 140 "Wrong create options" from storage engine InnoDB
 SHOW CREATE TABLE t2;
 Table	Create Table

mysql-test/suite/encryption/r/innodb-spatial-index.result

@@ -10,7 +10,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT,
 c VARCHAR(256), coordinate POINT NOT NULL) ENCRYPTED=YES ENGINE=INNODB;
 ALTER TABLE t1 ADD SPATIAL INDEX b(coordinate), ALGORITHM=COPY;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
+ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
 ALTER TABLE t1 ADD SPATIAL INDEX b(coordinate), FORCE, ALGORITHM=INPLACE;
 ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTED'
 ALTER TABLE t1 ADD SPATIAL INDEX(coordinate);

mysql-test/suite/encryption/t/innodb-encryption-alter.test

@@ -92,10 +92,8 @@ SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
 CREATE TABLE t2 (a int not null primary key) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t2 ENCRYPTION_KEY_ID=4, ALGORITHM=COPY;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 SHOW WARNINGS;
 SHOW CREATE TABLE t2;
 

mysql-test/suite/encryption/t/innodb-spatial-index.test

@@ -9,7 +9,6 @@
 # (1) Do not allow creating table with ENCRYPTED=YES
 #
 #
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT,
 c VARCHAR(256), coordinate POINT NOT NULL, SPATIAL index(coordinate)) ENGINE=INNODB
@@ -31,7 +30,6 @@ CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT,
 c VARCHAR(256), coordinate POINT NOT NULL) ENCRYPTED=YES ENGINE=INNODB;
 # FIXME: MDEV-13851 Encrypted table refuses some form of ALGORITHM=COPY,
 # but allows rebuild by FORCE
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ADD SPATIAL INDEX b(coordinate), ALGORITHM=COPY;
 --error ER_ILLEGAL_HA_CREATE_OPTION

mysql-test/suite/gcol/inc/gcol_column_def_options.inc

@@ -150,7 +150,6 @@ create table t2 (a int);
 alter table t1 add constraint foreign key fk(d) references t2(a);
 if ($support_virtual_foreign)
 {
---replace_regex /`#sql-.*`/`#sql-temporary`/
 --error ER_CANT_CREATE_TABLE
 alter table t1 add constraint foreign key fk(b) references t2(a);
 }

mysql-test/suite/gcol/inc/gcol_keys.inc

@@ -156,7 +156,6 @@ create table t1 (a int, b int generated always as (a+1) virtual,
                  foreign key (b) references t2(a));
 
 create table t1 (a int, b int generated always as (a+1) virtual);
---replace_regex /`#sql-.*`/`#sql-temporary`/
 --error ER_CANT_CREATE_TABLE
 alter table t1 add foreign key (b) references t2(a);
 drop table t1;

mysql-test/suite/gcol/r/gcol_keys_innodb.result

@@ -153,7 +153,7 @@ foreign key (b) references t2(a));
 ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 create table t1 (a int, b int generated always as (a+1) virtual);
 alter table t1 add foreign key (b) references t2(a);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 drop table t1;
 # Allowed FK options.
 create table t2 (a int primary key, b char(5));

mysql-test/suite/gcol/r/innodb_virtual_fk.result

@@ -702,7 +702,7 @@ v3 TIME AS (c3) VIRTUAL,
 v4 CHAR(10) AS (c4) VIRTUAL
 ) ENGINE=InnoDB;
 ALTER TABLE t1 ADD CONSTRAINT fk FOREIGN KEY (v4) REFERENCES nosuch(col);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 SET foreign_key_checks=0;
 ALTER TABLE t1 ADD CONSTRAINT fk FOREIGN KEY (v4) REFERENCES nosuch(col);
 ERROR HY000: Failed to add the foreign key constaint. Missing index for constraint 'fk' in the foreign table 't1'
@@ -725,7 +725,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1 DROP FOREIGN KEY fk;
 ALTER TABLE t1 ADD CONSTRAINT fk FOREIGN KEY (v4) REFERENCES nosuch(col);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/suite/gcol/t/innodb_virtual_fk.test

@@ -590,7 +590,6 @@ CREATE TABLE t1 (
   v3 TIME AS (c3) VIRTUAL,
   v4 CHAR(10) AS (c4) VIRTUAL
 ) ENGINE=InnoDB;
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ADD CONSTRAINT fk FOREIGN KEY (v4) REFERENCES nosuch(col);
 SET foreign_key_checks=0;
@@ -601,7 +600,6 @@ ALTER TABLE t1 ADD CONSTRAINT fk FOREIGN KEY (v4) REFERENCES nosuch(col);
 SET foreign_key_checks=1;
 SHOW CREATE TABLE t1;
 ALTER TABLE t1 DROP FOREIGN KEY fk;
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t1 ADD CONSTRAINT fk FOREIGN KEY (v4) REFERENCES nosuch(col);
 SHOW CREATE TABLE t1;

mysql-test/suite/innodb/r/add_constraint.result

@@ -6,7 +6,7 @@ create table t2(a int, b int, key(a),key(b))engine=innodb;
 alter table t2 add constraint b foreign key (b) references t1(a);
 alter table t1 add constraint b1 foreign key (b) references t2(a);
 alter table t2 add constraint b1 foreign key (b) references t1(a);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 121 "Duplicate key on write or update")
+ERROR HY000: Can't create table `test`.`t2` (errno: 121 "Duplicate key on write or update")
 alter table t2 drop foreign key b;
 alter table t1 drop foreign key b1;
 drop table t2;

mysql-test/suite/innodb/r/foreign_key.result

@@ -10,7 +10,7 @@ ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint
 create table t2 (f1 int primary key,
 constraint c1 foreign key (f1) references t1(f1)) engine=innodb;
 alter table t2 add constraint c1 foreign key (f1) references t1(f1);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 121 "Duplicate key on write or update")
+ERROR HY000: Can't create table `test`.`t2` (errno: 121 "Duplicate key on write or update")
 set foreign_key_checks = 0;
 alter table t2 add constraint c1 foreign key (f1) references t1(f1);
 ERROR HY000: Duplicate FOREIGN KEY constraint name 'test/c1'

mysql-test/suite/innodb/r/innodb-fk-warnings.result

@@ -39,20 +39,20 @@ Error	1005	Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is
 Warning	1215	Cannot add foreign key constraint
 create table t2(a int, b int, constraint a foreign key a (a) references t1(a)) engine=innodb;
 alter table t2 add constraint b foreign key (b) references t2(b);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near ' foreign key (b) references t2(b)'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 drop table t2, t1;
 create table t1 (f1 integer primary key) engine=innodb;
 alter table t1 add constraint c1 foreign key (f1) references t11(f1);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table `test`.`t1` with foreign key constraint failed. Referenced table `test`.`t11` not found in the data dictionary near ' foreign key (f1) references t11(f1)'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 drop table t1;
 create temporary table t1(a int not null primary key, b int, key(b)) engine=innodb;
@@ -78,11 +78,11 @@ Warning	150	Create  table `mysqld.1`.`t2` with foreign key constraint failed. Re
 Error	1005	Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 alter table t1 add foreign key(b) references t1(a);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table `mysqld.1`.`t1` with foreign key constraint failed. Referenced table `mysqld.1`.`t1` not found in the data dictionary near 'foreign key(b) references t1(a)'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 drop table t1;
 create table t1(a int not null primary key, b int, key(b)) engine=innodb;
@@ -101,11 +101,11 @@ Error	1239	Incorrect foreign key definition for 'foreign key without name': Key
 drop table t1;
 create table t1 (f1 integer not null primary key) engine=innodb;
 alter table t1 add constraint c1 foreign key (f1) references t1(f1) on update set null;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table `test`.`t1` with foreign key constraint failed. You have defined a SET NULL condition but column 'f1' is defined as NOT NULL in ' foreign key (f1) references t1(f1) on update set null' near ' on update set null'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 create table t2(a int not null, foreign key(a) references t1(f1) on delete set null) engine=innodb;
 ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")

mysql-test/suite/innodb/r/innodb-fk.result

@@ -62,11 +62,11 @@ PRIMARY KEY (`id`),
 CONSTRAINT fk2 FOREIGN KEY (f2) REFERENCES t1 (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB;
 ALTER TABLE t2 ADD CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary near ' FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 drop table t2;
 drop table t1;

mysql-test/suite/innodb/r/innodb-index-online.result

@@ -513,7 +513,7 @@ SET DEBUG_SYNC = 'RESET';
 disconnect con1;
 CREATE TABLE t2 (c VARCHAR(64)) ENGINE=InnoDB;
 ALTER TABLE t2 ADD FOREIGN KEY (c) REFERENCES t1 (c);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 DROP TABLE t2,t1;
 SET GLOBAL innodb_file_per_table = @global_innodb_file_per_table_orig;
 SET GLOBAL innodb_monitor_enable  = default;

mysql-test/suite/innodb/r/innodb-index.result

@@ -506,7 +506,7 @@ t4	CREATE TABLE `t4` (
   CONSTRAINT `dc` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t3 add constraint dc foreign key (a) references t1(a);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 121 "Duplicate key on write or update")
+ERROR HY000: Can't create table `test`.`t3` (errno: 121 "Duplicate key on write or update")
 SET FOREIGN_KEY_CHECKS=0;
 alter table t3 add constraint dc foreign key (a) references t1(a);
 ERROR HY000: Failed to add the foreign key constraint 'test/dc' to system tables
@@ -951,13 +951,13 @@ PRIMARY KEY (c1)
 SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c1), ALGORITHM=COPY;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c1);
 ERROR HY000: Failed to add the foreign key constaint. Missing index for constraint 'fk_t2_ca' in the referenced table 't1'
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2), ALGORITHM=COPY;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
 ERROR HY000: Failed to add the foreign key constaint. Missing index for constraint 'fk_t2_ca' in the referenced table 't1'
@@ -966,13 +966,13 @@ FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1), ALGORITHM=INPLACE;
 ERROR HY000: Failed to add the foreign key constraint on table 't2'. Incorrect options in FOREIGN KEY constraint 'test/fk_t2_ca'
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1), ALGORITHM=COPY;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t1 MODIFY COLUMN c2 BIGINT(12) NOT NULL;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2), ALGORITHM=COPY;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
 ERROR HY000: Failed to add the foreign key constaint. Missing index for constraint 'fk_t2_ca' in the referenced table 't1'

mysql-test/suite/innodb/r/innodb_force_recovery.result

@@ -10,11 +10,11 @@ f1	f2
 insert into t1 values(2, 3);
 ERROR HY000: Running in read-only mode
 alter table t1 add f3 int not null, algorithm=copy;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 165 "Table is read only")
+ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only")
 alter table t1 add f3 int not null, algorithm=inplace;
 ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Running in read-only mode. Try ALGORITHM=COPY
 drop index idx on t1;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 165 "Table is read only")
+ERROR HY000: Can't create table `test`.`t1` (errno: 165 "Table is read only")
 alter table t1 drop index idx, algorithm=inplace;
 ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Running in read-only mode. Try ALGORITHM=COPY
 update t1 set f1=3 where f2=2;
@@ -38,11 +38,11 @@ f1	f2
 insert into t2 values(2, 3);
 ERROR HY000: Running in read-only mode
 alter table t2 add f3 int not null, algorithm=copy;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 165 "Table is read only")
+ERROR HY000: Can't create table `test`.`t2` (errno: 165 "Table is read only")
 alter table t2 add f3 int not null, algorithm=inplace;
 ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Running in read-only mode. Try ALGORITHM=COPY
 drop index idx on t2;
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 165 "Table is read only")
+ERROR HY000: Can't create table `test`.`t2` (errno: 165 "Table is read only")
 update t2 set f1=3 where f2=2;
 ERROR HY000: Running in read-only mode
 create table t1(f1 int not null)engine=innodb;

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

@@ -10,7 +10,6 @@ create table t2(a int, b int, key(a),key(b))engine=innodb;
 alter table t2 add constraint b foreign key (b) references t1(a);
 alter table t1 add constraint b1 foreign key (b) references t2(a);
 
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 alter table t2 add constraint b1 foreign key (b) references t1(a);
 

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

@@ -14,7 +14,6 @@ constraint c1 foreign key (f1) references t1(f1)) engine=InnoDB;
 create table t2 (f1 int primary key,
    constraint c1 foreign key (f1) references t1(f1)) engine=innodb;
 
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 alter table t2 add constraint c1 foreign key (f1) references t1(f1);
 

mysql-test/suite/innodb/t/innodb-fk-warnings.test

@@ -48,10 +48,8 @@ create table t2(a int, b int, constraint a foreign key a (a) references t1(a),
 constraint a foreign key a (a) references t1(b)) engine=innodb;
 show warnings;
 create table t2(a int, b int, constraint a foreign key a (a) references t1(a)) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 alter table t2 add constraint b foreign key (b) references t2(b);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 drop table t2, t1;
 
@@ -60,10 +58,8 @@ drop table t2, t1;
 #
 
 create table t1 (f1 integer primary key) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 alter table t1 add constraint c1 foreign key (f1) references t11(f1);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 drop table t1;
 
@@ -87,15 +83,11 @@ create temporary table t1(a int not null primary key, b int, key(b)) engine=inno
 --echo Warning	150	Alter  table `mysqld.1`.`t1` with foreign key constraint failed. Referenced table `mysqld.1`.`t1` not found in the data dictionary close to foreign key(b) references t1(a).
 --echo Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
 --echo Warning	1215	Cannot add foreign key constraint
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 create temporary table t2(a int, foreign key(a) references t1(a)) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 alter table t1 add foreign key(b) references t1(a);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 drop table t1;
 
@@ -103,17 +95,13 @@ drop table t1;
 # Column numbers do not match
 #
 create table t1(a int not null primary key, b int, key(b)) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1239
 alter table t1 add foreign key(a,b) references t1(a);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 drop table t1;
 create table t1(a int not null primary key, b int, key(b)) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1239
 alter table t1 add foreign key(a) references t1(a,b);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 drop table t1;
 
@@ -121,15 +109,11 @@ drop table t1;
 # ON UPDATE/DELETE SET NULL on NOT NULL column
 #
 create table t1 (f1 integer not null primary key) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 alter table t1 add constraint c1 foreign key (f1) references t1(f1) on update set null;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 create table t2(a int not null, foreign key(a) references t1(f1) on delete set null) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 drop table t1;
 
@@ -137,9 +121,7 @@ drop table t1;
 # Incorrect types
 #
 create table t1 (id int not null primary key, f1 int, f2 int, key(f1)) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 create table t2(a char(20), key(a), foreign key(a) references t1(f1)) engine=innodb;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 drop table t1;

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

@@ -115,11 +115,9 @@ CREATE TABLE t2 (
   CONSTRAINT fk2 FOREIGN KEY (f2) REFERENCES t1 (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
---replace_regex /#sql-[0-9_a-f-]*/#sql-temporary/
 --error 1005
 ALTER TABLE t2 ADD CONSTRAINT fk3 FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE;
 
---replace_regex /#sql-[0-9_a-f-]*/#sql-temporary/
 show warnings;
 
 drop table t2;

mysql-test/suite/innodb/t/innodb-index-online.test

@@ -492,7 +492,6 @@ reap;
 SET DEBUG_SYNC = 'RESET';
 disconnect con1;
 CREATE TABLE t2 (c VARCHAR(64)) ENGINE=InnoDB;
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE t2 ADD FOREIGN KEY (c) REFERENCES t1 (c);
 DROP TABLE t2,t1;

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

@@ -218,7 +218,6 @@ alter table t4 add constraint dc foreign key (a) references t1(a);
 --disable_info
 show create table t4;
 # mysqltest first does replace_regex, then replace_result
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 # Embedded server doesn't chdir to data directory
 --replace_result $MYSQLD_DATADIR ./ master-data/ ''
 # a foreign key 'test/dc' already exists
@@ -416,7 +415,6 @@ SET FOREIGN_KEY_CHECKS=0;
 --enable_info
 
 # mysqltest first does replace_regex, then replace_result
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 # Embedded server doesn't chdir to data directory
 --replace_result $MYSQLD_DATADIR ./ master-data/ ''
 --error ER_CANT_CREATE_TABLE
@@ -426,7 +424,6 @@ ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
  FOREIGN KEY (c3,c2) REFERENCES t1(c1,c1);
 # mysqltest first does replace_regex, then replace_result
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 # Embedded server doesn't chdir to data directory
 --replace_result $MYSQLD_DATADIR ./ master-data/ ''
 --error ER_CANT_CREATE_TABLE
@@ -441,7 +438,6 @@ ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
  FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1), ALGORITHM=INPLACE;
 
 # mysqltest first does replace_regex, then replace_result
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 # Embedded server doesn't chdir to data directory
 --replace_result $MYSQLD_DATADIR ./ master-data/ ''
 --error ER_CANT_CREATE_TABLE
@@ -450,7 +446,6 @@ ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 
 ALTER TABLE t1 MODIFY COLUMN c2 BIGINT(12) NOT NULL;
 # mysqltest first does replace_regex, then replace_result
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 # Embedded server doesn't chdir to data directory
 --replace_result $MYSQLD_DATADIR ./ master-data/ ''
 --error ER_CANT_CREATE_TABLE

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

@@ -9,20 +9,16 @@ set global innodb_compression_algorithm = 1;
 create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
 create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact page_compressed=1;
 create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic page_compressed=1;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed page_compressed=1;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 show create table innodb_compact;
 show create table innodb_dynamic;
 
 # MDEV-7133: InnoDB: Assertion failure in thread 140737091569408 in file dict0mem.cc line 74 
 # InnoDB: Failing assertion: dict_tf_is_valid(flags)
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error 1005
 create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant page_compressed=1;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant;
 show create table innodb_redundant;

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

@@ -25,14 +25,12 @@ select * from t1;
 --error ER_READ_ONLY_MODE
 insert into t1 values(2, 3);
 
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 alter table t1 add f3 int not null, algorithm=copy;
 
 --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
 alter table t1 add f3 int not null, algorithm=inplace;
 
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 drop index idx on t1;
 --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
@@ -65,14 +63,12 @@ select * from t2;
 --error ER_READ_ONLY_MODE
 insert into t2 values(2, 3);
 
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 alter table t2 add f3 int not null, algorithm=copy;
 
 --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
 alter table t2 add f3 int not null, algorithm=inplace;
 
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
 --error ER_CANT_CREATE_TABLE
 drop index idx on t2;
 

mysql-test/suite/innodb_gis/r/point_basic.result

@@ -1521,11 +1521,11 @@ child	CREATE TABLE `child` (
   SPATIAL KEY `idx2` (`p`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed")
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table '`test`.`child`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near 'FOREIGN KEY(p) REFERENCES parent(p)'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 ALTER TABLE parent DROP INDEX idx1;
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
@@ -1533,7 +1533,7 @@ Got one of the listed errors
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table '`test`.`child`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near 'FOREIGN KEY(p) REFERENCES parent(p)'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 ALTER TABLE child DROP INDEX idx2;
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
@@ -1541,7 +1541,7 @@ Got one of the listed errors
 show warnings;
 Level	Code	Message
 Warning	150	Alter  table '`test`.`child`' with foreign key constraint failed. There is only prefix index in the referenced table where the referenced columns appear as the first columns near 'FOREIGN KEY(p) REFERENCES parent(p)'.
-Error	1005	Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+Error	1005	Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed")
 Warning	1215	Cannot add foreign key constraint
 DROP TABLE child, parent;
 #

mysql-test/suite/innodb_gis/t/point_basic.test

@@ -772,24 +772,18 @@ ALTER TABLE child ADD SPATIAL INDEX idx2(p ASC);
 SHOW CREATE TABLE parent;
 SHOW CREATE TABLE child;
 
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 
 ALTER TABLE parent DROP INDEX idx1;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error ER_CANNOT_ADD_FOREIGN,ER_CANT_CREATE_TABLE
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 
 ALTER TABLE child DROP INDEX idx2;
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 --error ER_CANNOT_ADD_FOREIGN,ER_CANT_CREATE_TABLE
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
 show warnings;
 
 DROP TABLE child, parent;

mysql-test/suite/plugins/t/audit_null.test

@@ -56,6 +56,6 @@ drop user testuser@localhost;
 set global general_log=@old_global_general_log;
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ /#sql2-[-0-9a-f_]*/#sql2-temporary/ /::1// /127.0.0.1//
+--replace_regex /::1// /127.0.0.1//
 cat_file $MYSQLD_DATADIR/audit_null_tables.log;
 

mysql-test/suite/sys_vars/r/tmp_disk_table_size_func.result

@@ -18,7 +18,7 @@ Variable_name	Value
 Created_tmp_disk_tables	1
 set @@session.tmp_disk_table_size=1000000;
 select count(*) as c from t1 group by b having c>1;
-ERROR HY000: The table '#sql_xxx' is full
+ERROR HY000: The table '(temporary)' is full
 show status like "created_tmp_disk%";
 Variable_name	Value
 Created_tmp_disk_tables	2

mysql-test/suite/sys_vars/t/tmp_disk_table_size_func.test

@@ -21,7 +21,6 @@ insert into t1 values (20000,"A");
 select count(*) as c from t1 group by b having c>1;
 show status like "created_tmp_disk%";
 set @@session.tmp_disk_table_size=1000000;
---replace_regex /The table '.*' is full/The table '#sql_xxx' is full/
 --error ER_RECORD_FILE_FULL
 select count(*) as c from t1 group by b having c>1;
 show status like "created_tmp_disk%";

mysql-test/suite/vcol/inc/vcol_keys.inc

@@ -127,7 +127,6 @@ if ($with_foreign_keys) {
 create table t1 (a int, b int as (a+1), foreign key (b) references t2(a));
 
 create table t1 (a int, b int as (a+1));
---replace_regex /`#sql-.*`/`#sql-temporary`/
 --error ER_CANT_CREATE_TABLE
 alter table t1 add foreign key (b) references t2(a);
 drop table t1;

mysql-test/suite/vcol/r/vcol_keys_innodb.result

@@ -126,7 +126,7 @@ create table t1 (a int, b int as (a+1), foreign key (b) references t2(a));
 ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 create table t1 (a int, b int as (a+1));
 alter table t1 add foreign key (b) references t2(a);
-ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 drop table t1;
 # Allowed FK options.
 create table t2 (a int primary key, b char(5));

mysql-test/t/check_constraint.test

@@ -27,7 +27,6 @@ insert into t1 values (101,101),(102,102),(600,600),(103,103);
 select * from t1;
 set check_constraint_checks=@save_check_constraint;
 
---replace_regex /failed for.*/failed for table/
 --error ER_CONSTRAINT_FAILED
 alter table t1 add c int default 0 check (c < 10);
 

mysql-test/t/error_simulation.test

@@ -1,12 +1,9 @@
--- source include/have_debug.inc
+--source include/have_debug.inc
 --source include/not_embedded.inc
 
 #
 # Bug #28499: crash for grouping query when tmp_table_size is too small
 #
-
-DROP TABLE IF EXISTS t1;
-
 CREATE TABLE t1 (
   a varchar(32) character set utf8 collate utf8_bin NOT NULL,
   b varchar(32) character set utf8 collate utf8_bin NOT NULL )
@@ -26,14 +23,12 @@ set tmp_table_size=1024;
 # tmp table in query is converted from heap to myisam
 set session debug_dbug="+d,raise_error";
 
---replace_regex /in table '[^']+'/in table 'tmp_table'/
 --error ER_DUP_KEY
 SELECT MAX(a) FROM t1 GROUP BY a,b;
 
 set tmp_table_size=default;
 DROP TABLE t1;
 
-
 --echo #
 --echo # Bug #50946: fast index creation still seems to copy the table
 --echo #

mysql-test/t/gis.test

@@ -761,7 +761,6 @@ drop table t1;
 --echo #                      on char > 31 bytes".
 --echo #
 create table t1(a char(32) not null) engine=myisam;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
 --error ER_WRONG_ARGUMENTS
 create spatial index i on t1 (a);
 drop table t1;