diff options
author | Monty <monty@mariadb.org> | 2020-04-09 16:52:59 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2020-04-19 17:33:51 +0300 |
commit | f40ca33bbc605af28492b58dde35bf2a97126b5f (patch) | |
tree | 43b4b60902d9cbd97cddc4b519e24decc5643d27 /mysql-test/suite/innodb/t/alter_copy.test | |
parent | eca5c2c67ff1854b186b0e1b8dd342cb988e94d2 (diff) | |
download | mariadb-git-f40ca33bbc605af28492b58dde35bf2a97126b5f.tar.gz |
Make all #sql temporary table names uniform
The reason for this is to make all temporary file names similar and
also to be able to figure out from where a #sql-xxx name orginates.
New format is for most cases:
'#sql-name-current_pid-thread_id[-increment]'
Where name is one of subselect, alter, exchange, temptable or backup
The exceptions are:
ALTER PARTITION shadow files:
'#sql-shadow-thread_id-'original_table_name'
Names used with temp pool:
'#sql-name-current_pid-pool_number'
Diffstat (limited to 'mysql-test/suite/innodb/t/alter_copy.test')
-rw-r--r-- | mysql-test/suite/innodb/t/alter_copy.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/t/alter_copy.test b/mysql-test/suite/innodb/t/alter_copy.test index e85b94d467f..de2f99b68d4 100644 --- a/mysql-test/suite/innodb/t/alter_copy.test +++ b/mysql-test/suite/innodb/t/alter_copy.test @@ -63,7 +63,7 @@ let $shutdown_timeout=0; disconnect hang; let $shutdown_timeout=; let $datadir=`select @@datadir`; ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ /FTS_[0-9a-f]*_[0-9a-f]*/FTS/ +--replace_regex /#sql-alter-[0-9a-f_\-]*/#sql-alter/ /FTS_[0-9a-f]*_[0-9a-f]*/FTS/ --list_files $datadir/test SHOW CREATE TABLE t; SELECT COUNT(*) FROM t; @@ -76,7 +76,7 @@ CHECK TABLE t1; --let $restart_parameters= --innodb-read-only --source include/restart_mysqld.inc ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ /FTS_[0-9a-f]*_[0-9a-f]*/FTS/ +--replace_regex /#sql-alter-[0-9a-f_\-]*/#sql-alter/ /FTS_[0-9a-f]*_[0-9a-f]*/FTS/ --list_files $datadir/test SHOW CREATE TABLE t; @@ -90,7 +90,7 @@ CHECK TABLE t1; --let $restart_parameters= --source include/restart_mysqld.inc ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ /FTS_[0-9a-f]*_[0-9a-f]*/FTS/ +--replace_regex /#sql-alter-[0-9a-f_\-]*/#sql-alter/ /FTS_[0-9a-f]*_[0-9a-f]*/FTS/ --list_files $datadir/test DROP TABLE t1,t; |