diff options
| author | jan@hundin.mysql.fi <> | 2005-03-16 11:26:35 +0200 |
|---|---|---|
| committer | jan@hundin.mysql.fi <> | 2005-03-16 11:26:35 +0200 |
| commit | 1f9976cb10223d458e1a05adeb14cf0fc15b6914 (patch) | |
| tree | 3025aba04e23479e1534e53d95b345cf04b12992 /innobase | |
| parent | 9a52ffbfa4a676c1293fe7d8b80bece264018764 (diff) | |
| download | mariadb-git-1f9976cb10223d458e1a05adeb14cf0fc15b6914.tar.gz | |
DATA_MYSQL_TRUE_VARCHAR can be DATA_VARCHAR, DATA_BINARY, or
DATA_VARMYSQL so remove unnecessary condition.
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/row/row0sel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index 48bca5d7b6f..ce8789aa3fc 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -2100,9 +2100,9 @@ row_sel_convert_mysql_key_to_innobase( /* Calculate data length and data field total length */ - if (type == DATA_BLOB || ( type == DATA_VARCHAR && + if (type == DATA_BLOB || dtype_get_mysql_type(dfield_get_type(dfield)) - == DATA_MYSQL_TRUE_VARCHAR)) { + == DATA_MYSQL_TRUE_VARCHAR) { /* The key field is a column prefix of a BLOB, TEXT, OR TRUE VARCHAR type column */ |