summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-05-20 16:05:24 +0200
committerSergei Golubchik <serg@mariadb.org>2021-05-20 16:05:24 +0200
commitd8127ff76ec56a81779c70eec36c556427159c4e (patch)
tree1fa059c701304a49efca2886f5e6d5c90bc29c38
parent55ebf7f41f4d4756e2fe73db129386b178c933c0 (diff)
downloadmariadb-git-d8127ff76ec56a81779c70eec36c556427159c4e.tar.gz
fix main.strings test to clean up after itself
-rw-r--r--mysql-test/main/strings.result1
-rw-r--r--mysql-test/main/strings.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/strings.result b/mysql-test/main/strings.result
index f8d35a3b388..7b71b593a97 100644
--- a/mysql-test/main/strings.result
+++ b/mysql-test/main/strings.result
@@ -7,3 +7,4 @@ START SLAVE sql_thread;
CHANGE MASTER TO master_user='user',master_password='pwd';
ERROR HY000: \042D\0442\0443 \043E\043F\0435\0440\0430\0446\0438\044E \043D\0435\0432\043E\0437\043C\043E\0436\043D\043E \0432\044B\043F\043E\043B\043D\0438\0442\044C \043F\0440\0438 \0440\0430\0431\043E\0442\0430\044E\0449\0435\043C \043F\043E\0442\043E\043A\0435 \043F\043E\0434\0447\0438\043D\0435\043D\043D\043E\0433\043E \0441\0435\0440\0432\0435\0440\0430 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
STOP SLAVE;
+RESET SLAVE ALL;
diff --git a/mysql-test/main/strings.test b/mysql-test/main/strings.test
index 82055d04d08..33ac6b116d5 100644
--- a/mysql-test/main/strings.test
+++ b/mysql-test/main/strings.test
@@ -14,3 +14,4 @@ START SLAVE sql_thread;
--error ER_SLAVE_MUST_STOP
CHANGE MASTER TO master_user='user',master_password='pwd';
STOP SLAVE;
+RESET SLAVE ALL;