diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-05-25 15:54:03 +0500 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-05-25 15:54:03 +0500 |
| commit | 9983aed876568891e07fbdeed402c9c7f1320c03 (patch) | |
| tree | 5b89afdba70f8480882113658142e4dfd12afac7 /sql/sql_show.cc | |
| parent | f80e9e042ee33e1debdac1e46992470e495921c9 (diff) | |
| download | mariadb-git-9983aed876568891e07fbdeed402c9c7f1320c03.tar.gz | |
1. Some optimization when conversion is not needed.
2. One now must pass length argument into append(const char *str, uint length),
length is not calculated internally anymore.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4fb85d9bab7..a54a6fa1a4c 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1207,7 +1207,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) { List<Item> field_list; char tmp[MAX_FIELD_WIDTH], *for_str, buff[128], *end, *alias; - String type(tmp, sizeof(tmp),&my_charset_bin); + String type(tmp, sizeof(tmp), system_charset_info); Field **ptr,*field; uint primary_key; KEY *key_info; @@ -1254,7 +1254,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) type.set(tmp, sizeof(tmp),&my_charset_bin); field->sql_type(type); - packet->append(type.ptr(),type.length()); + packet->append(type.ptr(), type.length(), system_charset_info); if (field->has_charset() && !limited_mysql_mode && !foreign_db_mode) { @@ -1313,7 +1313,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) else if (field->maybe_null()) packet->append("NULL", 4); // Null as default else - packet->append(tmp,0); + packet->append(tmp); } if (!foreign_db_mode && !limited_mysql_mode && |