diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 10:47:32 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 10:47:32 +0200 |
| commit | 9b8d9a1db32e7526e2b290bdb1f232eb444ae259 (patch) | |
| tree | bd90730c8b6d6b21387ce0c887df2cd0aad2a2b6 | |
| parent | be6f9593feb368cbcb27c191389fe9723ab3045c (diff) | |
| download | mariadb-git-9b8d9a1db32e7526e2b290bdb1f232eb444ae259.tar.gz | |
Fix main.create_or_replace
Ever since commit 9608773f75e2ca21491ef6825c3616cdc96d1ca5
we no longer disable innodb_stats_persistent.
Ever since commit 45a05fda27dc7058ce8a89f14b1daa56352adf6b
updates of the InnoDB persistent statistics are covered by MDL.
| -rw-r--r-- | mysql-test/main/create_or_replace.result | 6 | ||||
| -rw-r--r-- | mysql-test/main/create_or_replace.test | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/main/create_or_replace.result b/mysql-test/main/create_or_replace.result index e1670aff9ce..294b0623fc1 100644 --- a/mysql-test/main/create_or_replace.result +++ b/mysql-test/main/create_or_replace.result @@ -353,7 +353,8 @@ drop table test.t1; # create table t1 (i int); lock table t1 write; -select * from information_schema.metadata_lock_info; +select * from information_schema.metadata_lock_info +where table_schema!='mysql' or table_name not like 'innodb_%_stats'; THREAD_ID LOCK_MODE LOCK_DURATION LOCK_TYPE TABLE_SCHEMA TABLE_NAME # MDL_BACKUP_DDL NULL Backup lock # MDL_BACKUP_DML NULL Backup lock @@ -364,7 +365,8 @@ ERROR 22001: Data too long for column 'a' at row 1 show tables; Tables_in_test t2 -select * from information_schema.metadata_lock_info; +select * from information_schema.metadata_lock_info +where table_schema!='mysql' or table_name not like 'innodb_%_stats'; THREAD_ID LOCK_MODE LOCK_DURATION LOCK_TYPE TABLE_SCHEMA TABLE_NAME create table t1 (i int); drop table t1; diff --git a/mysql-test/main/create_or_replace.test b/mysql-test/main/create_or_replace.test index 4b954263a87..7fa08d13847 100644 --- a/mysql-test/main/create_or_replace.test +++ b/mysql-test/main/create_or_replace.test @@ -285,13 +285,15 @@ create table t1 (i int); lock table t1 write; --replace_column 1 # --sorted_result -select * from information_schema.metadata_lock_info; +select * from information_schema.metadata_lock_info +where table_schema!='mysql' or table_name not like 'innodb_%_stats'; --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 * from information_schema.metadata_lock_info +where table_schema!='mysql' or table_name not like 'innodb_%_stats'; create table t1 (i int); drop table t1; |