diff --git a/amxmodx/svn_version.h b/amxmodx/svn_version.h
index 9b473274..b0f739f4 100644
--- a/amxmodx/svn_version.h
+++ b/amxmodx/svn_version.h
@@ -1,8 +1,8 @@
 #ifndef _INCLUDE_SVN_VERSION_H_
 #define _INCLUDE_SVN_VERSION_H_
 
-#define SVN_VERSION_STRING		"1.8.0.3398"
-#define SVN_VERSION_DWORD		1,8,0,3398
+#define SVN_VERSION_STRING		"1.8.0.3648"
+#define SVN_VERSION_DWORD		1,8,0,3648
 #define SVN_VERSION_PRODUCT		"1.8.0"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/cstrike/cstrike/svn_version.h b/dlls/cstrike/cstrike/svn_version.h
index 64c9de4c..5011aa4a 100644
--- a/dlls/cstrike/cstrike/svn_version.h
+++ b/dlls/cstrike/cstrike/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3047"
+#define SVN_VERSION		"1.8.0.3635"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/cstrike/csx/svn_version.h b/dlls/cstrike/csx/svn_version.h
index da4c2515..6ab803fd 100644
--- a/dlls/cstrike/csx/svn_version.h
+++ b/dlls/cstrike/csx/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3186"
+#define SVN_VERSION		"1.8.0.3550"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/dod/dodfun/svn_version.h b/dlls/dod/dodfun/svn_version.h
index 143f5e53..2d4ddf3e 100644
--- a/dlls/dod/dodfun/svn_version.h
+++ b/dlls/dod/dodfun/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3392"
+#define SVN_VERSION		"1.8.0.3587"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/dod/dodx/svn_version.h b/dlls/dod/dodx/svn_version.h
index 2e9f32cc..396bfa58 100644
--- a/dlls/dod/dodx/svn_version.h
+++ b/dlls/dod/dodx/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3405"
+#define SVN_VERSION		"1.8.0.3538"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/engine/svn_version.h b/dlls/engine/svn_version.h
index 9f157337..dc83e486 100644
--- a/dlls/engine/svn_version.h
+++ b/dlls/engine/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3397"
+#define SVN_VERSION		"1.8.0.3486"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/fakemeta/svn_version.h b/dlls/fakemeta/svn_version.h
index b7df7758..636cac76 100644
--- a/dlls/fakemeta/svn_version.h
+++ b/dlls/fakemeta/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3377"
+#define SVN_VERSION		"1.8.0.3641"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/fun/svn_version.h b/dlls/fun/svn_version.h
index ce42667c..d129f6b3 100644
--- a/dlls/fun/svn_version.h
+++ b/dlls/fun/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.2989"
+#define SVN_VERSION		"1.8.0.3466"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/geoip/svn_version.h b/dlls/geoip/svn_version.h
index e709ee4a..8b0fe40d 100644
--- a/dlls/geoip/svn_version.h
+++ b/dlls/geoip/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3043"
+#define SVN_VERSION		"1.8.0.3552"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/hamsandwich/svn_version.h b/dlls/hamsandwich/svn_version.h
index b7df7758..93ef053f 100644
--- a/dlls/hamsandwich/svn_version.h
+++ b/dlls/hamsandwich/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3377"
+#define SVN_VERSION		"1.8.0.3582"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/mysqlx/svn_version.h b/dlls/mysqlx/svn_version.h
index 7f566327..48b3e90b 100644
--- a/dlls/mysqlx/svn_version.h
+++ b/dlls/mysqlx/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3135"
+#define SVN_VERSION		"1.8.0.3645"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/ns/svn_version.h b/dlls/ns/svn_version.h
index b7df7758..cd509eec 100644
--- a/dlls/ns/svn_version.h
+++ b/dlls/ns/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3377"
+#define SVN_VERSION		"1.8.0.3591"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/nvault/svn_version.h b/dlls/nvault/svn_version.h
index da4c2515..d129f6b3 100644
--- a/dlls/nvault/svn_version.h
+++ b/dlls/nvault/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3186"
+#define SVN_VERSION		"1.8.0.3466"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/regex/svn_version.h b/dlls/regex/svn_version.h
index ce42667c..663a8e5f 100644
--- a/dlls/regex/svn_version.h
+++ b/dlls/regex/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.2989"
+#define SVN_VERSION		"1.8.0.3564"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/sockets/svn_version.h b/dlls/sockets/svn_version.h
index ce42667c..ae9c1fda 100644
--- a/dlls/sockets/svn_version.h
+++ b/dlls/sockets/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.2989"
+#define SVN_VERSION		"1.8.0.3467"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/sqlite/svn_version.h b/dlls/sqlite/svn_version.h
index 7f566327..24a94d8e 100644
--- a/dlls/sqlite/svn_version.h
+++ b/dlls/sqlite/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3135"
+#define SVN_VERSION		"1.8.0.3647"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/tfcx/svn_version.h b/dlls/tfcx/svn_version.h
index 143f5e53..ba41b396 100644
--- a/dlls/tfcx/svn_version.h
+++ b/dlls/tfcx/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.3392"
+#define SVN_VERSION		"1.8.0.3551"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/ts/tsfun/svn_version.h b/dlls/ts/tsfun/svn_version.h
index ce42667c..d129f6b3 100644
--- a/dlls/ts/tsfun/svn_version.h
+++ b/dlls/ts/tsfun/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.2989"
+#define SVN_VERSION		"1.8.0.3466"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/ts/tsx/svn_version.h b/dlls/ts/tsx/svn_version.h
index ce42667c..396bfa58 100644
--- a/dlls/ts/tsx/svn_version.h
+++ b/dlls/ts/tsx/svn_version.h
@@ -4,6 +4,6 @@
 /** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
 /** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
 
-#define SVN_VERSION		"1.8.0.2989"
+#define SVN_VERSION		"1.8.0.3538"
 
 #endif //_INCLUDE_SVN_VERSION_H_
diff --git a/plugins/include/svn_version.inc b/plugins/include/svn_version.inc
index 884d2aea..97ee3488 100644
--- a/plugins/include/svn_version.inc
+++ b/plugins/include/svn_version.inc
@@ -13,4 +13,4 @@
 
 #define AMXX_VERSION		1.80
 #define AMXX_VERSION_NUM	180
-stock const AMXX_VERSION_STR[] = "1.8.0.3398";
+stock const AMXX_VERSION_STR[] = "1.8.0.3648";
diff --git a/plugins/testsuite/sqlxtest.sma b/plugins/testsuite/sqlxtest.sma
index 8c5241db..f0367a7e 100644
--- a/plugins/testsuite/sqlxtest.sma
+++ b/plugins/testsuite/sqlxtest.sma
@@ -12,11 +12,13 @@ public plugin_init()
 	register_plugin("SQLX Test", "1.0", "BAILOPAN")
 	register_srvcmd("sqlx_test_normal", "SqlxTest_Normal")
 	register_srvcmd("sqlx_test_thread", "SqlxTest_Thread")
+	register_srvcmd("sqlx_test_proc", "SqlxTest_Proc")
 	register_srvcmd("sqlx_test_old1", "SqlxTest_Old1")
 	register_srvcmd("sqlx_test_old2", "SqlxTest_Old2")
 	register_srvcmd("sqlx_test_thread_end", "SqlxTest_ThreadEnd")
 	register_srvcmd("sqlx_test_bad", "SqlxTest_Bad")
 	register_srvcmd("sqlx_test_quote", "SqlxTest_Quote")
+	register_srvcmd("sqlx_test_affinity", "SqlxTest_Affinity")
 	
 	new configsDir[64]
 	get_configsdir(configsDir, 63)
@@ -146,6 +148,16 @@ public GetMyStuff(failstate, Handle:query, error[], errnum, data[], size, Float:
 	}
 }
 
+public SqlxTest_Affinity()
+{
+	server_print("[Access Manager] try SetAffinity to sqlite");
+	SQL_SetAffinity("sqlite");
+	server_print("[Access Manager] try SetAffinity to mysql");
+	SQL_SetAffinity("mysql");
+	server_print("[Access Manager] try SetAffinity to sqlite again");
+	SQL_SetAffinity("sqlite");
+}
+
 /**
  * Starts a threaded query.
  */
@@ -189,6 +201,39 @@ public SqlxTest_Quote()
 	SQL_FreeHandle(db)
 }
 
+public SqlxTest_Proc()
+{
+	new errnum, error[255]
+	
+	DoBasicInfo(1)
+	
+	new Handle:db = SQL_Connect(g_DbInfo, errnum, error, 254)
+	if (!db)
+	{
+		server_print("Query failure: [%d] %s", errnum, error)
+		return
+	}
+	
+	new Handle:query = SQL_PrepareQuery(db, "CALL ExampleProc()")
+	if (!SQL_Execute(query))
+	{
+		errnum = SQL_QueryError(query, error, 254)
+		server_print("Query failure: [%d] %s", errnum, error)
+		SQL_FreeHandle(query)
+		SQL_FreeHandle(db)
+		return
+	}
+
+	PrintQueryData(query)	
+	
+	server_print("Next result: %d", SQL_NextResultSet(query));
+	
+	PrintQueryData(query)
+	
+	SQL_FreeHandle(query)
+	SQL_FreeHandle(db)
+}
+
 /**
  * Does a normal query.
  */
@@ -217,6 +262,8 @@ public SqlxTest_Normal()
 
 	PrintQueryData(query)	
 	
+	server_print("Next result: %d", SQL_NextResultSet(query));
+	
 	SQL_FreeHandle(query)
 	SQL_FreeHandle(db)
 }