diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-01 13:10:36 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-01 13:10:36 +0300 |
commit | 392ee571c175e160869a2ee0510f818e81510a03 (patch) | |
tree | 4481d8aa631bdd295300b875791d9d179c0a4b70 /mysql-test/main | |
parent | 99de8cc02878ec8c20bffeaf17443e704d6edbf7 (diff) | |
parent | 990cde800a4aafc5f5647eb06db3eec461fd172a (diff) | |
download | mariadb-git-392ee571c175e160869a2ee0510f818e81510a03.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main')
-rw-r--r-- | mysql-test/main/information_schema_tables.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/information_schema_tables.test b/mysql-test/main/information_schema_tables.test index bc4f269a3fb..ee277276b52 100644 --- a/mysql-test/main/information_schema_tables.test +++ b/mysql-test/main/information_schema_tables.test @@ -37,7 +37,9 @@ SELECT v.* FROM v JOIN INFORMATION_SCHEMA.TABLES WHERE DATA_LENGTH = -1; --eval KILL $conid --disconnect con1 --connection default +--disable_warnings DROP VIEW IF EXISTS vv; +--enable_warnings DROP VIEW v; DROP FUNCTION f; DROP TABLE t; |