branches/zip: innodb_plugin_init(): Do not copy session variables,

even when the variable is a global variable in the built-in InnoDB.

handler/ha_innodb.cc

@@ -9696,7 +9696,7 @@ innodb_plugin_init(void)
 	for (sta = builtin->system_vars; *sta != NULL; sta++) {
 
 		/* do not copy session variables */
-		if ((*sta)->flags & PLUGIN_VAR_THDLOCAL) {
+		if (((*sta)->flags | (*dyn)->flags) & PLUGIN_VAR_THDLOCAL) {
 			continue;
 		}