diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-02 08:20:45 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-02 08:20:45 +0000 |
| commit | b8349f39d66be3df5d81e9ac2a0ff5b4a1dcdd88 (patch) | |
| tree | 888e9ec029e9a6ca560f3c803ed3279c705925d9 | |
| parent | 015f59b21a12cf22db7351f1e9ce8c41e03cd216 (diff) | |
| download | hercules-b8349f39d66be3df5d81e9ac2a0ff5b4a1dcdd88.tar.gz hercules-b8349f39d66be3df5d81e9ac2a0ff5b4a1dcdd88.tar.bz2 hercules-b8349f39d66be3df5d81e9ac2a0ff5b4a1dcdd88.tar.xz hercules-b8349f39d66be3df5d81e9ac2a0ff5b4a1dcdd88.zip | |
* Mapregsql will now fully depend on mmysql_handle.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5421 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/script.c | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7c1c7692c..9d4df8fca 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
+ * Mapregsql will now fully depend on mmysql_handle. [Lance]
* Optimized strcharinfo to use switch. [Lance]
* Some cleanup of the mob skill reading. Added error reporting for unknown
states/conditions, error reporting now specifies the file and line number.
diff --git a/src/map/script.c b/src/map/script.c index 5b9a3a2b3..e439f44c2 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10522,13 +10522,13 @@ static int script_load_mapreg(void) int perfomance = gettick_nocache();
sprintf(tmp_sql,"SELECT * FROM `%s`",mapregsql_db);
ShowInfo("Querying script_load_mapreg ...\n");
- if(mysql_query(&mapregsql_handle, tmp_sql) ) {
- ShowSQL("DB error - %s\n",mysql_error(&mapregsql_handle));
+ if(mysql_query(&mmysql_handle, tmp_sql) ) {
+ ShowSQL("DB error - %s\n",mysql_error(&mmysql_handle));
ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
return -1;
}
ShowInfo("Success! Returning results ...\n");
- mapregsql_res = mysql_store_result(&mapregsql_handle);
+ mapregsql_res = mysql_store_result(&mmysql_handle);
if (mapregsql_res) {
while ((mapregsql_row = mysql_fetch_row(mapregsql_res))) {
char buf1[33], *p = NULL;
@@ -10578,8 +10578,8 @@ static int script_save_mapreg_intsub(DBKey key,void *data,va_list ap) char *name=str_buf+str_data[num].str;
if ( name[1] != '@') {
sprintf(tmp_sql,"UPDATE `%s` SET `%s`='%d' WHERE `%s`='%s' AND `%s`='%d'",mapregsql_db,mapregsql_db_value,(int)data,mapregsql_db_varname,name,mapregsql_db_index,i);
- if(mysql_query(&mapregsql_handle, tmp_sql) ) {
- ShowSQL("DB error - %s\n",mysql_error(&mapregsql_handle));
+ if(mysql_query(&mmyregsql_handle, tmp_sql) ) {
+ ShowSQL("DB error - %s\n",mysql_error(&mmyregsql_handle));
ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
}
}
@@ -10605,8 +10605,8 @@ static int script_save_mapreg_strsub(DBKey key,void *data,va_list ap) char *name=str_buf+str_data[num].str;
if ( name[1] != '@') {
sprintf(tmp_sql,"UPDATE `%s` SET `%s`='%s' WHERE `%s`='%s' AND `%s`='%d'",mapregsql_db,mapregsql_db_value,jstrescapecpy(tmp_str2,(char *)data),mapregsql_db_varname,name,mapregsql_db_index,i);
- if(mysql_query(&mapregsql_handle, tmp_sql) ) {
- ShowSQL("DB error - %s\n",mysql_error(&mapregsql_handle));
+ if(mysql_query(&mmyregsql_handle, tmp_sql) ) {
+ ShowSQL("DB error - %s\n",mysql_error(&mmyregsql_handle));
ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
}
}
|