database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fix handler test failures on s390x

Browse Source 
keyinfo->name is a LEX_CSTRING

also, fix the location comment (that applied to ext_key_part_map)
This commit is contained in:
Sergei Golubchik
2018-12-12 11:35:21 +01:00
parent 56d3a0e73b
commit dce2cc1c6a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_handler.cc
View File

@ -670,7 +670,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
(HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE)) == 0)) (HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE)) == 0))
{ {
my_error(ER_KEY_DOESNT_SUPPORT, MYF(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; return 1;
} }

2
sql/structs.h
View File

@ -109,8 +109,8 @@ typedef struct st_key {
pk2 is explicitly present in idx1, it is not in the extension, so pk2 is explicitly present in idx1, it is not in the extension, so
ext_key_part_map.is_set(1) == false ext_key_part_map.is_set(1) == false
*/ */
LEX_CSTRING name;
key_part_map ext_key_part_map; key_part_map ext_key_part_map;
LEX_CSTRING name;
uint block_size; uint block_size;
enum ha_key_alg algorithm; enum ha_key_alg algorithm;
/* /*