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
6ec1c061
Commit
6ec1c061
authored
Oct 27, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b13347
parents
fe90e567
cabb72f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
120 additions
and
34 deletions
+120
-34
mysql-test/r/ctype_cp1250_ch.result
mysql-test/r/ctype_cp1250_ch.result
+23
-0
mysql-test/t/ctype_cp1250_ch.test
mysql-test/t/ctype_cp1250_ch.test
+21
-0
strings/ctype-win1250ch.c
strings/ctype-win1250ch.c
+76
-34
No files found.
mysql-test/r/ctype_cp1250_ch.result
View file @
6ec1c061
...
...
@@ -19,3 +19,26 @@ SELECT * FROM t1 WHERE popisek LIKE '2005-01-1';
popisek
2005-01-1
drop table t1;
set names cp1250;
CREATE TABLE t1
(
id INT AUTO_INCREMENT PRIMARY KEY,
str VARCHAR(32) CHARACTER SET cp1250 COLLATE cp1250_czech_cs NOT NULL default '',
UNIQUE KEY (str)
);
INSERT INTO t1 VALUES (NULL, 'a');
INSERT INTO t1 VALUES (NULL, 'aa');
INSERT INTO t1 VALUES (NULL, 'aaa');
INSERT INTO t1 VALUES (NULL, 'aaaa');
INSERT INTO t1 VALUES (NULL, 'aaaaa');
INSERT INTO t1 VALUES (NULL, 'aaaaaa');
INSERT INTO t1 VALUES (NULL, 'aaaaaaa');
select * from t1 where str like 'aa%';
id str
2 aa
3 aaa
4 aaaa
5 aaaaa
6 aaaaaa
7 aaaaaaa
drop table t1;
mysql-test/t/ctype_cp1250_ch.test
View file @
6ec1c061
...
...
@@ -23,4 +23,25 @@ SELECT * FROM t1 WHERE popisek = '2005-01-1';
SELECT
*
FROM
t1
WHERE
popisek
LIKE
'2005-01-1'
;
drop
table
t1
;
#
# Bug#13347: empty result from query with like and cp1250 charset
#
set
names
cp1250
;
CREATE
TABLE
t1
(
id
INT
AUTO_INCREMENT
PRIMARY
KEY
,
str
VARCHAR
(
32
)
CHARACTER
SET
cp1250
COLLATE
cp1250_czech_cs
NOT
NULL
default
''
,
UNIQUE
KEY
(
str
)
);
INSERT
INTO
t1
VALUES
(
NULL
,
'a'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'aa'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'aaa'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'aaaa'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'aaaaa'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'aaaaaa'
);
INSERT
INTO
t1
VALUES
(
NULL
,
'aaaaaaa'
);
select
*
from
t1
where
str
like
'aa%'
;
drop
table
t1
;
# End of 4.1 tests
strings/ctype-win1250ch.c
View file @
6ec1c061
...
...
@@ -512,42 +512,84 @@ static int my_strnxfrm_win1250ch(CHARSET_INFO * cs __attribute__((unused)),
#ifdef REAL_MYSQL
static
uchar
NEAR
like_range_prefix_min_win1250ch
[]
=
static
uchar
NEAR
like_range_prefix_min_win1250ch
[]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
32
,
33
,
34
,
35
,
36
,
37
,
38
,
39
,
40
,
41
,
42
,
43
,
44
,
45
,
46
,
47
,
48
,
49
,
50
,
51
,
52
,
53
,
54
,
55
,
56
,
57
,
58
,
59
,
60
,
61
,
62
,
63
,
64
,
65
,
66
,
67
,
68
,
69
,
70
,
71
,
72
,
73
,
74
,
75
,
76
,
77
,
78
,
79
,
80
,
81
,
82
,
83
,
84
,
85
,
86
,
87
,
88
,
89
,
90
,
91
,
92
,
93
,
94
,
95
,
96
,
54
,
66
,
67
,
68
,
69
,
70
,
71
,
72
,
73
,
74
,
75
,
76
,
77
,
78
,
79
,
80
,
81
,
82
,
83
,
84
,
85
,
86
,
87
,
88
,
89
,
90
,
165
,
124
,
125
,
126
,
0
,
0
,
0
,
130
,
0
,
132
,
133
,
134
,
135
,
0
,
137
,
138
,
139
,
83
,
84
,
142
,
90
,
0
,
145
,
146
,
147
,
148
,
149
,
150
,
151
,
0
,
153
,
138
,
155
,
83
,
84
,
142
,
90
,
32
,
161
,
162
,
76
,
164
,
165
,
166
,
167
,
168
,
65
,
83
,
171
,
172
,
173
,
174
,
90
,
176
,
177
,
178
,
76
,
180
,
181
,
0
,
183
,
184
,
65
,
83
,
187
,
76
,
189
,
76
,
90
,
82
,
65
,
65
,
65
,
65
,
76
,
67
,
67
,
200
,
69
,
69
,
69
,
69
,
73
,
73
,
68
,
68
,
78
,
78
,
79
,
79
,
79
,
79
,
215
,
216
,
85
,
85
,
85
,
85
,
89
,
84
,
223
,
82
,
65
,
65
,
65
,
65
,
76
,
67
,
67
,
200
,
69
,
69
,
69
,
69
,
73
,
73
,
68
,
68
,
78
,
78
,
79
,
79
,
79
,
79
,
247
,
216
,
85
,
85
,
85
,
85
,
89
,
84
,
255
,
0x00
,
0x01
,
0x02
,
0x03
,
0x04
,
0x05
,
0x06
,
0x07
,
0x08
,
0x09
,
0x0A
,
0x0B
,
0x0C
,
0x0D
,
0x0E
,
0x0F
,
0x10
,
0x11
,
0x12
,
0x13
,
0x14
,
0x15
,
0x16
,
0x17
,
0x18
,
0x19
,
0x1A
,
0x1B
,
0x1C
,
0x1D
,
0x1E
,
0x1F
,
0x20
,
0x21
,
0x22
,
0x23
,
0x24
,
0x25
,
0x26
,
0x27
,
0x28
,
0x29
,
0x2A
,
0x2B
,
0x2C
,
0x2D
,
0x2E
,
0x2F
,
0x30
,
0x31
,
0x32
,
0x33
,
0x34
,
0x35
,
0x36
,
0x37
,
0x38
,
0x39
,
0x3A
,
0x3B
,
0x3C
,
0x3D
,
0x3E
,
0x3F
,
0x40
,
0x41
,
0x42
,
0x43
,
0x44
,
0x45
,
0x46
,
0x47
,
0x48
,
0x49
,
0x4A
,
0x4B
,
0x4C
,
0x4D
,
0x4E
,
0x4F
,
0x50
,
0x51
,
0x52
,
0x53
,
0x54
,
0x55
,
0x56
,
0x57
,
0x58
,
0x59
,
0x5A
,
0x5B
,
0x5C
,
0x5D
,
0x5E
,
0x5F
,
0x60
,
0x61
,
0x62
,
0x63
,
0x64
,
0x65
,
0x66
,
0x67
,
0x68
,
0x69
,
0x6A
,
0x6B
,
0x6C
,
0x6D
,
0x6E
,
0x6F
,
0x70
,
0x71
,
0x72
,
0x73
,
0x74
,
0x75
,
0x76
,
0x77
,
0x78
,
0x79
,
0x7A
,
0x7B
,
0x7C
,
0x7D
,
0x7E
,
0x7F
,
0x80
,
0x81
,
0x82
,
0x83
,
0x84
,
0x85
,
0x86
,
0x87
,
0x88
,
0x89
,
0x8A
,
0x8B
,
0x8C
,
0x8D
,
0x8E
,
0x8F
,
0x90
,
0x91
,
0x92
,
0x93
,
0x94
,
0x95
,
0x96
,
0x97
,
0x98
,
0x99
,
0x9A
,
0x9B
,
0x9C
,
0x9D
,
0x9E
,
0x9F
,
0xA0
,
0xA1
,
0xA2
,
0xA3
,
0xA4
,
0xA5
,
0xA6
,
0xA7
,
0xA8
,
0xA9
,
0xAA
,
0xAB
,
0xAC
,
0xAD
,
0xAE
,
0xAF
,
0xB0
,
0xB1
,
0xB2
,
0xB3
,
0xB4
,
0xB5
,
0xB6
,
0xB7
,
0xB8
,
0xB9
,
0xBA
,
0xBB
,
0xBC
,
0xBD
,
0xBE
,
0xBF
,
0xC0
,
0xC1
,
0xC2
,
0xC3
,
0xC4
,
0xC5
,
0xC6
,
0xC7
,
0xC8
,
0xC9
,
0xCA
,
0xCB
,
0xCC
,
0xCD
,
0xCE
,
0xCF
,
0xD0
,
0xD1
,
0xD2
,
0xD3
,
0xD4
,
0xD5
,
0xD6
,
0xD7
,
0xD8
,
0xD9
,
0xDA
,
0xDB
,
0xDC
,
0xDD
,
0xDE
,
0xDF
,
0xE0
,
0xE1
,
0xE2
,
0xE3
,
0xE4
,
0xE5
,
0xE6
,
0xE7
,
0xE8
,
0xE9
,
0xEA
,
0xEB
,
0xEC
,
0xED
,
0xEE
,
0xEF
,
0xF0
,
0xF1
,
0xF2
,
0xF3
,
0xF4
,
0xF5
,
0xF6
,
0xF7
,
0xF8
,
0xF9
,
0xFA
,
0xFB
,
0xFC
,
0xFD
,
0xFE
,
0xFF
};
static
uchar
NEAR
like_range_prefix_max_win1250ch
[]
=
{
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
182
,
160
,
33
,
34
,
35
,
36
,
37
,
38
,
39
,
40
,
41
,
42
,
43
,
44
,
45
,
46
,
47
,
48
,
49
,
50
,
51
,
52
,
53
,
54
,
55
,
56
,
57
,
58
,
59
,
60
,
61
,
62
,
63
,
64
,
185
,
98
,
73
,
240
,
234
,
102
,
103
,
104
,
238
,
106
,
107
,
179
,
109
,
242
,
245
,
112
,
113
,
224
,
186
,
254
,
251
,
118
,
119
,
120
,
253
,
159
,
91
,
92
,
93
,
94
,
95
,
96
,
54
,
98
,
73
,
240
,
234
,
102
,
103
,
104
,
238
,
106
,
107
,
179
,
109
,
242
,
245
,
112
,
113
,
224
,
186
,
254
,
251
,
118
,
119
,
120
,
253
,
159
,
165
,
124
,
125
,
126
,
182
,
182
,
182
,
130
,
182
,
132
,
133
,
134
,
135
,
182
,
137
,
154
,
139
,
186
,
254
,
158
,
159
,
182
,
145
,
146
,
147
,
148
,
149
,
150
,
151
,
182
,
153
,
154
,
155
,
186
,
254
,
158
,
159
,
32
,
161
,
162
,
179
,
164
,
165
,
166
,
167
,
168
,
185
,
186
,
171
,
172
,
173
,
174
,
159
,
176
,
177
,
178
,
179
,
180
,
181
,
182
,
183
,
184
,
185
,
186
,
187
,
179
,
189
,
179
,
159
,
224
,
185
,
185
,
185
,
185
,
179
,
238
,
238
,
200
,
234
,
234
,
234
,
234
,
238
,
238
,
240
,
240
,
242
,
242
,
245
,
245
,
245
,
245
,
215
,
248
,
251
,
251
,
251
,
251
,
253
,
254
,
223
,
224
,
185
,
185
,
185
,
185
,
179
,
238
,
238
,
200
,
234
,
234
,
234
,
234
,
238
,
238
,
240
,
240
,
242
,
242
,
245
,
245
,
245
,
245
,
247
,
248
,
251
,
251
,
251
,
251
,
253
,
254
,
255
,
/*
The letter "C" is a special case:
"CH" is sorted between "H" and "I".
prefix_max for "C" is "I": prefix_max[0x43] == 0x49
prefix_max for "c" is "i": prefix_max[0x63] == 0x69
For all other characters: prefix_max[i] == i
*/
static
uchar
NEAR
like_range_prefix_max_win1250ch
[]
=
{
0x00
,
0x01
,
0x02
,
0x03
,
0x04
,
0x05
,
0x06
,
0x07
,
0x08
,
0x09
,
0x0A
,
0x0B
,
0x0C
,
0x0D
,
0x0E
,
0x0F
,
0x10
,
0x11
,
0x12
,
0x13
,
0x14
,
0x15
,
0x16
,
0x17
,
0x18
,
0x19
,
0x1A
,
0x1B
,
0x1C
,
0x1D
,
0x1E
,
0x1F
,
0x20
,
0x21
,
0x22
,
0x23
,
0x24
,
0x25
,
0x26
,
0x27
,
0x28
,
0x29
,
0x2A
,
0x2B
,
0x2C
,
0x2D
,
0x2E
,
0x2F
,
0x30
,
0x31
,
0x32
,
0x33
,
0x34
,
0x35
,
0x36
,
0x37
,
0x38
,
0x39
,
0x3A
,
0x3B
,
0x3C
,
0x3D
,
0x3E
,
0x3F
,
0x40
,
0x41
,
0x42
,
0x49
,
0x44
,
0x45
,
0x46
,
0x47
,
0x48
,
0x49
,
0x4A
,
0x4B
,
0x4C
,
0x4D
,
0x4E
,
0x4F
,
0x50
,
0x51
,
0x52
,
0x53
,
0x54
,
0x55
,
0x56
,
0x57
,
0x58
,
0x59
,
0x5A
,
0x5B
,
0x5C
,
0x5D
,
0x5E
,
0x5F
,
0x60
,
0x61
,
0x62
,
0x69
,
0x64
,
0x65
,
0x66
,
0x67
,
0x68
,
0x69
,
0x6A
,
0x6B
,
0x6C
,
0x6D
,
0x6E
,
0x6F
,
0x70
,
0x71
,
0x72
,
0x73
,
0x74
,
0x75
,
0x76
,
0x77
,
0x78
,
0x79
,
0x7A
,
0x7B
,
0x7C
,
0x7D
,
0x7E
,
0x7F
,
0x80
,
0x81
,
0x82
,
0x83
,
0x84
,
0x85
,
0x86
,
0x87
,
0x88
,
0x89
,
0x8A
,
0x8B
,
0x8C
,
0x8D
,
0x8E
,
0x8F
,
0x90
,
0x91
,
0x92
,
0x93
,
0x94
,
0x95
,
0x96
,
0x97
,
0x98
,
0x99
,
0x9A
,
0x9B
,
0x9C
,
0x9D
,
0x9E
,
0x9F
,
0xA0
,
0xA1
,
0xA2
,
0xA3
,
0xA4
,
0xA5
,
0xA6
,
0xA7
,
0xA8
,
0xA9
,
0xAA
,
0xAB
,
0xAC
,
0xAD
,
0xAE
,
0xAF
,
0xB0
,
0xB1
,
0xB2
,
0xB3
,
0xB4
,
0xB5
,
0xB6
,
0xB7
,
0xB8
,
0xB9
,
0xBA
,
0xBB
,
0xBC
,
0xBD
,
0xBE
,
0xBF
,
0xC0
,
0xC1
,
0xC2
,
0xC3
,
0xC4
,
0xC5
,
0xC6
,
0xC7
,
0xC8
,
0xC9
,
0xCA
,
0xCB
,
0xCC
,
0xCD
,
0xCE
,
0xCF
,
0xD0
,
0xD1
,
0xD2
,
0xD3
,
0xD4
,
0xD5
,
0xD6
,
0xD7
,
0xD8
,
0xD9
,
0xDA
,
0xDB
,
0xDC
,
0xDD
,
0xDE
,
0xDF
,
0xE0
,
0xE1
,
0xE2
,
0xE3
,
0xE4
,
0xE5
,
0xE6
,
0xE7
,
0xE8
,
0xE9
,
0xEA
,
0xEB
,
0xEC
,
0xED
,
0xEE
,
0xEF
,
0xF0
,
0xF1
,
0xF2
,
0xF3
,
0xF4
,
0xF5
,
0xF6
,
0xF7
,
0xF8
,
0xF9
,
0xFA
,
0xFB
,
0xFC
,
0xFD
,
0xFE
,
0xFF
};
#define min_sort_char '\x20'
...
...
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