From 462704c5c64da33cbf0250eb97a6ab67fe874cdb Mon Sep 17 00:00:00 2001
From: unknown <cmiller@zippy.cornsilk.net>
Date: Thu, 10 Apr 2008 23:27:24 -0400
Subject: [PATCH] Fix merge problem.

---
 sql/item_create.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 427857c58ad..349c47816ad 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -5125,7 +5125,7 @@ create_func_cast(THD *thd, Item *a, Cast_target cast_type,
       ulong decoded_size;
       errno= 0;
       decoded_size= strtoul(c_len, NULL, 10);
-      if (errno != 0)
+      if ((errno != 0) || (decoded_size > MAX_FIELD_BLOBLENGTH))
       {
         my_error(ER_TOO_BIG_DISPLAYWIDTH, MYF(0), "cast as char", MAX_FIELD_BLOBLENGTH);
         return NULL;