diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc
index c8aba051fc5..664a88c6e78 100644
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
@@ -9695,13 +9695,14 @@ innodb_plugin_init(void)
 
 	for (sta = builtin->system_vars; *sta != NULL; sta++) {
 
-		/* do not copy session variables */
-		if (((*sta)->flags | (*dyn)->flags) & PLUGIN_VAR_THDLOCAL) {
-			continue;
-		}
-
 		for (dyn = innobase_system_variables; *dyn != NULL; dyn++) {
 
+			/* do not copy session variables */
+			if (((*sta)->flags | (*dyn)->flags)
+			    & PLUGIN_VAR_THDLOCAL) {
+				continue;
+			}
+
 			if (innobase_match_parameter((*sta)->name,
 						     (*dyn)->name)) {