From 8d5a4e29efd4cf83d9fe1dddf50c832b05d8b342 Mon Sep 17 00:00:00 2001
From: calvin <Unknown>
Date: Tue, 28 Oct 2008 22:08:11 +0000
Subject: [PATCH] branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
---
handler/ha_innodb.cc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc
index c8aba051fc..664a88c6e7 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)) {
--
2.30.9