* Removed the inter_athena.conf maildb settings as they are not required anymore.

- MailDB is now an integral part of the MainDB.
- To Server Admins, use mysql tools to move your mail data to the new structure.
- You can get the maildb structure from main.sql.
- Renamed some vars (recomendation of Ultramage :D)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11557 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 0 insertions, 42 deletions

diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index e37c258a1..739b458be 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -27,7 +27,6 @@
 
 Sql* sql_handle = NULL;
 Sql* lsql_handle = NULL;
-Sql* mail_handle = NULL;
 
 int char_server_port = 3306;
 char char_server_ip[32] = "127.0.0.1";
@@ -42,12 +41,6 @@ char login_server_id[32] = "ragnarok";
 char login_server_pw[32] = "ragnarok";
 char login_server_db[32] = "ragnarok";
 
-int mail_server_port = 3306;
-char mail_server_ip[32] = "127.0.0.1";
-char mail_server_id[32] = "ragnarok";
-char mail_server_pw[32] = "ragnarok";
-char mail_server_db[32] = "ragnarok";
-
 #ifndef TXT_SQL_CONVERT
 
 static struct accreg *accreg_pt;
@@ -278,28 +271,6 @@ static int inter_config_read(const char* cfgName)
 			strcpy(login_server_db, w2);
 			ShowStatus ("set login_server_db : %s\n", w2);
 		}
-		// MAIL SYSTEM
-		else
-		if(!strcmpi(w1,"mail_server_ip")) {
-			strcpy(mail_server_ip, w2);
-			ShowStatus ("set mail_server_ip : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"mail_server_port")) {
-			mail_server_port = atoi(w2);
-			ShowStatus ("set mail_server_port : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"mail_server_id")) {
-			strcpy(mail_server_id, w2);
-			ShowStatus ("set mail_server_id : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"mail_server_pw")) {
-			strcpy(mail_server_pw, w2);
-			ShowStatus ("set mail_server_pw : %s\n", w2);
-		} else
-		if(!strcmpi(w1,"mail_server_db")) {
-			strcpy(mail_server_db, w2);
-			ShowStatus ("set mail_server_db : %s\n", w2);
-		}
 #ifndef TXT_SQL_CONVERT
 		else if(!strcmpi(w1,"party_share_level"))
 			party_share_level = atoi(w2);
@@ -344,7 +315,6 @@ int inter_sql_ping(int tid, unsigned int tick, int id, int data)
 {
 	ShowInfo("Pinging SQL server to keep connection alive...\n");
 	Sql_Ping(sql_handle);
-	Sql_Ping(mail_handle);
 	if( char_gm_read )
 		Sql_Ping(lsql_handle);
 	return 0;
@@ -389,16 +359,6 @@ int inter_init_sql(const char *file)
 		Sql_Free(sql_handle);
 		exit(EXIT_FAILURE);
 	}
-	// MAIL SYSTEM
-	mail_handle = Sql_Malloc();
-	ShowInfo("Connect Mail DB server.... (Character Server)\n");
-	if ( SQL_ERROR == Sql_Connect(mail_handle, mail_server_id, mail_server_pw, mail_server_ip, (uint16)mail_server_port, mail_server_db) )
-	{
-		Sql_ShowDebug(mail_handle);
-		Sql_Free(mail_handle);
-		Sql_Free(sql_handle);
-		exit(EXIT_FAILURE);
-	}
 #ifndef TXT_SQL_CONVERT
 	else if (inter_sql_test()) {
 		ShowStatus("Connect Success! (Character Server)\n");
@@ -411,7 +371,6 @@ int inter_init_sql(const char *file)
 		{
 			Sql_ShowDebug(lsql_handle);
 			Sql_Free(lsql_handle);
-			Sql_Free(mail_handle);
 			Sql_Free(sql_handle);
 			exit(EXIT_FAILURE);
 		}
@@ -472,7 +431,6 @@ int inter_sql_test (void)
 			ShowSQL ("Field `%s` not be found in `%s`. Consider updating your database!\n", fields[i], char_db);
 			if( lsql_handle )
 				Sql_Free(lsql_handle);
-			Sql_Free(mail_handle);
 			Sql_Free(sql_handle);
 			exit(EXIT_FAILURE);
 		}