git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@629 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog.txt

@@ -1,14 +1,13 @@
 Date	Added
 
-12/19
+12/18
+	* Fixed import command in inter_athena.conf file [Ajarn]
 	* Fixed a few command compiling problems for TXT [Codemaster]
 	* Modified the main.sql to add the friend0 column; also added the upgrade_1.0.0.sql file [Codemaster]
 	* Introduced StringBuf into utils for use in building larger queries [MouseJstr]
 	* tested GUILD_CACHE (reducing guild related sql traffic to 30%) in 
 	  prep for unleasing it on the sql using public [MouseJstr]
 	* Fixed some SQL queries crashing char server [davidsiaw]
-
-12/18
 	* Added several PID GM commands, thanks to Dino9021 [nsstrunks]
 	* Storage was merging items incorrectly [Mousejstr]
 	* eliminated a uninitialized var when using afm maps [MouseJstr]

src/char_sql/char.c

@@ -2954,7 +2954,11 @@ void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
 		}else if(strcmpi(w1,"lowest_gm_level")==0){
 			lowest_gm_level = atoi(w2);
 			printf("set lowest_gm_level : %s\n",w2);
+		//support the import command, just like any other config
+		}else if(strcmpi(w1,"import")==0){
+			sql_config_read(w2);
 		}
+
 	}
 	fclose(fp);
 	printf("reading configure done.....\n");

src/login_sql/login.c

@@ -1741,9 +1741,13 @@ void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
 		else if (strcmpi(w1, "loginlog_db") == 0) {
 			strcpy(loginlog_db, w2);
 		}
-        }
+		//support the import command, just like any other config
-        fclose(fp);
+		else if(strcmpi(w1,"import")==0){
-        printf("reading configure done.....\n");
+			sql_config_read(w2);
+		}
+	}
+	fclose(fp);
+	printf("reading configure done.....\n");
 }
 
 

src/map/map.c

@@ -2116,6 +2116,9 @@ int sql_config_read(char *cfgName)
 			strcpy(log_db_pw, w2);
 		} else if(strcmpi(w1,"log_db_port")==0) {
 			log_db_port = atoi(w2);
+		//support the import command, just like any other config
+		} else if(strcmpi(w1,"import")==0){
+			sql_config_read(w2);
 		}
 	}
 	fclose(fp);