summaryrefslogtreecommitdiff
path: root/mysql-test/suite/plugins
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-21 10:32:08 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-21 10:32:08 +0200
commitbebe193979405b28b15af008621248ed117e54a4 (patch)
tree4947916c6c2afed02dc14494e8990d293c2c816d /mysql-test/suite/plugins
parentbb894f2376bff6ada36a3f627d4b1bf27ee9ca2a (diff)
parentb35a048ece4f5dd7c6757d86a303f27187a16117 (diff)
downloadmariadb-git-bebe193979405b28b15af008621248ed117e54a4.tar.gz
Merge 10.9 into 10.10
Diffstat (limited to 'mysql-test/suite/plugins')
-rw-r--r--mysql-test/suite/plugins/r/test_sql_service.result1
-rw-r--r--mysql-test/suite/plugins/t/test_sql_service.test2
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/plugins/r/test_sql_service.result b/mysql-test/suite/plugins/r/test_sql_service.result
index a68980bd021..2983da28cc9 100644
--- a/mysql-test/suite/plugins/r/test_sql_service.result
+++ b/mysql-test/suite/plugins/r/test_sql_service.result
@@ -1,3 +1,4 @@
+reset master;
install plugin test_sql_service soname 'test_sql_service';
show status like 'test_sql_service_passed';
Variable_name Value
diff --git a/mysql-test/suite/plugins/t/test_sql_service.test b/mysql-test/suite/plugins/t/test_sql_service.test
index 078992acdb4..2f53c1d5b3e 100644
--- a/mysql-test/suite/plugins/t/test_sql_service.test
+++ b/mysql-test/suite/plugins/t/test_sql_service.test
@@ -1,6 +1,8 @@
--source include/not_embedded.inc
--source include/have_log_bin.inc
+reset master; # clear binlogs
+
if (!$TEST_SQL_SERVICE_SO) {
skip No TEST_SQL_SERVICE plugin;
}