summaryrefslogtreecommitdiff
path: root/mysql-test/include/mysqlhotcopy.inc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2014-10-09 17:25:08 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2014-10-09 17:25:08 -0400
commit068fb8569f2300e4a5c08413a756417d923ecf5f (patch)
treeab008f1be51ee322cbeeb5aa73042430a6e63347 /mysql-test/include/mysqlhotcopy.inc
parent59277a7d83374bc293cd58f8be509a81792d829e (diff)
parentdbda20caffbb22115b6f30069b716bc505c49d11 (diff)
downloadmariadb-git-068fb8569f2300e4a5c08413a756417d923ecf5f.tar.gz
bzr merge -rtag:mariadb-5.5.40 maria/5.5
Diffstat (limited to 'mysql-test/include/mysqlhotcopy.inc')
-rw-r--r--mysql-test/include/mysqlhotcopy.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/mysqlhotcopy.inc b/mysql-test/include/mysqlhotcopy.inc
index 779ed7f36e0..f775d782b28 100644
--- a/mysql-test/include/mysqlhotcopy.inc
+++ b/mysql-test/include/mysqlhotcopy.inc
@@ -109,7 +109,7 @@ DROP DATABASE hotcopy_save;
--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
--list_files $MYSQLD_DATADIR/hotcopy_save
--replace_result $MASTER_MYSOCK MASTER_MYSOCK
---error 9,11,2304
+--error 1
--exec $MYSQLHOTCOPY --quiet -S $MASTER_MYSOCK -u root hotcopy_test hotcopy_save
--replace_result $MASTER_MYSOCK MASTER_MYSOCK
--exec $MYSQLHOTCOPY --quiet --allowold -S $MASTER_MYSOCK -u root hotcopy_test hotcopy_save