Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f582ea4d
Commit
f582ea4d
authored
Apr 29, 2024
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A cleanup for MDEV-12668 SRID is not preserved in UNION, VIEW, MIN, MAX
Fixing storage/mroonga according to MDEV-12668
parent
001f93df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
storage/mroonga/ha_mroonga.cpp
storage/mroonga/ha_mroonga.cpp
+1
-1
storage/mroonga/lib/mrn_condition_converter.cpp
storage/mroonga/lib/mrn_condition_converter.cpp
+1
-1
No files found.
storage/mroonga/ha_mroonga.cpp
View file @
f582ea4d
...
@@ -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
:
...
...
storage/mroonga/lib/mrn_condition_converter.cpp
View file @
f582ea4d
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment