diff options
| author | unknown <magnus@shellback.(none)> | 2004-09-26 16:21:15 +0200 |
|---|---|---|
| committer | unknown <magnus@shellback.(none)> | 2004-09-26 16:21:15 +0200 |
| commit | 1dd76e19315f4a225788ff284c32c7f3a5dc0dbc (patch) | |
| tree | ef18255527c2519d9c95e16262e3f78ec4f7eaee /sql/sql_show.cc | |
| parent | 5077ba47ad95f166b107dd4da29ae595516e85ab (diff) | |
| parent | a64953ed3f469e3efdff4dd6462a1756675459b6 (diff) | |
| download | mariadb-git-1dd76e19315f4a225788ff284c32c7f3a5dc0dbc.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e94e36eae30..d084c051621 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1269,6 +1269,8 @@ store_create_info(THD *thd, TABLE *table, String *packet) // check for surprises from the previous call to Field::sql_type() if (type.ptr() != tmp) type.set(tmp, sizeof(tmp), system_charset_info); + else + type.set_charset(system_charset_info); field->sql_type(type); packet->append(type.ptr(), type.length(), system_charset_info); |