1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge problem.

Browse Source
This commit is contained in:
unknown 2008-04-10 23:27:24 -04:00
parent baa9ff82ee
commit 462704c5c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_create.cc
View File

@ -5125,7 +5125,7 @@ create_func_cast(THD *thd, Item *a, Cast_target cast_type,
ulong decoded_size; ulong decoded_size;
errno= 0; errno= 0;
decoded_size= strtoul(c_len, NULL, 10); 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); my_error(ER_TOO_BIG_DISPLAYWIDTH, MYF(0), "cast as char", MAX_FIELD_BLOBLENGTH);
return NULL; return NULL;