summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-05-04 16:03:52 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2011-05-04 16:03:52 +0200
commitaff371f662796e6313f39a163de858aaeb139d06 (patch)
tree405c5069306d480fcb987453b7dc0d46263d336f /mysql-test
parentc34e5a9152723c4b8c92c538ee4cc3082b24ea00 (diff)
downloadmariadb-git-aff371f662796e6313f39a163de858aaeb139d06.tar.gz
Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2
into 5.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/maria_make_snapshot_for_comparison.inc1
-rw-r--r--mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/maria_make_snapshot_for_comparison.inc b/mysql-test/include/maria_make_snapshot_for_comparison.inc
index cb756f60527..0c71bd10408 100644
--- a/mysql-test/include/maria_make_snapshot_for_comparison.inc
+++ b/mysql-test/include/maria_make_snapshot_for_comparison.inc
@@ -8,6 +8,7 @@
# cover tables mysqltest.$mms_tname1,...$mms_tnameN
connection admin;
+--source include/wait_until_connected_again.inc
let $mms_table_to_use=$mms_tables;
let $mms_purpose=comparison;
diff --git a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
index c204409de4d..8a2a99c28eb 100644
--- a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
+++ b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
@@ -11,6 +11,7 @@
connection admin;
+--source include/wait_until_connected_again.inc
let $mms_table_to_use=$mms_tables;
let $mms_purpose=feeding_recovery;