database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

1. Some optimization when conversion is not needed.

Browse Source 
2. One now must pass length argument into append(const char *str, uint length),
length is not calculated internally anymore.
This commit is contained in:
bar@bar.intranet.mysql.r18.ru
2004-05-25 15:54:03 +05:00
parent 115e769be2
commit 3f8996f88d
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_show.cc
View File

@@ -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 &&