diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-10 23:27:24 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-10 23:27:24 -0400 |
| commit | 462704c5c64da33cbf0250eb97a6ab67fe874cdb (patch) | |
| tree | 924ef20586a481ebf707569506fe386fa39cb83b /sql/item_create.cc | |
| parent | baa9ff82ee822ecf06c87ee5629663b2fb22d18e (diff) | |
| download | mariadb-git-462704c5c64da33cbf0250eb97a6ab67fe874cdb.tar.gz | |
Fix merge problem.
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |