diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-10 15:55:37 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-10 15:55:37 -0400 |
| commit | 57784eae1235d62831cbdab16827027288dd7cbf (patch) | |
| tree | 8dea0ffba4db761540a174d33919c136c7795d54 /sql/item_create.cc | |
| parent | f768701000754be66f097e944ebaaf815ee04af5 (diff) | |
| download | mariadb-git-57784eae1235d62831cbdab16827027288dd7cbf.tar.gz | |
Fix mismerge.
sql/field.cc:
Fix indentation of new line.
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 6f3608b6b9a..c897b7aef79 100644 --- 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; |