Backed out changeset 42462959f48d

extensions/mysql/Makefile

@@ -85,11 +85,11 @@ ifeq "$(USEMETA)" "true"
 		-I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
 else
 	INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(MMSOURCE17)/core/sourcehook \
-		-I/usr/include/mysql
+		-I$(MYSQL)/include
 	CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 
 endif
 
-LINK += -m32 /usr/lib/mysql/libmysqlclient_r.a -lz -lpthread
+LINK += $(MYSQL)/lib/libmysqlclient_r.a -lz -lpthread
 
 CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
 	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror -Wno-switch \

extensions/mysql/mysql/MyDatabase.cpp

@@ -186,7 +186,7 @@ bool MyDatabase::QuoteString(const char *str, char buffer[], size_t maxlength, s
 		return false;
 	}
 
-	needed = mysql_escape_string(buffer, str, size);
+	needed = mysql_real_escape_string(m_mysql, buffer, str, size);
 	if (newSize)
 	{
 		*newSize = (size_t)needed;