From 1c387c8f712451e4f722cae5582ab6fbbfa50e29 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Wed, 1 Jun 2005 18:08:39 -0700
Subject: [PATCH] Restore a bit of code accidently deleted during merge

---
 sql/item_func.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 4963476c114..fd0b2c196fd 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2329,6 +2329,8 @@ longlong Item_func_field::val_int()
   if (cmp_type == STRING_RESULT)
   {
     String *field;
+    if (!(field= args[0]->val_str(&value)))
+      return 0;
     for (uint i=1 ; i < arg_count ; i++)
     {
       String *tmp_value=args[i]->val_str(&tmp);