diff options
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index f717b78f4bf..7693ef428c6 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -568,12 +568,14 @@ void Item_datetime::make_field(Send_field *tmp_field) init_make_field(tmp_field,FIELD_TYPE_DATETIME); } + void Item_null::make_field(Send_field *tmp_field) { init_make_field(tmp_field,FIELD_TYPE_NULL); tmp_field->length=4; } + void Item_func::make_field(Send_field *tmp_field) { init_make_field(tmp_field, ((result_type() == STRING_RESULT) ? @@ -780,7 +782,7 @@ bool Item::send(THD *thd, String *packet) String s(buff,sizeof(buff),packet->charset()),*res; if (!(res=val_str(&s))) return net_store_null(packet); - if ((convert=thd->convert_set)) + if ((convert=thd->variables.convert_set)) return convert->store(packet,res->ptr(),res->length()); return net_store_data(packet,res->ptr(),res->length()); } |