summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorunknown <bar@gw.udmsearch.izhnet.ru>2002-06-19 21:21:30 +0500
committerunknown <bar@gw.udmsearch.izhnet.ru>2002-06-19 21:21:30 +0500
commite38f8e8ce21bc60f508ba15b3c01f3f1be4f7eef (patch)
tree619a1993ab7447b02bc4d786f456740d2805cf67 /sql/unireg.cc
parent2ec3617476e7731c5f6b704b0321d6be60822b2d (diff)
downloadmariadb-git-e38f8e8ce21bc60f508ba15b3c01f3f1be4f7eef.tar.gz
Default table character set has been added:
CREATE TABLE a (field,...) TYPE=type CHARSET=cset; sql/handler.h: New flag to remember whether new table default charset has been passed in ALTER TABLE sql/lex.h: New language symbol sql/sql_show.cc: Display default table charset if exists sql/sql_table.cc: Check table charset before default server charset sql/sql_yacc.yy: New create table option: default table character set sql/table.cc: Table charset sql/unireg.cc: field->charset must be initialized before. So assumes it is not NULL
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 863f71d1cce..f2d8d6532a9 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -459,8 +459,7 @@ static bool pack_fields(File file,List<create_field> &create_fields)
int2store(buff+8,field->unireg_check);
buff[10]= (uchar) field->interval_id;
buff[11]= (uchar) field->sql_type;
- buff[12]= (uchar) (field->charset ? field->charset->number :
- default_charset_info->number);
+ buff[12]= (uchar) field->charset->number;
int2store(buff+13, field->comment.length);
comment_length+= field->comment.length;
set_if_bigger(int_count,field->interval_id);