Commit f582ea4d authored by Alexander Barkov's avatar Alexander Barkov

A cleanup for MDEV-12668 SRID is not preserved in UNION, VIEW, MIN, MAX

Fixing storage/mroonga according to MDEV-12668
parent 001f93df
...@@ -11895,7 +11895,7 @@ int ha_mroonga::storage_encode_key_set(Field *field, const uchar *key, ...@@ -11895,7 +11895,7 @@ int ha_mroonga::storage_encode_key_set(Field *field, const uchar *key,
field->null_bit, field->unireg_check, field->null_bit, field->unireg_check,
&field->field_name, &field->field_name,
field->pack_length(), field->pack_length(),
static_cast<Field_set*>(field)->typelib, static_cast<Field_set*>(field)->typelib(),
static_cast<Field_set*>(field)->charset()); static_cast<Field_set*>(field)->charset());
switch (field->pack_length()) { switch (field->pack_length()) {
case 1: case 1:
......
...@@ -599,7 +599,7 @@ namespace mrn { ...@@ -599,7 +599,7 @@ namespace mrn {
string = const_item->val_str(NULL); string = const_item->val_str(NULL);
Field_enum *enum_field = static_cast<Field_enum *>(field_item->field); Field_enum *enum_field = static_cast<Field_enum *>(field_item->field);
int enum_value = find_type(string->c_ptr(), int enum_value = find_type(string->c_ptr(),
enum_field->typelib, enum_field->typelib(),
FIND_TYPE_BASIC); FIND_TYPE_BASIC);
GRN_INT64_SET(ctx_, &value_, enum_value); GRN_INT64_SET(ctx_, &value_, enum_value);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment