Post-merge fix.

1 files changed, 12 insertions, 0 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 20041b1176a..e20926c564f 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -5039,6 +5039,18 @@ create_func_cast(THD *thd, Item *a, Cast_target cast_type,
       my_error(ER_M_BIGGER_THAN_D, MYF(0), "");
       return 0;
     }
+    if (len > DECIMAL_MAX_PRECISION)
+    {
+      my_error(ER_TOO_BIG_PRECISION, MYF(0), len, a->name,
+               DECIMAL_MAX_PRECISION);
+      return 0;
+    }
+    if (dec > DECIMAL_MAX_SCALE)
+    {
+      my_error(ER_TOO_BIG_SCALE, MYF(0), dec, a->name,
+               DECIMAL_MAX_SCALE);
+      return 0;
+    }
     res= new (thd->mem_root) Item_decimal_typecast(a, len, dec);
     break;
   }