From 9c5510807a75cb6999f392741590aa5cafc2cfaf Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Mon, 6 Sep 2004 20:11:04 +0300
Subject: [PATCH] postmerge fix (found by Dmitry)

sql/item.cc:
  postmerge fix
---
 sql/item.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item.cc b/sql/item.cc
index d8f4871486f..efd94716dc7 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -2117,8 +2117,8 @@ bool Item_ref::fix_fields(THD *thd, TABLE_LIST *tables, Item **reference)
 	  if (!((*reference)= fld= new Item_field(tmp)))
 	    return 1;
 	  mark_as_dependent(thd, last, thd->lex->current_select, fld);
-	  return 0;
 	  register_item_tree_changing(reference);
+	  return 0;
 	}
         /*
 	  We can leave expression substituted from view for next PS/SP