diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-16 13:35:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-16 13:35:28 +0200 |
| commit | 33656e042dc7e983c9612a011fdef64a8dd40aa1 (patch) | |
| tree | 51dc8cad3ff74d2509255c4e7f8ba2c7a7a18c7c | |
| parent | f18b1400d13a9ba9b4c2df96a20b9ca7e0f5ffb9 (diff) | |
| download | mariadb-git-33656e042dc7e983c9612a011fdef64a8dd40aa1.tar.gz | |
for mysql-test: fix mysqlhotcopy script to return a predictable exit code
| -rw-r--r-- | mysql-test/include/mysqlhotcopy.inc | 2 | ||||
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 3 |
2 files changed, 4 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 diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 1ef743725e5..b6ff7e1b28d 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -56,6 +56,9 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome. # Documentation continued at end of file +# fix CORE::GLOBAL::die to return a predictable exit code +BEGIN { *CORE::GLOBAL::die= sub { warn @_; exit 1; }; } + my $VERSION = "1.23"; my $opt_tmpdir = $ENV{TMPDIR} || "/tmp"; |