diff options
| author | bar@bar.mysql.r18.ru <> | 2003-05-23 13:10:25 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-05-23 13:10:25 +0500 |
| commit | a238efaa632b7fccc44db08d0e468f38ce324dc7 (patch) | |
| tree | 96a767e32ce6ec8ff92c231ff5d9fb1a819f69c5 /sql/field.cc | |
| parent | 895db718ecd56bdb3e05d99ba42847ce5208548e (diff) | |
| download | mariadb-git-a238efaa632b7fccc44db08d0e468f38ce324dc7.tar.gz | |
SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:
Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/sql/field.cc b/sql/field.cc index 5c3961a949e..3288aa2c4c7 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -254,26 +254,6 @@ void Field_str::make_field(Send_field *field) } -void Field_str::add_binary_or_charset(String &res) const -{ - if (charset() == &my_charset_bin) - res.append(" binary"); - else if (field_charset != table->table_charset && - !(current_thd->variables.sql_mode & MODE_NO_FIELD_OPTIONS) && - !(current_thd->variables.sql_mode & MODE_MYSQL323) && - !(current_thd->variables.sql_mode & MODE_MYSQL40) && - !(current_thd->variables.sql_mode & MODE_POSTGRESQL) && - !(current_thd->variables.sql_mode & MODE_ORACLE) && - !(current_thd->variables.sql_mode & MODE_MSSQL) && - !(current_thd->variables.sql_mode & MODE_DB2) && - !(current_thd->variables.sql_mode & MODE_SAPDB)) - { - res.append(" character set "); - res.append(field_charset->csname); - } -} - - uint Field::fill_cache_field(CACHE_FIELD *copy) { copy->str=ptr; @@ -4027,7 +4007,6 @@ void Field_string::sql_type(String &res) const "varchar" : "char"), (int) field_length); res.length(length); - add_binary_or_charset(res); } @@ -4194,7 +4173,6 @@ void Field_varstring::sql_type(String &res) const res.alloced_length(),"varchar(%u)", field_length); res.length(length); - add_binary_or_charset(res); } char *Field_varstring::pack(char *to, const char *from, uint max_length) @@ -4640,11 +4618,6 @@ void Field_blob::sql_type(String &res) const else { res.append("text"); - if (field_charset != table->table_charset) - { - res.append(" character set "); - res.append(field_charset->csname); - } } } @@ -5098,7 +5071,6 @@ void Field_enum::sql_type(String &res) const flag=1; } res.append(')'); - add_binary_or_charset(res); } @@ -5243,7 +5215,6 @@ void Field_set::sql_type(String &res) const flag=1; } res.append(')'); - add_binary_or_charset(res); } /* returns 1 if the fields are equally defined */ |