summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/map.c7
2 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1bd66fea0..50badae50 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/01
+ * Added a missing mysql_init call to the mapreg sql handle. [Skotlex]
* Checked and fixed the script engine barking when you try to have a label
with the same name as a const.txt defined parameter. [Skotlex]
* Turn Undead and Offensive Resurrection should now work on undead players.
diff --git a/src/map/map.c b/src/map/map.c
index bf77e213d..429c1b85a 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3542,11 +3542,12 @@ int map_sql_init(void){
#ifdef MAPREGSQL
// [zBuffer] SQL Mapreg connection start
ShowInfo("Connect Mapreg DB Server....\n");
- if(!mysql_real_connect(&mapregsql_handle, map_server_ip, map_server_id, map_server_pw,
+ mysql_init(&mapregsql_handle);
+ if(!mysql_real_connect(&mapregsql_handle, map_server_ip, map_server_id, map_server_pw,
map_server_db ,map_server_port, (char *)NULL, 0)) {
//pointer check
- ShowSQL("DB error - %s\n",mysql_error(&mapregsql_handle));
- exit(1);
+ ShowSQL("DB error - %s\n",mysql_error(&mapregsql_handle));
+ exit(1);
} else {
ShowStatus ("Connect success! (Mapreg DB Connection)\n");
if( strlen(default_codepage) > 0 ) {