summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-08 16:11:02 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-08 16:11:02 +0000
commit6f2e4dfb3150a1fc833e57b6a0c8c7e13469f567 (patch)
tree0f4c0c0bf2ef235194cb12b53f6d5f06df1ff171
parent0f130e615463dfa6150d097c72a4612868e180f5 (diff)
downloadhercules-6f2e4dfb3150a1fc833e57b6a0c8c7e13469f567.tar.gz
hercules-6f2e4dfb3150a1fc833e57b6a0c8c7e13469f567.tar.bz2
hercules-6f2e4dfb3150a1fc833e57b6a0c8c7e13469f567.tar.xz
hercules-6f2e4dfb3150a1fc833e57b6a0c8c7e13469f567.zip
* Script command 'query_logsql' now throws a warning when SQL logs are disabled (related r11892).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14811 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7a6707d6c..75c1300ca 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/05/08
+ * Script command 'query_logsql' now throws a warning when SQL logs are disabled (related r11892). [Ai4rei]
* Updated/revised description of instance-related script commands (bugreport:4880). [Ai4rei]
- Fixed 'instance_create' would return -4 (party already instancing) when the requested party was not found.
- 'instance_create' return value -2 now means 'party not found' rather than 'missing parameter'.
diff --git a/src/map/script.c b/src/map/script.c
index 0b6732f08..6b1366f07 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12737,6 +12737,13 @@ BUILDIN_FUNC(query_sql)
BUILDIN_FUNC(query_logsql)
{
#ifndef TXT_ONLY
+ if( !log_config.sql_logs )
+ {// logmysql_handle == NULL
+ ShowWarning("buildin_query_logsql: SQL logs are disabled, query '%s' will not be executed.\n", script_getstr(st,2));
+ script_pushint(st,-1);
+ return 1;
+ }
+
return buildin_query_sql_sub(st, logmysql_handle);
#else
//for TXT version, we always return -1