sys_var_collation is now abstract class

Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/protocol.cc b/sql/protocol.cc
index f82981bd309..195fec80ed0 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -805,7 +805,7 @@ bool Protocol_simple::store(float from, uint32 decimals, String *buffer)
 	      field_types[field_pos] == MYSQL_TYPE_FLOAT);
   field_pos++;
 #endif
-  buffer->set((double) from, decimals, thd->variables.thd_charset);
+  buffer->set((double) from, decimals, thd->charset());
   return net_store_data((char*) buffer->ptr(), buffer->length());
 }
 
@@ -817,7 +817,7 @@ bool Protocol_simple::store(double from, uint32 decimals, String *buffer)
 	      field_types[field_pos] == MYSQL_TYPE_DOUBLE);
   field_pos++;
 #endif
-  buffer->set(from, decimals, thd->variables.thd_charset);
+  buffer->set(from, decimals, thd->charset());
   return net_store_data((char*) buffer->ptr(), buffer->length());
 }