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
12ef4ff5
Commit
12ef4ff5
authored
Jun 07, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
parents
07ad3fc4
ef8115d6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
myisam/mi_key.c
myisam/mi_key.c
+3
-3
myisam/mi_rnext_same.c
myisam/mi_rnext_same.c
+2
-2
mysql-test/r/ctype_utf8.result
mysql-test/r/ctype_utf8.result
+3
-0
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8.test
+1
-0
No files found.
myisam/mi_key.c
View file @
12ef4ff5
...
...
@@ -107,8 +107,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
}
if
(
keyseg
->
flag
&
HA_SPACE_PACK
)
{
FIX_LENGTH
(
cs
,
pos
,
length
,
char_length
);
end
=
pos
+
char_length
;
end
=
pos
+
length
;
if
(
type
!=
HA_KEYTYPE_NUM
)
{
while
(
end
>
pos
&&
end
[
-
1
]
==
' '
)
...
...
@@ -119,7 +118,8 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
while
(
pos
<
end
&&
pos
[
0
]
==
' '
)
pos
++
;
}
char_length
=
(
uint
)
(
end
-
pos
);
length
=
(
uint
)
(
end
-
pos
);
FIX_LENGTH
(
cs
,
pos
,
length
,
char_length
);
store_key_length_inc
(
key
,
char_length
);
memcpy
((
byte
*
)
key
,(
byte
*
)
pos
,(
size_t
)
char_length
);
key
+=
char_length
;
...
...
myisam/mi_rnext_same.c
View file @
12ef4ff5
...
...
@@ -68,8 +68,8 @@ int mi_rnext_same(MI_INFO *info, byte *buf)
info
->
lastkey_length
,
SEARCH_BIGGER
,
info
->
s
->
state
.
key_root
[
inx
])))
break
;
if
(
ha_key_cmp
(
keyinfo
->
seg
,
info
->
lastkey2
,
info
->
lastkey
,
info
->
last_rkey_length
,
SEARCH_FIND
,
&
not_used
))
if
(
ha_key_cmp
(
keyinfo
->
seg
,
info
->
lastkey
,
info
->
lastkey2
,
info
->
last_rkey_length
,
SEARCH_FIND
,
&
not_used
))
{
error
=
1
;
my_errno
=
HA_ERR_END_OF_FILE
;
...
...
mysql-test/r/ctype_utf8.result
View file @
12ef4ff5
...
...
@@ -901,4 +901,7 @@ insert into t1 values (2,'Durban');
select * from t1 where city = 'Durban';
id city
2 Durban
select * from t1 where city = 'Durban ';
id city
2 Durban
drop table t1;
mysql-test/t/ctype_utf8.test
View file @
12ef4ff5
...
...
@@ -744,4 +744,5 @@ create table t1 (
insert
into
t1
values
(
1
,
'Durban North'
);
insert
into
t1
values
(
2
,
'Durban'
);
select
*
from
t1
where
city
=
'Durban'
;
select
*
from
t1
where
city
=
'Durban '
;
drop
table
t1
;
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