diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
| commit | 0632b8034b08c88176dc7db12ba53df04edd9300 (patch) | |
| tree | 5047cc21a5cab2318bd8421f85f56b3e201ddd4a /mysql-test/suite/mariabackup | |
| parent | 503fd2115bdc79f0b005917e058855411fdeb691 (diff) | |
| parent | 1fbdcada73c1861b85080eede95140296d6a3c20 (diff) | |
| download | mariadb-git-0632b8034b08c88176dc7db12ba53df04edd9300.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/mariabackup')
| -rw-r--r-- | mysql-test/suite/mariabackup/backup_lock_wait_timeout.result | 11 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/backup_lock_wait_timeout.test | 28 |
2 files changed, 39 insertions, 0 deletions
diff --git a/mysql-test/suite/mariabackup/backup_lock_wait_timeout.result b/mysql-test/suite/mariabackup/backup_lock_wait_timeout.result new file mode 100644 index 00000000000..9806bc29b47 --- /dev/null +++ b/mysql-test/suite/mariabackup/backup_lock_wait_timeout.result @@ -0,0 +1,11 @@ +CREATE TABLE t(i INT) ENGINE INNODB; +connect con1,localhost,root,,; +BEGIN; +LOCK TABLES t WRITE; +connection default; +# xtrabackup backup +connection con1; +COMMIT; +connection default; +disconnect con1; +DROP TABLE t; diff --git a/mysql-test/suite/mariabackup/backup_lock_wait_timeout.test b/mysql-test/suite/mariabackup/backup_lock_wait_timeout.test new file mode 100644 index 00000000000..e0f43910ef6 --- /dev/null +++ b/mysql-test/suite/mariabackup/backup_lock_wait_timeout.test @@ -0,0 +1,28 @@ +--source include/have_innodb.inc +--source include/count_sessions.inc + +CREATE TABLE t(i INT) ENGINE INNODB; + +connect (con1,localhost,root,,); +BEGIN; +LOCK TABLES t WRITE; + +--connection default + +echo # xtrabackup backup; +let $targetdir=$MYSQLTEST_VARDIR/tmp/backup; + +--disable_result_log +--error 1 +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --ftwrl-wait-timeout=1 --target-dir=$targetdir; +--enable_result_log + +--connection con1 +COMMIT; + +--connection default +--disconnect con1 + +DROP TABLE t; +rmdir $targetdir; +--source include/wait_until_count_sessions.inc |