diff options
author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-14 20:58:38 +0500 |
---|---|---|
committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-14 20:58:38 +0500 |
commit | b043f06666c278a4277e7d35b1bff418d45708c2 (patch) | |
tree | aabc829c5778332b2dedc76303a4d72e9f3ea6f6 /sql/table.h | |
parent | bf8727991777e9fd90a5a6966454f942b162b502 (diff) | |
download | mariadb-git-b043f06666c278a4277e7d35b1bff418d45708c2.tar.gz |
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
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 1 |
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; |