summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql_upgrade_view.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-13 16:58:58 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-13 16:58:58 +0200
commita8a5c8a1b8ac566241d43a85de90c11f5d1568d9 (patch)
treef619f2a7ed54abbc9edd42b77f5b63caa6ec65ac /mysql-test/main/mysql_upgrade_view.result
parent04efe13501246e490932d4be7bca90e207e0b5e2 (diff)
parent1dc2f35598193fc52b79061c286b61f01c617374 (diff)
downloadmariadb-git-a8a5c8a1b8ac566241d43a85de90c11f5d1568d9.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/mysql_upgrade_view.result')
-rw-r--r--mysql-test/main/mysql_upgrade_view.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/main/mysql_upgrade_view.result b/mysql-test/main/mysql_upgrade_view.result
index a7f13c185a8..ca879b92559 100644
--- a/mysql-test/main/mysql_upgrade_view.result
+++ b/mysql-test/main/mysql_upgrade_view.result
@@ -1,3 +1,4 @@
+reset master;
set sql_log_bin=0;
drop table if exists t1,v1,v2,v3,v4,v1badcheck;
drop view if exists t1,v1,v2,v3,v4,v1badcheck;