rpms/perl-DBD-MariaDB
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update setup script to work with MariaDB 10.4

Browse Source
This commit is contained in:
Jitka Plesnikova 2020-02-04 12:59:30 +01:00
parent 6061d9bbb4
commit 31466206db
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
perl-DBD-MariaDB.spec
View File

@ -1,6 +1,6 @@
Name: perl-DBD-MariaDB
Version: 1.21
Release: 5%{?dist}
Release: 6%{?dist}
Summary: MariaDB and MySQL driver for the Perl5 Database Interface (DBI)
License: GPL+ or Artistic
URL: https://metacpan.org/release/DBD-MariaDB/
@ -91,6 +91,9 @@ make test
%{_mandir}/man3/*
%changelog
* Tue Feb 04 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.21-6
- Update setup script to work with MariaDB 10.4
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

8
test-setup.t
View File

@ -22,7 +22,7 @@ my $DBD_MARIADB_TESTPASSWORD = $ENV{'DBD_MARIADB_TESTPASSWORD'};
my $MYSQLD = '';
my $mysql_version = readpipe("mysql --version");
if ($mysql_version =~ /MariaDB/) {
system("mysql_install_db --no-defaults --datadir=$MYSQL_DIR --force --skip-name-resolve --explicit_defaults_for_timestamp --user=$MYSQL_USER >/dev/null 2>&1");
system("mysql_install_db --no-defaults --datadir=$MYSQL_DIR --force --skip-name-resolve --explicit_defaults_for_timestamp >/dev/null 2>&1");
ok($? >> 8 == 0);
$MYSQLD = '/usr/libexec/mysqld';
} else {
@ -50,11 +50,11 @@ while (system("/usr/bin/mysqladmin --user=root --socket=$MYSQL_UNIX_PORT ping >/
}
ok(1);
system("mysql --user=root --socket=$MYSQL_UNIX_PORT --execute \"CREATE USER '$DBD_MARIADB_TESTUSER\@localhost';\" 2>&1");
system("mysql --socket=$MYSQL_UNIX_PORT --execute \"CREATE USER '$DBD_MARIADB_TESTUSER\@localhost';\" 2>&1");
ok($? >> 8 == 0);
system("mysql --user=root --socket=$MYSQL_UNIX_PORT --execute \"CREATE DATABASE IF NOT EXISTS $DBD_MARIADB_TESTDB CHARACTER SET='utf8mb4';\" 2>&1");
system("mysql --socket=$MYSQL_UNIX_PORT --execute \"CREATE DATABASE IF NOT EXISTS $DBD_MARIADB_TESTDB CHARACTER SET='utf8mb4';\" 2>&1");
ok($? >> 8 == 0);
system("mysql --user=root --socket=$MYSQL_UNIX_PORT --execute \"GRANT ALL PRIVILEGES ON $DBD_MARIADB_TESTDB.* TO '$DBD_MARIADB_TESTUSER\@localhost' IDENTIFIED BY '$DBD_MARIADB_TESTPASSWORD';\" 2>&1");
system("mysql --socket=$MYSQL_UNIX_PORT --execute \"GRANT ALL PRIVILEGES ON $DBD_MARIADB_TESTDB.* TO '$DBD_MARIADB_TESTUSER\@localhost' IDENTIFIED BY '$DBD_MARIADB_TESTPASSWORD';\" 2>&1");
ok($? >> 8 == 0);
system("/usr/bin/mysqladmin --user=$DBD_MARIADB_TESTUSER --password=$DBD_MARIADB_TESTPASSWORD --socket=$DBD_MARIADB_TESTSOCKET ping >/dev/null 2>&1");
ok($? >> 8 == 0);