diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-07 13:39:53 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-07 13:39:53 +0400 |
| commit | 0fbfdcfbc476418df658aed2e8d38c15970cea2e (patch) | |
| tree | aad2b3d8c731a6fa3ab1d7dc7fcd68a827d8313b /sql/unireg.cc | |
| parent | e16e9b759ac1dd461a25ef8513c77463107b2071 (diff) | |
| download | mariadb-git-0fbfdcfbc476418df658aed2e8d38c15970cea2e.tar.gz | |
item_func.cc, item_cmpfunc.cc, unireg.cc, table.cc, sql_base.cc:
some default_charset_info were removed
sql/sql_base.cc:
some default_charset_info were removed
sql/table.cc:
some default_charset_info were removed
sql/unireg.cc:
some default_charset_info were removed
sql/item_cmpfunc.cc:
some default_charset_info were removed
sql/item_func.cc:
some default_charset_info were removed
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 1cd38d4d161..fa843fe5d1e 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -486,7 +486,7 @@ static bool pack_fields(File file,List<create_field> &create_fields) /* Write intervals */ if (int_count) { - String tmp((char*) buff,sizeof(buff), default_charset_info); + String tmp((char*) buff,sizeof(buff), &my_charset_bin); tmp.length(0); it.rewind(); int_count=0; @@ -598,9 +598,9 @@ static bool make_empty_rec(File file,enum db_type table_type, regfield->store((longlong) 1); } else if (type == Field::YES) // Old unireg type - regfield->store(ER(ER_YES),(uint) strlen(ER(ER_YES)),default_charset_info); + regfield->store(ER(ER_YES),(uint) strlen(ER(ER_YES)),system_charset_info); else if (type == Field::NO) // Old unireg type - regfield->store(ER(ER_NO), (uint) strlen(ER(ER_NO)),default_charset_info); + regfield->store(ER(ER_NO), (uint) strlen(ER(ER_NO)),system_charset_info); else regfield->reset(); delete regfield; |