diff options
| author | unknown <sergefp@mysql.com> | 2005-04-17 20:56:36 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-04-17 20:56:36 +0400 |
| commit | b51f70b81e6af314093dd28728a3dc68d1a28fff (patch) | |
| tree | ac53150c2a8a45665166046c692e4386ec633124 /sql | |
| parent | 1780ad494059a8bc9f5c8c54d6779121a5fd683e (diff) | |
| parent | 9e5325ab5ccbee693e2837865786c65888b75658 (diff) | |
| download | mariadb-git-b51f70b81e6af314093dd28728a3dc68d1a28fff.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9439
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index f979b3ca771..7e0ee0dab68 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -980,7 +980,7 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list) field_list.push_back(item=new Item_int("Cardinality",0,21)); item->maybe_null=1; field_list.push_back(item=new Item_return_int("Sub_part",3, - MYSQL_TYPE_TINY)); + MYSQL_TYPE_SHORT)); item->maybe_null=1; field_list.push_back(item=new Item_empty_string("Packed",10)); item->maybe_null=1; @@ -1025,7 +1025,7 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list) /* Check if we have a key part that only uses part of the field */ if (!(key_info->flags & HA_FULLTEXT) && (!key_part->field || key_part->length != table->field[key_part->fieldnr-1]->key_length())) - protocol->store_tiny((longlong) key_part->length / + protocol->store_short((longlong) key_part->length / key_part->field->charset()->mbmaxlen); else protocol->store_null(); |