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
0991df96
Commit
0991df96
authored
Aug 12, 2004
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents
d971e4d4
37b46ed2
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
231 additions
and
29 deletions
+231
-29
.bzrignore
.bzrignore
+13
-0
mysql-test/r/ctype_uca.result
mysql-test/r/ctype_uca.result
+110
-0
mysql-test/r/func_gconcat.result
mysql-test/r/func_gconcat.result
+30
-0
mysql-test/t/ctype_uca.test
mysql-test/t/ctype_uca.test
+1
-1
mysql-test/t/func_gconcat.test
mysql-test/t/func_gconcat.test
+35
-0
mysys/mf_keycache.c
mysys/mf_keycache.c
+21
-21
sql/item_sum.cc
sql/item_sum.cc
+9
-6
sql/share/charsets/cp852.xml
sql/share/charsets/cp852.xml
+2
-0
strings/ctype-simple.c
strings/ctype-simple.c
+9
-0
strings/ctype-uca.c
strings/ctype-uca.c
+1
-1
No files found.
.bzrignore
View file @
0991df96
...
@@ -792,3 +792,16 @@ libmysql/my_time.c
...
@@ -792,3 +792,16 @@ libmysql/my_time.c
libmysqld/my_time.c
libmysqld/my_time.c
sql/mysql_tzinfo_to_sql
sql/mysql_tzinfo_to_sql
sql/mysql_tzinfo_to_sql.cc
sql/mysql_tzinfo_to_sql.cc
ndb/src/cw/cpcd/ndb_cpcd
ndb/src/kernel/ndbd
ndb/src/kernel/blocks/backup/restore/ndb_restore
ndb/src/mgmclient/ndb_mgm
ndb/src/mgmsrv/ndb_mgmd
ndb/tools/ndb_delete_all
ndb/tools/ndb_desc
ndb/tools/ndb_drop_index
ndb/tools/ndb_drop_table
ndb/tools/ndb_select_all
ndb/tools/ndb_select_count
ndb/tools/ndb_show_tables
ndb/tools/ndb_waiter
mysql-test/r/ctype_uca.result
View file @
0991df96
...
@@ -1548,6 +1548,116 @@ Z,z,Ź,ź,Ż,ż
...
@@ -1548,6 +1548,116 @@ Z,z,Ź,ź,Ż,ż
ǁ
ǁ
ǂ
ǂ
ǃ
ǃ
select group_concat(c1 order by c1) from t1 group by c1 collate utf8_slovak_ci;
group_concat(c1 order by c1)
÷
×
A,a,À,Á,Â,Ã,Å,à,á,â,ã,å,Ā,ā,Ă,ă,Ą,ą,Ǎ,ǎ,Ǟ,ǟ,Ǡ,ǡ,Ǻ,ǻ
AA,Aa,aA,aa
Ä,ä
Æ,æ,Ǣ,ǣ,Ǽ,ǽ
B,b
ƀ
Ɓ
Ƃ,ƃ
C,c,Ç,ç,Ć,ć,Ĉ,ĉ,Ċ,ċ
cH
Č,č
Ƈ,ƈ
D,d,Ď,ď
DZ,Dz,dZ,dz,DŽ,Dž,dž,DZ,Dz,dz
Đ,đ
Ɖ
Ɗ
Ƌ,ƌ
Ð,ð
E,e,È,É,Ê,Ë,è,é,ê,ë,Ē,ē,Ĕ,ĕ,Ė,ė,Ę,ę,Ě,ě
Ǝ,ǝ
Ə
Ɛ
F,f
Ƒ,ƒ
G,g,Ĝ,ĝ,Ğ,ğ,Ġ,ġ,Ģ,ģ,Ǧ,ǧ,Ǵ,ǵ
Ǥ,ǥ
Ɠ
Ɣ
Ƣ,ƣ
H,h,Ĥ,ĥ
CH,Ch,ch
ƕ,Ƕ
Ħ,ħ
I,i,Ì,Í,Î,Ï,ì,í,î,ï,Ĩ,ĩ,Ī,ī,Ĭ,ĭ,Į,į,İ,Ǐ,ǐ
IJ,Ij,iJ,ij,IJ,ij
ı
Ɨ
Ɩ
J,j,Ĵ,ĵ,ǰ
K,k,Ķ,ķ,Ǩ,ǩ
Ƙ,ƙ
L,l,Ĺ,ĺ,Ļ,ļ,Ľ,ľ
Ŀ,ŀ
LJ,Lj,lJ,lj,LJ,Lj,lj
LL,Ll,lL,ll
Ł,ł
ƚ
ƛ
M,m
N,n,Ñ,ñ,Ń,ń,Ņ,ņ,Ň,ň,Ǹ,ǹ
NJ,Nj,nJ,nj,NJ,Nj,nj
Ɲ
ƞ
Ŋ,ŋ
O,o,Ò,Ó,Õ,Ö,ò,ó,õ,ö,Ō,ō,Ŏ,ŏ,Ő,ő,Ơ,ơ,Ǒ,ǒ,Ǫ,ǫ,Ǭ,ǭ
OE,Oe,oE,oe,Œ,œ
Ô,ô
Ø,ø,Ǿ,ǿ
Ɔ
Ɵ
P,p
Ƥ,ƥ
Q,q
ĸ
R,r,Ŕ,ŕ,Ŗ,ŗ,Ř,ř
RR,Rr,rR,rr
Ʀ
S,s,Ś,ś,Ŝ,ŝ,Ş,ş,ſ
SS,Ss,sS,ss,ß
Š,š
Ʃ
ƪ
T,t,Ţ,ţ,Ť,ť
ƾ
Ŧ,ŧ
ƫ
Ƭ,ƭ
Ʈ
U,u,Ù,Ú,Û,Ü,ù,ú,û,ü,Ũ,ũ,Ū,ū,Ŭ,ŭ,Ů,ů,Ű,ű,Ų,ų,Ư,ư,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ
Ɯ
Ʊ
V,v
Ʋ
W,w,Ŵ,ŵ
X,x
Y,y,Ý,ý,ÿ,Ŷ,ŷ,Ÿ
Ƴ,ƴ
Z,z,Ź,ź,Ż,ż
ƍ
Ž,ž
Ƶ,ƶ
Ʒ,Ǯ,ǯ
Ƹ,ƹ
ƺ
Þ,þ
ƿ,Ƿ
ƻ
Ƨ,ƨ
Ƽ,ƽ
Ƅ,ƅ
ʼn
ǀ
ǁ
ǂ
ǃ
select group_concat(c1 order by c1) from t1 group by c1 collate utf8_spanish2_ci;
select group_concat(c1 order by c1) from t1 group by c1 collate utf8_spanish2_ci;
group_concat(c1 order by c1)
group_concat(c1 order by c1)
÷
÷
...
...
mysql-test/r/func_gconcat.result
View file @
0991df96
...
@@ -321,3 +321,33 @@ HAVING LEFT(names, 1) ='J';
...
@@ -321,3 +321,33 @@ HAVING LEFT(names, 1) ='J';
names
names
John###Anna###Bill
John###Anna###Bill
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 ( a int, b TEXT );
INSERT INTO t1 VALUES (1,'First Row'), (2,'Second Row');
SELECT GROUP_CONCAT(b ORDER BY b) FROM t1 GROUP BY a;
GROUP_CONCAT(b ORDER BY b)
First Row
Second Row
DROP TABLE t1;
CREATE TABLE t1 (a_id tinyint(4) NOT NULL default '0', PRIMARY KEY (a_id)) ENGINE=InnoDB DEFAULT CHARSET=latin1;
INSERT INTO t1 VALUES (1),(2),(3);
CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL default '0', PRIMARY KEY (b_id), KEY (b_a),
CONSTRAINT fk_b_a FOREIGN KEY (b_a) REFERENCES t1 (a_id) ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE=InnoDB DEFAULT CHARSET=latin1;
INSERT INTO t2 VALUES (1,1),(2,1),(3,1),(4,2),(5,2);
SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t1 LEFT JOIN (t2) on t1.a_id = t2.b_a) GROUP BY t1.a_id ) AS xyz;
a_id b_list
1 1,2,3
2 4,5
3 NULL
DROP TABLE t2;
DROP TABLE t1;
CREATE TABLE t1 (A_ID INT NOT NULL,A_DESC CHAR(3) NOT NULL,PRIMARY KEY (A_ID));
INSERT INTO t1 VALUES (1,'ABC'), (2,'EFG'), (3,'HIJ');
CREATE TABLE t2 (A_ID INT NOT NULL,B_DESC CHAR(3) NOT NULL,PRIMARY KEY (A_ID,B_DESC));
INSERT INTO t2 VALUES (1,'A'),(1,'B'),(3,'F');
SELECT t1.A_ID, GROUP_CONCAT(t2.B_DESC) AS B_DESC FROM t1 LEFT JOIN t2 ON t1.A_ID=t2.A_ID GROUP BY t1.A_ID ORDER BY t1.A_DESC;
A_ID B_DESC
1 A,B
2 NULL
3 F
DROP TABLE t1;
DROP TABLE t2;
mysql-test/t/ctype_uca.test
View file @
0991df96
...
@@ -176,7 +176,7 @@ select group_concat(c1 order by c1) from t1 group by c1 collate utf8_turkish_ci;
...
@@ -176,7 +176,7 @@ select group_concat(c1 order by c1) from t1 group by c1 collate utf8_turkish_ci;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_czech_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_czech_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_danish_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_danish_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_lithuanian_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_lithuanian_ci
;
--
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_slovak_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_slovak_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_spanish2_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_spanish2_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_roman_ci
;
select
group_concat
(
c1
order
by
c1
)
from
t1
group
by
c1
collate
utf8_roman_ci
;
mysql-test/t/func_gconcat.test
View file @
0991df96
...
@@ -201,3 +201,38 @@ SELECT GROUP_CONCAT(a SEPARATOR '||') AS names FROM t1
...
@@ -201,3 +201,38 @@ SELECT GROUP_CONCAT(a SEPARATOR '||') AS names FROM t1
SELECT
GROUP_CONCAT
(
a
SEPARATOR
'###'
)
AS
names
FROM
t1
SELECT
GROUP_CONCAT
(
a
SEPARATOR
'###'
)
AS
names
FROM
t1
HAVING
LEFT
(
names
,
1
)
=
'J'
;
HAVING
LEFT
(
names
,
1
)
=
'J'
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# check blobs
#
CREATE
TABLE
t1
(
a
int
,
b
TEXT
);
INSERT
INTO
t1
VALUES
(
1
,
'First Row'
),
(
2
,
'Second Row'
);
SELECT
GROUP_CONCAT
(
b
ORDER
BY
b
)
FROM
t1
GROUP
BY
a
;
DROP
TABLE
t1
;
#
# check null values #1
#
CREATE
TABLE
t1
(
a_id
tinyint
(
4
)
NOT
NULL
default
'0'
,
PRIMARY
KEY
(
a_id
))
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
latin1
;
INSERT
INTO
t1
VALUES
(
1
),(
2
),(
3
);
CREATE
TABLE
t2
(
b_id
tinyint
(
4
)
NOT
NULL
default
'0'
,
b_a
tinyint
(
4
)
NOT
NULL
default
'0'
,
PRIMARY
KEY
(
b_id
),
KEY
(
b_a
),
CONSTRAINT
fk_b_a
FOREIGN
KEY
(
b_a
)
REFERENCES
t1
(
a_id
)
ON
DELETE
CASCADE
ON
UPDATE
NO
ACTION
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
latin1
;
INSERT
INTO
t2
VALUES
(
1
,
1
),(
2
,
1
),(
3
,
1
),(
4
,
2
),(
5
,
2
);
SELECT
*
FROM
(
SELECT
t1
.*
,
GROUP_CONCAT
(
t2
.
b_id
SEPARATOR
','
)
as
b_list
FROM
(
t1
LEFT
JOIN
(
t2
)
on
t1
.
a_id
=
t2
.
b_a
)
GROUP
BY
t1
.
a_id
)
AS
xyz
;
DROP
TABLE
t2
;
DROP
TABLE
t1
;
#
# check null values #2
#
CREATE
TABLE
t1
(
A_ID
INT
NOT
NULL
,
A_DESC
CHAR
(
3
)
NOT
NULL
,
PRIMARY
KEY
(
A_ID
));
INSERT
INTO
t1
VALUES
(
1
,
'ABC'
),
(
2
,
'EFG'
),
(
3
,
'HIJ'
);
CREATE
TABLE
t2
(
A_ID
INT
NOT
NULL
,
B_DESC
CHAR
(
3
)
NOT
NULL
,
PRIMARY
KEY
(
A_ID
,
B_DESC
));
INSERT
INTO
t2
VALUES
(
1
,
'A'
),(
1
,
'B'
),(
3
,
'F'
);
SELECT
t1
.
A_ID
,
GROUP_CONCAT
(
t2
.
B_DESC
)
AS
B_DESC
FROM
t1
LEFT
JOIN
t2
ON
t1
.
A_ID
=
t2
.
A_ID
GROUP
BY
t1
.
A_ID
ORDER
BY
t1
.
A_DESC
;
DROP
TABLE
t1
;
DROP
TABLE
t2
;
mysys/mf_keycache.c
View file @
0991df96
...
@@ -625,7 +625,7 @@ writes: %ld r_requests: %ld reads: %ld",
...
@@ -625,7 +625,7 @@ writes: %ld r_requests: %ld reads: %ld",
if
(
cleanup
)
if
(
cleanup
)
{
{
pthread_mutex_destroy
(
&
keycache
->
cache_lock
);
pthread_mutex_destroy
(
&
keycache
->
cache_lock
);
keycache
->
key_cache_inited
=
0
;
keycache
->
key_cache_inited
=
keycache
->
can_be_used
=
0
;
KEYCACHE_DEBUG_CLOSE
;
KEYCACHE_DEBUG_CLOSE
;
}
}
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
...
...
sql/item_sum.cc
View file @
0991df96
...
@@ -1966,12 +1966,12 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
...
@@ -1966,12 +1966,12 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
Fix fields for select list and ORDER clause
Fix fields for select list and ORDER clause
*/
*/
for
(
i
=
0
;
i
<
arg_count
;
i
++
)
for
(
i
=
0
;
i
<
arg_count
;
i
++
)
{
{
if
(
args
[
i
]
->
fix_fields
(
thd
,
tables
,
args
+
i
)
||
args
[
i
]
->
check_cols
(
1
))
if
(
args
[
i
]
->
fix_fields
(
thd
,
tables
,
args
+
i
)
||
args
[
i
]
->
check_cols
(
1
))
return
1
;
return
1
;
if
(
i
<
arg_count_field
&&
args
[
i
]
->
maybe_null
)
if
(
i
<
arg_count_field
)
maybe_null
=
0
;
maybe_null
|=
args
[
i
]
->
maybe_null
;
}
}
result_field
=
0
;
result_field
=
0
;
...
@@ -2043,10 +2043,13 @@ bool Item_func_group_concat::setup(THD *thd)
...
@@ -2043,10 +2043,13 @@ bool Item_func_group_concat::setup(THD *thd)
Note that in the table, we first have the ORDER BY fields, then the
Note that in the table, we first have the ORDER BY fields, then the
field list.
field list.
We need to set set_sum_field in true for storing value of blob in buffer
of a record instead of a pointer of one.
*/
*/
if
(
!
(
table
=
create_tmp_table
(
thd
,
tmp_table_param
,
all_fields
,
0
,
if
(
!
(
table
=
create_tmp_table
(
thd
,
tmp_table_param
,
all_fields
,
0
,
0
,
0
,
select_lex
->
options
|
thd
->
options
,
(
ORDER
*
)
0
,
0
,
TRUE
,
select_lex
->
options
|
thd
->
options
,
(
char
*
)
""
)))
HA_POS_ERROR
,
(
char
*
)
""
)))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
table
->
file
->
extra
(
HA_EXTRA_NO_ROWS
);
table
->
file
->
extra
(
HA_EXTRA_NO_ROWS
);
table
->
no_rows
=
1
;
table
->
no_rows
=
1
;
...
...
sql/share/charsets/cp852.xml
View file @
0991df96
...
@@ -114,6 +114,8 @@
...
@@ -114,6 +114,8 @@
</map>
</map>
</collation>
</collation>
<collation
name=
"cp852_bin"
flag=
"binary"
/>
</charset>
</charset>
</charsets>
</charsets>
strings/ctype-simple.c
View file @
0991df96
...
@@ -1171,6 +1171,15 @@ static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(uint))
...
@@ -1171,6 +1171,15 @@ static my_bool create_fromuni(CHARSET_INFO *cs, void *(*alloc)(uint))
uni_idx
idx
[
PLANE_NUM
];
uni_idx
idx
[
PLANE_NUM
];
int
i
,
n
;
int
i
,
n
;
/*
Check that Unicode map is loaded.
It can be not loaded when the collation is
listed in Index.xml but not specified
in the character set specific XML file.
*/
if
(
!
cs
->
tab_to_uni
)
return
TRUE
;
/* Clear plane statistics */
/* Clear plane statistics */
bzero
(
idx
,
sizeof
(
idx
));
bzero
(
idx
,
sizeof
(
idx
));
...
...
strings/ctype-uca.c
View file @
0991df96
...
@@ -6645,7 +6645,7 @@ static const char slovak[]=
...
@@ -6645,7 +6645,7 @@ static const char slovak[]=
"& H < ch <<< Ch <<< CH"
"& H < ch <<< Ch <<< CH"
"& O <
\\
u00F4 <<<
\\
u00D4"
"& O <
\\
u00F4 <<<
\\
u00D4"
"& S <
\\
u0161 <<<
\\
u0160"
"& S <
\\
u0161 <<<
\\
u0160"
"& Z <
\\
u017E <<<
\\
017D"
;
"& Z <
\\
u017E <<<
\\
u
017D"
;
static
const
char
spanish2
[]
=
/* Also good for Asturian and Galician */
static
const
char
spanish2
[]
=
/* Also good for Asturian and Galician */
"&C < ch <<< Ch <<< CH"
"&C < ch <<< Ch <<< CH"
...
...
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