diff options
| author | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
| commit | b8fa1718502174c9d4599fd02c9ca0ffa74db1ef (patch) | |
| tree | 6c17d3cffec1fb7d5a50cf0dd8236f04c18f0291 /sql/sql_show.cc | |
| parent | 241bb226993b5ea11e73903858b5ba0fdc6e6647 (diff) | |
| parent | 24794dbc6d5d0a1481b413c43e72c9bb731794c7 (diff) | |
| download | mariadb-git-b8fa1718502174c9d4599fd02c9ca0ffa74db1ef.tar.gz | |
Merge 4.1 to 5.0.
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/null.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/status.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/distinct.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/null.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 97677bebbb3..1816e68b706 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -713,7 +713,7 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, null_default_value=1; if (!null_default_value && !field->is_null()) { // Not null by default - type.set(tmp,sizeof(tmp),system_charset_info); + type.set(tmp, sizeof(tmp), field->charset()); field->val_str(&type,&type); protocol->store(type.ptr(),type.length(),type.charset()); } @@ -1114,10 +1114,16 @@ store_create_info(THD *thd, TABLE *table, String *packet) packet->append(" default ", 9); if (!field->is_null()) { // Not null by default - type.set(tmp,sizeof(tmp),&my_charset_bin); + type.set(tmp, sizeof(tmp), field->charset()); field->val_str(&type,&type); if (type.length()) - append_unescaped(packet, type.ptr(), type.length()); + { + String def_val; + /* convert to system_charset_info == utf8 */ + def_val.copy(type.ptr(), type.length(), field->charset(), + system_charset_info); + append_unescaped(packet, def_val.ptr(), def_val.length()); + } else packet->append("''",2); } @@ -1217,7 +1223,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) packet->append("\n)", 2); if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode) { - packet->append(" TYPE=", 6); + packet->append(" ENGINE=", 8); packet->append(file->table_type()); if (table->table_charset && |