Fix merge problem.

ac2d6935 · cmiller@zippy.cornsilk.net · 2f7bdf84 · ac2d6935
Commit ac2d6935 authored Apr 10, 2008 by cmiller@zippy.cornsilk.net
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_create.cc sql/item_create.cc +1 -1

No files found.
--- 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;