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
5b34888c
Commit
5b34888c
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
parents
6d771166
b31eca1e
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
77 additions
and
6 deletions
+77
-6
include/m_ctype.h
include/m_ctype.h
+5
-0
mysql-test/include/have_latin2_ch.inc
mysql-test/include/have_latin2_ch.inc
+4
-0
mysql-test/r/ctype_latin2_ch.result
mysql-test/r/ctype_latin2_ch.result
+30
-0
mysql-test/r/have_latin2_ch.require
mysql-test/r/have_latin2_ch.require
+2
-0
mysql-test/t/ctype_latin2_ch.test
mysql-test/t/ctype_latin2_ch.test
+30
-0
strings/ctype-bin.c
strings/ctype-bin.c
+4
-4
strings/ctype-czech.c
strings/ctype-czech.c
+2
-2
No files found.
include/m_ctype.h
View file @
5b34888c
...
@@ -360,6 +360,11 @@ int my_wildcmp_8bit(CHARSET_INFO *,
...
@@ -360,6 +360,11 @@ int my_wildcmp_8bit(CHARSET_INFO *,
const
char
*
wildstr
,
const
char
*
wildend
,
const
char
*
wildstr
,
const
char
*
wildend
,
int
escape
,
int
w_one
,
int
w_many
);
int
escape
,
int
w_one
,
int
w_many
);
int
my_wildcmp_bin
(
CHARSET_INFO
*
,
const
char
*
str
,
const
char
*
str_end
,
const
char
*
wildstr
,
const
char
*
wildend
,
int
escape
,
int
w_one
,
int
w_many
);
uint
my_numchars_8bit
(
CHARSET_INFO
*
,
const
char
*
b
,
const
char
*
e
);
uint
my_numchars_8bit
(
CHARSET_INFO
*
,
const
char
*
b
,
const
char
*
e
);
uint
my_numcells_8bit
(
CHARSET_INFO
*
,
const
char
*
b
,
const
char
*
e
);
uint
my_numcells_8bit
(
CHARSET_INFO
*
,
const
char
*
b
,
const
char
*
e
);
uint
my_charpos_8bit
(
CHARSET_INFO
*
,
const
char
*
b
,
const
char
*
e
,
uint
pos
);
uint
my_charpos_8bit
(
CHARSET_INFO
*
,
const
char
*
b
,
const
char
*
e
,
uint
pos
);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/include/have_latin2_ch.inc
0 → 100644
View file @
5b34888c
--
require
r
/
have_latin2_ch
.
require
disable_query_log
;
show
collation
like
"latin2_czech_cs"
;
enable_query_log
;
This diff is collapsed.
Click to expand it.
mysql-test/r/ctype_latin2_ch.result
0 → 100644
View file @
5b34888c
drop table if exists t1;
set names latin2;
select 'A' = 'a' collate latin2_czech_cs;
'A' = 'a' collate latin2_czech_cs
0
create table t1 (
id int(5) not null,
tt char(255) not null
) character set latin2 collate latin2_czech_cs;
insert into t1 values (1,'Aa');
insert into t1 values (2,'Aas');
alter table t1 add primary key aaa(tt);
select * from t1 where tt like 'Aa%';
id tt
1 Aa
2 Aas
select * from t1 ignore index (primary) where tt like 'Aa%';
id tt
1 Aa
2 Aas
select * from t1 where tt like '%Aa%';
id tt
1 Aa
2 Aas
select * from t1 where tt like 'AA%';
id tt
select * from t1 ignore index (primary) where tt like 'AA%';
id tt
select * from t1 where tt like '%AA%';
id tt
This diff is collapsed.
Click to expand it.
mysql-test/r/have_latin2_ch.require
0 → 100644
View file @
5b34888c
Collation Charset Id Default Compiled Sortlen
latin2_czech_cs latin2 2 Yes 4
This diff is collapsed.
Click to expand it.
mysql-test/t/ctype_latin2_ch.test
0 → 100644
View file @
5b34888c
--
source
include
/
have_latin2_ch
.
inc
#
# Tests with latin2_czech_cs
#
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
#
# Bug#17374: select ... like 'A%' operator fails
# to find value on columuns with key
#
set
names
latin2
;
select
'A'
=
'a'
collate
latin2_czech_cs
;
create
table
t1
(
id
int
(
5
)
not
null
,
tt
char
(
255
)
not
null
)
character
set
latin2
collate
latin2_czech_cs
;
insert
into
t1
values
(
1
,
'Aa'
);
insert
into
t1
values
(
2
,
'Aas'
);
alter
table
t1
add
primary
key
aaa
(
tt
);
select
*
from
t1
where
tt
like
'Aa%'
;
select
*
from
t1
ignore
index
(
primary
)
where
tt
like
'Aa%'
;
select
*
from
t1
where
tt
like
'%Aa%'
;
select
*
from
t1
where
tt
like
'AA%'
;
select
*
from
t1
ignore
index
(
primary
)
where
tt
like
'AA%'
;
select
*
from
t1
where
tt
like
'%AA%'
;
# End of 4.1 tests
This diff is collapsed.
Click to expand it.
strings/ctype-bin.c
View file @
5b34888c
...
@@ -295,10 +295,10 @@ void my_hash_sort_bin(CHARSET_INFO *cs __attribute__((unused)),
...
@@ -295,10 +295,10 @@ void my_hash_sort_bin(CHARSET_INFO *cs __attribute__((unused)),
#define INC_PTR(cs,A,B) (A)++
#define INC_PTR(cs,A,B) (A)++
static
int
my_wildcmp_bin
(
CHARSET_INFO
*
cs
,
int
my_wildcmp_bin
(
CHARSET_INFO
*
cs
,
const
char
*
str
,
const
char
*
str_end
,
const
char
*
str
,
const
char
*
str_end
,
const
char
*
wildstr
,
const
char
*
wildend
,
const
char
*
wildstr
,
const
char
*
wildend
,
int
escape
,
int
w_one
,
int
w_many
)
int
escape
,
int
w_one
,
int
w_many
)
{
{
int
result
=
-
1
;
/* Not found, using wildcards */
int
result
=
-
1
;
/* Not found, using wildcards */
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-czech.c
View file @
5b34888c
...
@@ -356,7 +356,7 @@ static int my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)),
...
@@ -356,7 +356,7 @@ static int my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)),
#ifdef REAL_MYSQL
#ifdef REAL_MYSQL
#define min_sort_char
0
#define min_sort_char
' '
#define max_sort_char '9'
#define max_sort_char '9'
#define EXAMPLE
#define EXAMPLE
...
@@ -595,7 +595,7 @@ static MY_COLLATION_HANDLER my_collation_latin2_czech_ci_handler =
...
@@ -595,7 +595,7 @@ static MY_COLLATION_HANDLER my_collation_latin2_czech_ci_handler =
my_strnxfrm_czech
,
my_strnxfrm_czech
,
my_strnxfrmlen_simple
,
my_strnxfrmlen_simple
,
my_like_range_czech
,
my_like_range_czech
,
my_wildcmp_
8bit
,
my_wildcmp_
bin
,
my_strcasecmp_8bit
,
my_strcasecmp_8bit
,
my_instr_simple
,
my_instr_simple
,
my_hash_sort_simple
,
my_hash_sort_simple
,
...
...
This diff is collapsed.
Click to expand it.
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