Fix mismerge.

82d8a99c · cmiller@zippy.cornsilk.net · 3c6591ad · 82d8a99c · 82d8a99c
Commit 82d8a99c authored Apr 10, 2008 by cmiller@zippy.cornsilk.net
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/field.cc sql/field.cc +1 -1

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

No files found.
--- a/sql/field.cc
+++ b/sql/field.cc
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -531,7 +531,7 @@ Item *create_func_cast(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;