diff options
| author | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-11-21 01:31:23 +0000 |
|---|---|---|
| committer | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-11-21 01:31:23 +0000 |
| commit | 2d7e6c5e2d292b1f4cc48e0b8de88c03483d0ff6 (patch) | |
| tree | 64bf56fa838d8a3ce0885608a21c0f947ae4b6a9 /src/mysql.c | |
| parent | cad9c9365d314e9dda8513d22e16c1509f41141f (diff) | |
BUILD : 1.7.6 (456) BUGS : N/A NOTES : Disables UseRDB if SQL fails to init
git-svn-id: svn://svn.anope.org/anope/trunk@456 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@310 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/mysql.c')
| -rw-r--r-- | src/mysql.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/mysql.c b/src/mysql.c index e9827e7fb..707515113 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -54,11 +54,12 @@ int db_mysql_init() /* If the host is not defined, assume we don't want MySQL */ if (!MysqlHost) { do_mysql = 0; - alog("MySQL has been disabled."); + alog("MySQL: has been disabled."); + return 0; } else { do_mysql = 1; - alog("MySQL has been enabled."); - alog("MySQL client version %s.",mysql_get_client_info()); + alog("MySQL: has been enabled."); + alog("MySQL: client version %s.",mysql_get_client_info()); } /* The following configuration options are required. @@ -68,10 +69,13 @@ int db_mysql_init() if ((do_mysql) && (!MysqlName || !MysqlUser)) { do_mysql = 0; alog("MySQL Error: Set all required configuration options."); + return 0; } - if (!db_mysql_open()) + if (!db_mysql_open()) { do_mysql = 0; + return 0; + } return 1; } @@ -95,14 +99,14 @@ int db_mysql_open() if ((!mysql_real_connect (mysql, MysqlHost, MysqlUser, MysqlPass, MysqlName, MysqlPort, MysqlSock, 0))) { - log_perror("Cant connect to MySQL: %s\n", mysql_error(mysql)); + log_perror("MySQL Error: Cant connect to MySQL: %s\n", mysql_error(mysql)); return 0; } } else { if ((!mysql_real_connect (mysql, MysqlHost, MysqlUser, MysqlPass, MysqlName, MysqlPort, NULL, 0))) { - log_perror("Cant connect to MySQL: %s\n", mysql_error(mysql)); + log_perror("MySQL Error: Cant connect to MySQL: %s\n", mysql_error(mysql)); return 0; } } |