diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_timefunc.h | 6 | ||||
| -rw-r--r-- | sql/protocol.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 7e73f6a4765..9808f8f3382 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -946,6 +946,12 @@ public: { return tmp_table_field_from_field_type(table, 0); } + void fix_length_and_dec() + { + collation.set(&my_charset_bin); + max_length= 17; + maybe_null= 1; + } bool result_as_longlong() { return TRUE; } longlong val_int(); double val_real() { return val_real_from_decimal(); } diff --git a/sql/protocol.cc b/sql/protocol.cc index 2db81e925a2..4a3220b96fc 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -617,7 +617,7 @@ bool Protocol::send_fields(List<Item> *list, uint flags) Protocol_text prot(thd); String *local_packet= prot.storage_packet(); CHARSET_INFO *thd_charset= thd->variables.character_set_results; - DBUG_ENTER("send_fields"); + DBUG_ENTER("Protocol::send_fields"); if (flags & SEND_NUM_ROWS) { // Packet with number of elements |