Add depend make target and resolve conflict in query_classifier.cc

This commit is contained in:
Mark Riddoch
2013-07-19 15:05:21 +02:00
parent b9098e04a9
commit bce6f88efe
3 changed files with 30 additions and 2 deletions

View File

@ -100,8 +100,9 @@ skygw_query_type_t skygw_query_classifier_get_type(
ss_info_dassert(query != NULL, ("query_str is NULL"));
query_str = const_cast<char*>(query);
//fprintf(stderr, " Query \"%s\"\n", query_str);
#if QUERY_DEBUG
fprintf(stderr, " Query \"%s\"\n", query_str);
#endif
/** Get server handle */
mysql = mysql_init(NULL);