diff --git a/CHANGES b/CHANGES
index 6f207d1bae..7d81f1dbfb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2954.	[bug]		contrib: dlz_mysql_driver.c bad error handling on
+			build_sqldbinstance failure. [RT #21623]
+
 2953.	[bug]		Silence spurious "expected covering NSEC3, got an
 			exact match" message when returning a wildcard
 			no data response. [RT #21744]
diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c
index cbf184b2c2..50cceb139c 100644
--- a/contrib/dlz/drivers/dlz_mysql_driver.c
+++ b/contrib/dlz/drivers/dlz_mysql_driver.c
@@ -883,7 +883,7 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[],
 			      "mysql driver could not create "
 			      "database instance object.");
 		result = ISC_R_FAILURE;
-		goto full_cleanup;
+		goto cleanup;
 	}
 
 	/* create and set db connection */