database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix mismerge.

Browse Source
This commit is contained in:
cmiller@zippy.cornsilk.net
2008-04-10 15:55:37 -04:00
parent 3c6591ad8f
commit 82d8a99c05
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_create.cc
View File

@ -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;