From 498c86fbbfc4aa034758693309dd97b7ca4ef4f0 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 26 May 2016 12:17:26 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/lib/update.lib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index a6bb42d..6408c18 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -128,7 +128,7 @@
if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') {
echo "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n";
echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\n\n";
- echo"to the mysqld-section in /etc/mysql/my.cnf and restart mysqld afterwards\n";
+ echo"to the mysqld-section in your mysql-config and restart mysqld afterwards\n";
die();
}
--
Gitblit v1.9.1