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
2c8fc886
Commit
2c8fc886
authored
Aug 08, 2005
by
bar@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item.cc:
After review fix
parent
1b40adcb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
sql/item.cc
sql/item.cc
+6
-4
No files found.
sql/item.cc
View file @
2c8fc886
...
...
@@ -455,16 +455,18 @@ bool DTCollation::aggregate(DTCollation &dt, uint flags)
;
// Do nothing
}
else
if
((
flags
&
MY_COLL_ALLOW_SUPERSET_CONV
)
&&
derivation
<=
dt
.
derivation
&&
collation
->
state
&
MY_CS_UNICODE
&&
!
(
dt
.
collation
->
state
&
MY_CS_UNICODE
))
(
derivation
<
dt
.
derivation
||
(
derivation
==
dt
.
derivation
&&
!
(
dt
.
collation
->
state
&
MY_CS_UNICODE
))))
{
// Do nothing
}
else
if
((
flags
&
MY_COLL_ALLOW_SUPERSET_CONV
)
&&
dt
.
derivation
<=
derivation
&&
dt
.
collation
->
state
&
MY_CS_UNICODE
&&
!
(
collation
->
state
&
MY_CS_UNICODE
))
(
dt
.
derivation
<
derivation
||
(
dt
.
derivation
==
derivation
&&
!
(
collation
->
state
&
MY_CS_UNICODE
))))
{
set
(
dt
);
}
...
...
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