Now several character sets can live in the same table,

However some hacks were used while waiting for new FRM file


sql/field.h:
  Added function to set Field charset
sql/filesort.cc:
  Temporarily workaround, It seems charset should be passed in argument
sql/ha_heap.cc:
  Set correct key charset from Field information
sql/table.cc:
  Dirty hack to distinguish columns charsets while waiting for Monty to rewrite FRM file
sql/table.h:
  New field: table default character set

1 files changed, 1 insertions, 0 deletions

diff --git a/sql/table.h b/sql/table.h
index 59cb28038bf..183e1b2a38f 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -104,6 +104,7 @@ struct st_table {
         *rowid_field;
   Field_timestamp *timestamp_field;
   my_string comment;			/* Comment about table */
+  CHARSET_INFO *table_charset;		/* Default charset of string fields */
   REGINFO reginfo;			/* field connections */
   MEM_ROOT mem_root;
   GRANT_INFO grant;