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
a4342155
Commit
a4342155
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt
parents
45fc00ee
140c3ee9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
27 deletions
+3
-27
mysql-test/r/func_gconcat.result
mysql-test/r/func_gconcat.result
+0
-19
mysql-test/r/func_group.result
mysql-test/r/func_group.result
+0
-7
mysql-test/t/func_gconcat.test
mysql-test/t/func_gconcat.test
+1
-1
mysql-test/t/func_group.test
mysql-test/t/func_group.test
+2
-0
No files found.
mysql-test/r/func_gconcat.result
View file @
a4342155
...
@@ -69,25 +69,6 @@ grp group_concat(a order by d+c-ascii(c),a)
...
@@ -69,25 +69,6 @@ grp group_concat(a order by d+c-ascii(c),a)
1 1
1 1
2 3,2
2 3,2
3 7,8,4,6,9,5
3 7,8,4,6,9,5
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'a '
Warning 1292 Truncated incorrect DOUBLE value: 'a '
Warning 1292 Truncated incorrect DOUBLE value: 'a '
Warning 1292 Truncated incorrect DOUBLE value: 'b '
Warning 1292 Truncated incorrect DOUBLE value: 'b '
Warning 1292 Truncated incorrect DOUBLE value: 'c '
Warning 1292 Truncated incorrect DOUBLE value: 'a '
Warning 1292 Truncated incorrect DOUBLE value: 'E '
Warning 1292 Truncated incorrect DOUBLE value: 'b '
Warning 1292 Truncated incorrect DOUBLE value: 'C '
Warning 1292 Truncated incorrect DOUBLE value: 'b '
Warning 1292 Truncated incorrect DOUBLE value: 'D '
Warning 1292 Truncated incorrect DOUBLE value: 'd '
Warning 1292 Truncated incorrect DOUBLE value: 'd '
Warning 1292 Truncated incorrect DOUBLE value: 'd '
Warning 1292 Truncated incorrect DOUBLE value: 'd '
Warning 1292 Truncated incorrect DOUBLE value: 'c '
Warning 1292 Truncated incorrect DOUBLE value: 'D '
select grp,group_concat(c order by 1) from t1 group by grp;
select grp,group_concat(c order by 1) from t1 group by grp;
grp group_concat(c order by 1)
grp group_concat(c order by 1)
1 a
1 a
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/func_group.result
View file @
a4342155
...
@@ -62,13 +62,6 @@ NULL NULL
...
@@ -62,13 +62,6 @@ NULL NULL
1 7
1 7
2 20.25
2 20.25
3 45.483163247594
3 45.483163247594
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'a '
Warning 1292 Truncated incorrect DOUBLE value: 'a '
Warning 1292 Truncated incorrect DOUBLE value: 'b '
Warning 1292 Truncated incorrect DOUBLE value: 'c '
Warning 1292 Truncated incorrect DOUBLE value: 'C '
Warning 1292 Truncated incorrect DOUBLE value: 'E '
create table t2 (grp int, a bigint unsigned, c char(10));
create table t2 (grp int, a bigint unsigned, c char(10));
insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;
insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;
replace into t2 select grp, a, c from t1 limit 2,1;
replace into t2 select grp, a, c from t1 limit 2,1;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/func_gconcat.test
View file @
a4342155
...
@@ -31,8 +31,8 @@ select grp,group_concat(d order by a) from t1 group by grp;
...
@@ -31,8 +31,8 @@ select grp,group_concat(d order by a) from t1 group by grp;
select
grp
,
group_concat
(
d
order
by
a
desc
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
d
order
by
a
desc
)
from
t1
group
by
grp
;
--
disable_warnings
--
disable_warnings
select
grp
,
group_concat
(
a
order
by
a
,
d
+
c
-
ascii
(
c
)
-
a
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
a
order
by
a
,
d
+
c
-
ascii
(
c
)
-
a
)
from
t1
group
by
grp
;
--
enable_warnings
select
grp
,
group_concat
(
a
order
by
d
+
c
-
ascii
(
c
),
a
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
a
order
by
d
+
c
-
ascii
(
c
),
a
)
from
t1
group
by
grp
;
--
enable_warnings
select
grp
,
group_concat
(
c
order
by
1
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
c
order
by
1
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
distinct
c
order
by
c
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
distinct
c
order
by
c
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
distinct
c
order
by
c
desc
)
from
t1
group
by
grp
;
select
grp
,
group_concat
(
distinct
c
order
by
c
desc
)
from
t1
group
by
grp
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/func_group.test
View file @
a4342155
...
@@ -29,7 +29,9 @@ select count(distinct a),count(distinct grp) from t1;
...
@@ -29,7 +29,9 @@ select count(distinct a),count(distinct grp) from t1;
select
sum
(
all
a
),
count
(
all
a
),
avg
(
all
a
),
std
(
all
a
),
variance
(
all
a
),
bit_or
(
all
a
),
bit_and
(
all
a
),
min
(
all
a
),
max
(
all
a
),
min
(
all
c
),
max
(
all
c
)
from
t1
;
select
sum
(
all
a
),
count
(
all
a
),
avg
(
all
a
),
std
(
all
a
),
variance
(
all
a
),
bit_or
(
all
a
),
bit_and
(
all
a
),
min
(
all
a
),
max
(
all
a
),
min
(
all
c
),
max
(
all
c
)
from
t1
;
select
grp
,
sum
(
a
),
count
(
a
),
avg
(
a
),
std
(
a
),
variance
(
a
),
bit_or
(
a
),
bit_and
(
a
),
min
(
a
),
max
(
a
),
min
(
c
),
max
(
c
)
from
t1
group
by
grp
;
select
grp
,
sum
(
a
),
count
(
a
),
avg
(
a
),
std
(
a
),
variance
(
a
),
bit_or
(
a
),
bit_and
(
a
),
min
(
a
),
max
(
a
),
min
(
c
),
max
(
c
)
from
t1
group
by
grp
;
--
disable_warnings
select
grp
,
sum
(
a
)
+
count
(
a
)
+
avg
(
a
)
+
std
(
a
)
+
variance
(
a
)
+
bit_or
(
a
)
+
bit_and
(
a
)
+
min
(
a
)
+
max
(
a
)
+
min
(
c
)
+
max
(
c
)
as
sum
from
t1
group
by
grp
;
select
grp
,
sum
(
a
)
+
count
(
a
)
+
avg
(
a
)
+
std
(
a
)
+
variance
(
a
)
+
bit_or
(
a
)
+
bit_and
(
a
)
+
min
(
a
)
+
max
(
a
)
+
min
(
c
)
+
max
(
c
)
as
sum
from
t1
group
by
grp
;
--
enable_warnings
create
table
t2
(
grp
int
,
a
bigint
unsigned
,
c
char
(
10
));
create
table
t2
(
grp
int
,
a
bigint
unsigned
,
c
char
(
10
));
insert
into
t2
select
grp
,
max
(
a
)
+
max
(
grp
),
max
(
c
)
from
t1
group
by
grp
;
insert
into
t2
select
grp
,
max
(
a
)
+
max
(
grp
),
max
(
c
)
from
t1
group
by
grp
;
...
...
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