diff options
| author | serg@serg.mylan <> | 2004-04-06 21:35:26 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-04-06 21:35:26 +0200 |
| commit | e8eda8129f4dfb4128a3392a70f055aa04797ba9 (patch) | |
| tree | 49936e67024c8911d22de045aa8314e5f88d506b /sql/sql_show.cc | |
| parent | 83f6f4a05ccab146830a92f1859d20d92f5ad4e6 (diff) | |
| download | mariadb-git-e8eda8129f4dfb4128a3392a70f055aa04797ba9.tar.gz | |
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
Field::val_str simplification, comment
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 506a5deda91..adbb0e41185 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -735,11 +735,11 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, */ protocol->store("CURRENT_TIMESTAMP", system_charset_info); } - else if (field->unireg_check != Field::NEXT_NUMBER && + else if (field->unireg_check != Field::NEXT_NUMBER && !field->is_null()) { // Not null by default type.set(tmp, sizeof(tmp), field->charset()); - field->val_str(&type,&type); + field->val_str(&type); protocol->store(type.ptr(),type.length(),type.charset()); } else if (field->unireg_check == Field::NEXT_NUMBER || @@ -1298,10 +1298,10 @@ store_create_info(THD *thd, TABLE *table, String *packet) else if (!field->is_null()) { // Not null by default type.set(tmp, sizeof(tmp), field->charset()); - field->val_str(&type,&type); + field->val_str(&type); if (type.length()) { - String def_val; + String def_val; /* convert to system_charset_info == utf8 */ def_val.copy(type.ptr(), type.length(), field->charset(), system_charset_info); |