diff --git a/extensions/mysql/extension.cpp b/extensions/mysql/extension.cpp
index 272b50ef..329df4fb 100644
--- a/extensions/mysql/extension.cpp
+++ b/extensions/mysql/extension.cpp
@@ -46,18 +46,21 @@ SMEXT_LINK(&g_MySqlDBI);
 
 bool DBI_MySQL::SDK_OnLoad(char *error, size_t maxlength, bool late)
 {
+	if (mysql_library_init(0, NULL, NULL) != 0) {
+		smutils->Format(error, maxlength, "Could not initialize MySQL client library");
+		return false;	
+	}
+	
 	dbi->AddDriver(&g_MyDriver);
 
-	my_init();
-
 	return true;
 }
 
 void DBI_MySQL::SDK_OnUnload()
 {
 	dbi->RemoveDriver(&g_MyDriver);
-	//:TODO: is this needed?
-	//mysql_library_end();
+
+	mysql_library_end();
 }
 
 const char *DBI_MySQL::GetExtensionVerString()
@@ -69,4 +72,3 @@ const char *DBI_MySQL::GetExtensionDateString()
 {
 	return SOURCEMOD_BUILD_TIME;
 }
-