mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

mysqlhotcopy tests fixed.

Browse source 
The include/mysqlhotcopy.inc had an error in the 'if' condition, so it failed
if the mysqlhotcopy tool was found.

per-file comments:
  mysql-test/include/mysqlhotcopy.inc
        test should proceed exactly if the mysqlhotcopy was set.
  mysql-test/mysql-test-run.pl
        don't set the MYSQL_HOTCOPY variable if no mysqlhotcopy was found.
This commit is contained in:
Alexey Botchkov 2010-08-23 13:48:27 +05:00
commit c83ff21e9b
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/include/mysqlhotcopy.inc
View file

@ -5,7 +5,7 @@
--source include/not_windows.inc --source include/not_windows.inc
--source include/not_embedded.inc --source include/not_embedded.inc
if ($MYSQLHOTCOPY) if (!$MYSQLHOTCOPY)
{ {
die due to missing mysqlhotcopy tool; die due to missing mysqlhotcopy tool;
} }

5
mysql-test/mysql-test-run.pl
View file

@ -2158,7 +2158,10 @@ sub environment_setup {
mtr_pl_maybe_exists("$bindir/scripts/mysqlhotcopy"); mtr_pl_maybe_exists("$bindir/scripts/mysqlhotcopy");
# Since mysqltest interprets the real path as "false" in an if, # Since mysqltest interprets the real path as "false" in an if,
# use 1 ("true") to indicate "not exists" so it can be tested for # use 1 ("true") to indicate "not exists" so it can be tested for
$ENV{'MYSQLHOTCOPY'}= $mysqlhotcopy || 1; if ($mysqlhotcopy)
{
$ENV{'MYSQLHOTCOPY'}= $mysqlhotcopy;
}
# ---------------------------------------------------- # ----------------------------------------------------
# perror # perror