From 9be5c10fca989ff9d8efdd2cc12b57c62dcaefb6 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Mon, 30 Apr 2007 09:25:38 +0500
Subject: [PATCH] merging fix

---
 sql/item_cmpfunc.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 559461eda41..ff7b991448c 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -1754,7 +1754,6 @@ bool Item_func_between::fix_fields(THD *thd, Item **ref)
 void Item_func_between::fix_length_and_dec()
 {
   max_length= 1;
-  THD *thd= current_thd;
   int i;
   bool datetime_found= FALSE;
   compare_as_dates= TRUE;