Merge branch 'mxqsub'

* mxqsub: mxqsub: Add --verbose option mxqsub: Handle unrecognized options better mxqsub: Improve user input verification mxqsub: User mx_mysql functions and remove mxq_mysql support mxqsub: Remove unused -D option (Fixes memory leak)
mariux · May 21, 2015 · 742e873 · 742e873
2 parents e4f9f7b + 1dc2db8
commit 742e873
Show file tree

Hide file tree

Showing 2 changed files with 267 additions and 245 deletions.
diff --git a/Makefile b/Makefile
@@ -346,6 +346,7 @@ mxqsub.o: $(mxq_util.h)
 mxqsub.o: $(mx_util.h)
 mxqsub.o: $(mx_log.h)
 mxqsub.o: $(mxq_mysql.h)
+mxqsub.o: $(mx_mysql.h)
 mxqsub.o: CFLAGS += $(CFLAGS_MYSQL)
 mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_FILE)
 
@@ -380,6 +381,7 @@ mxqsub: mxq_mysql.o
 mxqsub: mxq_util.o
 mxqsub: mx_util.o
 mxqsub: mx_log.o
+mxqsub: mx_mysql.o
 mxqsub: LDLIBS += $(LDLIBS_MYSQL)
 
 build: mxqsub