diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2002-12-19 14:57:24 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2002-12-19 14:57:24 +0400 |
| commit | 1bc932384b2043a326f2ce71a4e71ac2aba47580 (patch) | |
| tree | 49af941597a25a7ac4b9152abdbeba746334ac2e /sql/sql_show.cc | |
| parent | 74ec1c762154073fd611e1e2267d3dc76312abc4 (diff) | |
| parent | ef9c22611960eb3e7ebf1d0e4a53f47e3ef62480 (diff) | |
| download | mariadb-git-1bc932384b2043a326f2ce71a4e71ac2aba47580.tar.gz | |
Merge
include/mysql_com.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
libmysqld/libmysqld.c:
e
merging with vva's code.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 05e4a4f8429..be444cdd3cd 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -711,7 +711,7 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, { byte *pos; uint flags=field->flags; - String type(tmp,sizeof(tmp),current_thd->thd_charset); + String type(tmp,sizeof(tmp),current_thd->variables.thd_charset); uint col_access; bool null_default_value=0; |