diff options
| author | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
| commit | 8a205e4ba309c4031df93cfe700891d362e25750 (patch) | |
| tree | 49af941597a25a7ac4b9152abdbeba746334ac2e /sql/protocol.cc | |
| parent | 1873df00a5c8d3a92086623db3dd90bfec4b5221 (diff) | |
| parent | c3053148f489b36378efa3bdf6676ca0334f69d1 (diff) | |
| download | mariadb-git-8a205e4ba309c4031df93cfe700891d362e25750.tar.gz | |
Merge
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 5ec51a42dc9..0239d867f6b 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -725,7 +725,7 @@ bool Protocol_simple::store(float from, uint32 decimals, String *buffer) DBUG_ASSERT(field_types == 0 || field_types[field_pos++] == MYSQL_TYPE_FLOAT); #endif - buffer->set((double) from, decimals, thd->thd_charset); + buffer->set((double) from, decimals, thd->variables.thd_charset); return net_store_data(packet,(char*) buffer->ptr(), buffer->length()); } @@ -735,7 +735,7 @@ bool Protocol_simple::store(double from, uint32 decimals, String *buffer) DBUG_ASSERT(field_types == 0 || field_types[field_pos++] == MYSQL_TYPE_DOUBLE); #endif - buffer->set(from, decimals, thd->thd_charset); + buffer->set(from, decimals, thd->variables.thd_charset); return net_store_data(packet,(char*) buffer->ptr(), buffer->length()); } |