diff options
author | bar@bar.intranet.mysql.r18.ru <> | 2004-04-06 19:57:33 +0500 |
---|---|---|
committer | bar@bar.intranet.mysql.r18.ru <> | 2004-04-06 19:57:33 +0500 |
commit | 950a2ebab1bf8d6988ba2b08d4f7320f02e52d0d (patch) | |
tree | 3410735f1e3d76f9c5c170a8f6124e69fdd8422f /sql/field.cc | |
parent | 0f484ebae601f3c4a02c2eca17c9b9f88d4c5f88 (diff) | |
download | mariadb-git-950a2ebab1bf8d6988ba2b08d4f7320f02e52d0d.tar.gz |
Fixed charsetnr sent to the client
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 8408bfdf578..30ae20de94b 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5623,6 +5623,18 @@ Field *make_field(char *ptr, uint32 field_length, null_pos=0; null_bit=0; } + + switch (field_type) + { + case FIELD_TYPE_DATE: + case FIELD_TYPE_NEWDATE: + case FIELD_TYPE_TIME: + case FIELD_TYPE_DATETIME: + case FIELD_TYPE_TIMESTAMP: + field_charset= &my_charset_bin; + default: break; + } + if (f_is_alpha(pack_flag)) { if (!f_is_packed(pack_flag)) |