diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-24 20:01:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-24 20:01:37 +0100 |
| commit | 01b1eef23e1261805cd35d46be20e01d3d79bbd1 (patch) | |
| tree | d4d4e9419c0a01b7f54ef33bf21dd8c7463f1c4e /support-files | |
| parent | 31bf348449f35654bc5bab4a5e218862840c7a2c (diff) | |
| download | mariadb-git-01b1eef23e1261805cd35d46be20e01d3d79bbd1.tar.gz | |
MDEV-5831 Upgrade from MariaDB 5.5.36 via yum fails
Allow "rpm -q --whatprovides mysql-server" to return more than one row.
(all rows should be identical though)
support-files/rpm/server-prein.sh:
don't use "head -1" or "uniq" to avoid introducing new dependencies.
"sed" is already used in this script.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/rpm/server-prein.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/support-files/rpm/server-prein.sh b/support-files/rpm/server-prein.sh index 9194f2b0656..cf72aefb50f 100644 --- a/support-files/rpm/server-prein.sh +++ b/support-files/rpm/server-prein.sh @@ -3,6 +3,7 @@ installed=`rpm -q --whatprovides mysql-server 2> /dev/null` if [ $? -eq 0 -a -n "$installed" ]; then + installed=`echo "$installed"|sed -n -1p` vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1` version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` myvendor='%{mysql_vendor}' |