summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2014-12-12 10:58:38 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2014-12-12 10:58:38 -0500
commit48ed8ab2155b31d36358b2efd348f3036a294971 (patch)
tree0ca9b87d81af64eca60fca84145f63b6feeeb32e
parent263cf26e8b0c1a8505de54726ba23e1aacc479a4 (diff)
downloadmariadb-git-48ed8ab2155b31d36358b2efd348f3036a294971.tar.gz
MDEV-6891: Update company name
-rw-r--r--scripts/mysql_install_db.sh4
-rw-r--r--win/packaging/CMakeLists.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 52dae44c61f..1bdfb10863e 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -511,8 +511,8 @@ then
echo "The latest information about MariaDB is available at http://mariadb.org/."
echo "You can find additional information about the MySQL part at:"
echo "http://dev.mysql.com"
- echo "Support MariaDB development by buying support/new features from"
- echo "SkySQL Ab. You can contact us about this at sales@skysql.com".
+ echo "Support MariaDB development by buying support/new features from MariaDB"
+ echo "Corporation Ab. You can contact us about this at sales@mariadb.com."
echo "Alternatively consider joining our community based development effort:"
echo "http://mariadb.com/kb/en/contributing-to-the-mariadb-project/"
echo
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index 0b5e2f98f16..95547ac9f3a 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -17,7 +17,7 @@ IF(NOT WIN32)
RETURN()
ENDIF()
-SET(MANUFACTURER "Monty Program AB")
+SET(MANUFACTURER "MariaDB Corporation Ab")
FIND_PATH(WIX_DIR heat.exe
$ENV{WIX_DIR}/bin
$ENV{ProgramFiles}/wix/bin