diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-12-12 11:35:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-12 11:35:21 +0100 |
| commit | dce2cc1c6a82d1ed9f4db9c39bc9cb1d3815a019 (patch) | |
| tree | b202148bd9afbb0af9474d6455bf5192f4d79c94 | |
| parent | 56d3a0e73be6213765274d6efcc31d9c9a9cbcd1 (diff) | |
| download | mariadb-git-dce2cc1c6a82d1ed9f4db9c39bc9cb1d3815a019.tar.gz | |
fix handler test failures on s390x
keyinfo->name is a LEX_CSTRING
also, fix the location comment (that applied to ext_key_part_map)
| -rw-r--r-- | sql/sql_handler.cc | 2 | ||||
| -rw-r--r-- | sql/structs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 69ea04a170c..817447fe917 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -670,7 +670,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler, (HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE)) == 0)) { my_error(ER_KEY_DOESNT_SUPPORT, MYF(0), - table->file->index_type(handler->keyno), keyinfo->name); + table->file->index_type(handler->keyno), keyinfo->name.str); return 1; } diff --git a/sql/structs.h b/sql/structs.h index be9abbf4613..5cc392c33b7 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -109,8 +109,8 @@ typedef struct st_key { pk2 is explicitly present in idx1, it is not in the extension, so ext_key_part_map.is_set(1) == false */ - LEX_CSTRING name; key_part_map ext_key_part_map; + LEX_CSTRING name; uint block_size; enum ha_key_alg algorithm; /* |