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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
543bcba8
Commit
543bcba8
authored
Mar 21, 2003
by
monty@narttu.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
parents
23a5413b
11a810d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
mysql-test/t/innodb.test
mysql-test/t/innodb.test
+1
-1
strings/ctype-utf8.c
strings/ctype-utf8.c
+7
-8
No files found.
mysql-test/t/innodb.test
View file @
543bcba8
...
...
@@ -49,7 +49,7 @@ select * from t1 where parent_id=102;
explain
select
level
from
t1
where
level
=
1
;
--
replace_result
12
# 6 #
explain
select
level
,
id
from
t1
where
level
=
1
;
--
replace_result
12
# 6 #
--
replace_result
12
# 6 #
5 #
explain
select
level
,
id
,
parent_id
from
t1
where
level
=
1
;
select
level
,
id
from
t1
where
level
=
1
;
select
level
,
id
,
parent_id
from
t1
where
level
=
1
;
...
...
strings/ctype-utf8.c
View file @
543bcba8
...
...
@@ -1585,14 +1585,15 @@ static uchar to_upper_utf8[] = {
};
static
int
my_utf8_uni
(
CHARSET_INFO
*
cs
__attribute__
((
unused
))
,
my_wc_t
*
pwc
,
const
uchar
*
s
,
const
uchar
*
e
)
static
int
my_utf8_uni
(
CHARSET_INFO
*
cs
__attribute__
((
unused
)),
my_wc_t
*
pwc
,
const
uchar
*
s
,
const
uchar
*
e
)
{
unsigned
char
c
=
s
[
0
]
;
unsigned
char
c
;
if
(
s
>=
e
)
return
MY_CS_TOOFEW
(
0
);
c
=
s
[
0
];
if
(
c
<
0x80
)
{
*
pwc
=
c
;
...
...
@@ -1624,10 +1625,8 @@ static int my_utf8_uni (CHARSET_INFO *cs __attribute__((unused)) ,
(
my_wc_t
)
(
s
[
2
]
^
0x80
);
return
3
;
#ifdef UNICODE_32BIT
}
#ifdef UNICODE_32BIT
else
if
(
c
<
0xf8
&&
sizeof
(
my_wc_t
)
*
8
>=
32
)
{
if
(
s
+
4
>
e
)
/* We need 4 characters */
...
...
@@ -1685,9 +1684,9 @@ static int my_utf8_uni (CHARSET_INFO *cs __attribute__((unused)) ,
|
((
my_wc_t
)
(
s
[
4
]
^
0x80
)
<<
6
)
|
(
my_wc_t
)
(
s
[
5
]
^
0x80
);
return
6
;
}
#endif
}
else
return
MY_CS_ILSEQ
;
return
MY_CS_ILSEQ
;
}
static
int
my_uni_utf8
(
CHARSET_INFO
*
cs
__attribute__
((
unused
))
,
...
...
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