diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
| commit | 30914389fe9ca13cf29470dd033a5cf6997a3931 (patch) | |
| tree | fac7ab85411e556db4759a9a2c063ef27b851f87 /support-files | |
| parent | 772e3f61eb2956143bbdb1d85490bd5aad73d43c (diff) | |
| parent | 098c0f2634a35e24e9eb0f06d3fba69d0d097657 (diff) | |
| download | mariadb-git-30914389fe9ca13cf29470dd033a5cf6997a3931.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/rpm/server-prein.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support-files/rpm/server-prein.sh b/support-files/rpm/server-prein.sh index 9f8d1229bfd..d6f77c29e49 100644 --- a/support-files/rpm/server-prein.sh +++ b/support-files/rpm/server-prein.sh @@ -4,8 +4,8 @@ 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 | sed 's/Monty Program AB/MariaDB Foundation/'` - version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` + vendor=`rpm -q --queryformat='%''{VENDOR}' "$installed" 2>&1 | sed 's/Monty Program AB/MariaDB Foundation/'` + version=`rpm -q --queryformat='%''{VERSION}' "$installed" 2>&1` myvendor='%{mysql_vendor}' myversion='%{mysqlversion}' |