summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b <ribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-09-17 18:23:48 +0000
committerribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b <ribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-09-17 18:23:48 +0000
commitaa896a87ac4705a5a8a26cbf5ddae2db3fc54c62 (patch)
treeb06ccbdd1f52331afd61d533e435f01dbdfe74c1
parent6c710bb9df84b74195f3ab6d45a8487ee7a68cce (diff)
BUILD : 1.7.5 (350) BUGS : NOTES : Changed mysql init checks so they are only done if mysql is enabled. Many Thanks to DrStein for the patch.
git-svn-id: svn://svn.anope.org/anope/trunk@350 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@226 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/mysql.c2
-rw-r--r--version.log7
3 files changed, 8 insertions, 2 deletions
diff --git a/Changes b/Changes
index efe12c735..9d4ee4b0f 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version S V N
Provided by Anope Dev. <dev@anope.org> - 2004
08/24 A New -l option for am script to list possible selectors. [ #00]
09/08 A Removed rand() and ported bsd's arc4random() to fit our needs. [ #00]
+09/17 F Fixed MySQL error, whereby checks are only done if mysql is on. [ #00]
09/14 F Fixed /os MODE by joining nested ifs into one. [ #00]
09/14 F Protection unsetting now does -a instead of +a. [ #00]
09/12 F Updated Dutch language file. [ #00]
diff --git a/src/mysql.c b/src/mysql.c
index 7be2b5d40..896eb9216 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -64,7 +64,7 @@ int db_mysql_init()
* If missing disable MySQL to avoid any problems.
*/
- if (!MysqlName || !MysqlUser) {
+ if ((do_mysql) && (!MysqlName || !MysqlUser)) {
do_mysql = 0;
alog("MySQL Error: Set all required configuration options.");
}
diff --git a/version.log b/version.log
index 7d2773e24..13354f10f 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,15 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="5"
-VERSION_BUILD="349"
+VERSION_BUILD="350"
# $Log$
#
+# BUILD : 1.7.5 (350)
+# BUGS :
+# NOTES : Changed mysql init checks so they are only done if mysql is
+# enabled. Many Thanks to DrStein for the patch.
+#
# BUILD : 1.7.5 (349)
# BUGS :
# NOTES : Gave the Doc a mail addy