From d5959780aaa66b229df406e6343d0ef1b4d36750 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Sun, 16 Oct 2011 22:46:11 +0300
Subject: Remove extra MariaDB- from binary tar.gz file name Print server
 version name to .err file on crash

scripts/make_binary_distribution.sh:
  Remove extra MariaDB- from binary tar.gz file name
sql/mysqld.cc:
  Print server version name to .err file on crash (to ensure people paste also that when they report a crash)
---
 scripts/make_binary_distribution.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 733dd4ef3e6..789f3e3ce2e 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -169,6 +169,7 @@ esac
 VERSION_NAME=@VERSION@
 case $VERSION_NAME in
   *-ndb-* )  VERSION_NAME=`echo $VERSION_NAME | sed -e 's/[.0-9]*-ndb-//'` ;;
+  *-MariaDB-* ) VERSION_NAME=`echo $VERSION_NAME | sed -e 's/-MariaDB//'` ;;
 esac
 if [ x"$SHORT_PRODUCT_TAG" != x"" ] ; then
   NEW_NAME=mariadb-$SHORT_PRODUCT_TAG-$VERSION_NAME-$PLATFORM$SUFFIX
-- 
cgit v1.2.1