summaryrefslogtreecommitdiff
path: root/mysql-test/main/backup_interaction.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-03-11 17:52:49 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-03-11 17:52:49 +0100
commitfad47df9957d754bec12d4d327c77ae04f71d903 (patch)
tree58aaf6077adcb0bc0003228d30bed59687527650 /mysql-test/main/backup_interaction.result
parent9d7ed94f6a526748eff29dae2939a3fd341f118b (diff)
parentb7362d5fbc37dec340aeacd1fb0967c4226c022a (diff)
downloadmariadb-git-fad47df9957d754bec12d4d327c77ae04f71d903.tar.gz
Merge branch '10.4' into 10.5
Diffstat (limited to 'mysql-test/main/backup_interaction.result')
-rw-r--r--mysql-test/main/backup_interaction.result24
1 files changed, 3 insertions, 21 deletions
diff --git a/mysql-test/main/backup_interaction.result b/mysql-test/main/backup_interaction.result
index 02ef0af070e..a6fe7cf448d 100644
--- a/mysql-test/main/backup_interaction.result
+++ b/mysql-test/main/backup_interaction.result
@@ -521,26 +521,8 @@ BACKUP STAGE END;
CREATE OR REPLACE TABLE t1 (pk INT PRIMARY KEY, f INT);
BACKUP STAGE START;
FLUSH TABLE t1 FOR EXPORT;
-UNLOCK TABLES;
-BACKUP STAGE END;
-DROP TABLE t1;
-CREATE TABLE t1 (a INT);
-BACKUP STAGE START;
-FLUSH TABLE t1 FOR EXPORT;
-UNLOCK TABLES;
-connect con1,localhost,root,,test;
-BACKUP STAGE START;
-connection default;
-BACKUP STAGE END;
-connection con1;
-BACKUP STAGE END;
-disconnect con1;
-connection default;
-DROP TABLE t1;
-CREATE TABLE t1 (a INT);
-BACKUP STAGE START;
-FLUSH TABLES t1 WITH READ LOCK;
-UNLOCK TABLES;
-BACKUP STAGE BLOCK_COMMIT;
+ERROR HY000: Can't execute the command as you have a BACKUP STAGE active
+FLUSH TABLE t1 WITH READ LOCK;
+ERROR HY000: Can't execute the command as you have a BACKUP STAGE active
BACKUP STAGE END;
DROP TABLE t1;