diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_dbi_dbd-mariadb.inc (renamed from mysql-test/include/have_dbi_dbd-mysql.inc) | 10 | ||||
| -rw-r--r-- | mysql-test/include/mysqlhotcopy.inc | 4 | ||||
| -rwxr-xr-x | mysql-test/std_data/checkDBI_DBD-MariaDB.pl (renamed from mysql-test/std_data/checkDBI_DBD-mysql.pl) | 26 |
3 files changed, 20 insertions, 20 deletions
diff --git a/mysql-test/include/have_dbi_dbd-mysql.inc b/mysql-test/include/have_dbi_dbd-mariadb.inc index 7c2113a8109..1495d2891c8 100644 --- a/mysql-test/include/have_dbi_dbd-mysql.inc +++ b/mysql-test/include/have_dbi_dbd-mariadb.inc @@ -1,7 +1,7 @@ # # Originally created by John Embretsen, 2011-01-26. # -# Checks for the existence of Perl modules DBI and DBD::mysql as seen from the +# Checks for the existence of Perl modules DBI and DBD::MariaDB as seen from the # perl installation used by "external" executable perl scripts, i.e. scripts # that are executed as standalone scripts interpreted by the perl installation # specified by the "shebang" line in the top of these scripts. @@ -30,7 +30,7 @@ # We jump through some hoops since there is no direct way to check if an # external command went OK or not from a mysql-test file: # -# - In theory, we could do as simple as "exec perl -MDBI -MDBD::mysql -e 1", +# - In theory, we could do as simple as "exec perl -MDBI -MDBD::MariaDB -e 1", # however we cannot check the result (exit code) from within a test script. # Also, this may not yield the same result as other uses of perl due to the # shebang issue mentioned above. @@ -55,8 +55,8 @@ # Instead, we call a separate helper script which checks for the modules in its # own environment. We call it without "perl" in front. ---let $perlChecker= $MYSQLTEST_VARDIR/std_data/checkDBI_DBD-mysql.pl ---let $resultFile= $MYSQL_TMP_DIR/dbidbd-mysql.txt +--let $perlChecker= $MYSQLTEST_VARDIR/std_data/checkDBI_DBD-MariaDB.pl +--let $resultFile= $MYSQL_TMP_DIR/dbiDBD-MariaDB.txt --exec perl $perlChecker @@ -64,7 +64,7 @@ --source $resultFile if (!$dbidbd) { - --skip Test needs Perl modules DBI and DBD::mysql + --skip Test needs Perl modules DBI and DBD::MariaDB } # Clean up diff --git a/mysql-test/include/mysqlhotcopy.inc b/mysql-test/include/mysqlhotcopy.inc index 2fc14d599d9..306f0acc208 100644 --- a/mysql-test/include/mysqlhotcopy.inc +++ b/mysql-test/include/mysqlhotcopy.inc @@ -4,7 +4,7 @@ --source include/not_windows.inc --source include/not_embedded.inc ---source include/have_dbi_dbd-mysql.inc +--source include/have_dbi_dbd-mariadb.inc if (!$MYSQLHOTCOPY) { @@ -19,7 +19,7 @@ if (!$MYSQLHOTCOPY) # executable, i.e. not necessarily using the perl interpreter in PATH, # because that is how the documentation demonstrates it. # -# We include have_dbi_dbd-mysql.inc above so that the test will +# We include have_dbi_dbd-mariadb.inc above so that the test will # be skipped if Perl modules required by the mysqlhotcopy tool are not # found when the script is run this way. diff --git a/mysql-test/std_data/checkDBI_DBD-mysql.pl b/mysql-test/std_data/checkDBI_DBD-MariaDB.pl index 328a7ad774f..ed0f5b415d7 100755 --- a/mysql-test/std_data/checkDBI_DBD-mysql.pl +++ b/mysql-test/std_data/checkDBI_DBD-MariaDB.pl @@ -20,7 +20,7 @@ ################################################################################ # # This perl script checks for availability of the Perl modules DBI and -# DBD::mysql using the "current" perl interpreter. +# DBD::MariaDB using the "current" perl interpreter. # # Useful for test environment checking before testing executable perl scripts # in the MySQL Server distribution. @@ -30,8 +30,8 @@ # support running perl scripts with such a shebang without specifying the # perl interpreter on the command line. Such a script is mysqlhotcopy. # -# When run as "checkDBI_DBD-mysql.pl" the shebang line will be evaluated -# and used. When run as "perl checkDBI_DBD-mysql.pl" the shebang line is +# When run as "checkDBI_DBD-MariaDB.pl" the shebang line will be evaluated +# and used. When run as "perl checkDBI_DBD-MariaDB.pl" the shebang line is # not used. # # NOTE: This script will create a temporary file in MTR's tmp dir. @@ -43,13 +43,13 @@ # # Example: # -# --let $perlChecker= $MYSQLTEST_VARDIR/std_data/checkDBI_DBD-mysql.pl -# --let $resultFile= $MYSQL_TMP_DIR/dbidbd-mysql.txt +# --let $perlChecker= $MYSQLTEST_VARDIR/std_data/checkDBI_DBD-MariaDB.pl +# --let $resultFile= $MYSQL_TMP_DIR/dbiDBD-MariaDB.txt # --chmod 0755 $perlChecker # --exec $perlChecker # --source $resultFile # if (!$dbidbd) { -# --skip Test needs Perl modules DBI and DBD::mysql +# --skip Test needs Perl modules DBI and DBD::MariaDB # } # # The calling script is also responsible for cleaning up after use: @@ -59,7 +59,7 @@ # Windows notes: # - shebangs may work differently - call this script with "perl " in front. # -# See mysql-test/include/have_dbi_dbd-mysql.inc for example use of this script. +# See mysql-test/include/have_dbi_dbd-mariadb.inc for example use of this script. # This script should be executable for the user running MTR. # ################################################################################ @@ -69,13 +69,13 @@ BEGIN { # We need to catch "Can't locate" as well as "Can't load" errors. eval{ $FOUND_DBI=0; - $FOUND_DBD_MYSQL=0; + $FOUND_DBD_MARIADB=0; # Check for DBI module: $FOUND_DBI=1 if require DBI; - # Check for DBD::mysql module - $FOUND_DBD_MYSQL=1 if require DBD::mysql; + # Check for DBD::MariaDB module + $FOUND_DBD_MARIADB=1 if require DBD::MariaDB; }; }; @@ -83,11 +83,11 @@ BEGIN { # The file must be created whether we write to it or not, otherwise mysql-test # will complain if trying to source it. # An empty file indicates failure to load modules. -open(FILE, ">", $ENV{'MYSQL_TMP_DIR'}.'/dbidbd-mysql.txt'); +open(FILE, ">", $ENV{'MYSQL_TMP_DIR'}.'/dbiDBD-MariaDB.txt'); -if ($FOUND_DBI && $FOUND_DBD_MYSQL) { +if ($FOUND_DBI && $FOUND_DBD_MARIADB) { # write a mysql-test command setting a variable to indicate success - print(FILE 'let $dbidbd= FOUND_DBI_DBD-MYSQL;'."\n"); + print(FILE 'let $dbidbd= FOUND_DBI_DBD-MARIADB;'."\n"); } # close the file. |