diff options
| author | bar@bar.mysql.r18.ru <> | 2002-10-25 13:58:32 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2002-10-25 13:58:32 +0500 |
| commit | 95aef915216391d2c23cec856d08a49aede76635 (patch) | |
| tree | d8d121f81f5cf89edfe070e49636482fd879f1fa /sql/sql_analyse.cc | |
| parent | 0ca3212a8cc3bafab07556e5dab2294fce17258a (diff) | |
| download | mariadb-git-95aef915216391d2c23cec856d08a49aede76635.tar.gz | |
BINARY charset is now used instead of binary_flag
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index 363a194276b..deb1e2821c1 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -349,7 +349,7 @@ void field_str::add() if (length > max_length) max_length = length; - if (item->binary) + if (item->binary()) { if (stringcmp(res, &min_arg) < 0) min_arg.copy(*res); @@ -738,7 +738,7 @@ void field_str::get_opt_type(String *answer, ha_rows total_rows) { if (must_be_blob) { - if (item->binary) + if (item->binary()) answer->append("TINYBLOB", 8); else answer->append("TINYTEXT", 8); @@ -756,21 +756,21 @@ void field_str::get_opt_type(String *answer, ha_rows total_rows) } else if (max_length < (1L << 16)) { - if (item->binary) + if (item->binary()) answer->append("BLOB", 4); else answer->append("TEXT", 4); } else if (max_length < (1L << 24)) { - if (item->binary) + if (item->binary()) answer->append("MEDIUMBLOB", 10); else answer->append("MEDIUMTEXT", 10); } else { - if (item->binary) + if (item->binary()) answer->append("LONGBLOB", 8); else answer->append("LONGTEXT", 8); |