diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-02-26 13:34:35 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-02-26 13:34:35 +0400 |
| commit | 6d535030870ec158630a785d334ab4b710fdc523 (patch) | |
| tree | 6acf36fa57b459ea1013b6a5ab4b68267ec3773c | |
| parent | 8a7d862c91f26bbd7a9225894ad98b7ac2dc8540 (diff) | |
| download | mariadb-git-6d535030870ec158630a785d334ab4b710fdc523.tar.gz | |
set_var.cc, sql_table.cc, handler.cc, field.cc:
Less default_charset_info
sql/field.cc:
Less default_charset_info
sql/handler.cc:
Less default_charset_info
sql/sql_table.cc:
Less default_charset_info
sql/set_var.cc:
Less default_charset_info
| -rw-r--r-- | sql/field.cc | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sql/field.cc b/sql/field.cc index e6de2dc5224..d4f48cc3ddd 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4549,7 +4549,7 @@ void Field_geom::set_key_image(char *buff,uint length,CHARSET_INFO *cs) void Field_geom::sql_type(String &res) const { - res.set("geometry", 8, default_charset_info); + res.set("geometry", 8, &my_charset_latin1); } int Field_blob::key_cmp(const byte *key_ptr, uint max_key_length) diff --git a/sql/handler.cc b/sql/handler.cc index dcc732ba25a..af9b2fd4a35 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -689,7 +689,7 @@ void handler::print_error(int error, myf errflag) { /* Write the dupplicated key in the error message */ char key[MAX_KEY_LENGTH]; - String str(key,sizeof(key),default_charset_info); + String str(key,sizeof(key),system_charset_info); key_unpack(&str,table,(uint) key_nr); uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY)); if (str.length() >= max_length) diff --git a/sql/set_var.cc b/sql/set_var.cc index 0449e048a2f..f09d0441cfe 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1074,7 +1074,7 @@ byte *sys_var_thd_sql_mode::value_ptr(THD *thd, enum_var_type type) { ulong val; char buff[256]; - String tmp(buff, sizeof(buff), default_charset_info); + String tmp(buff, sizeof(buff), &my_charset_latin1); my_bool found= 0; tmp.length(0); diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 360b6a0bdd3..699818b19fd 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -247,7 +247,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, { if (wrong_tables.length()) wrong_tables.append(','); - wrong_tables.append(String(table->real_name,default_charset_info)); + wrong_tables.append(String(table->real_name,system_charset_info)); } } thd->tmp_table_used= tmp_table_deleted; |