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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
38e5832c
Commit
38e5832c
authored
Jan 22, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2290/mysql-4.0
parents
9629e0d3
a37384fb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
1 deletion
+24
-1
mysql-test/r/func_str.result
mysql-test/r/func_str.result
+7
-0
mysql-test/t/func_str.test
mysql-test/t/func_str.test
+9
-0
sql/item_strfunc.cc
sql/item_strfunc.cc
+8
-1
No files found.
mysql-test/r/func_str.result
View file @
38e5832c
...
@@ -266,3 +266,10 @@ CONCAT("</a>",RPAD("",(55 - LENGTH(title)),"."))
...
@@ -266,3 +266,10 @@ CONCAT("</a>",RPAD("",(55 - LENGTH(title)),"."))
NULL
NULL
</a>..........................
</a>..........................
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (i int, j int);
INSERT INTO t1 VALUES (1,1),(2,2);
SELECT DISTINCT i, ELT(j, '345', '34') FROM t1;
i ELT(j, '345', '34')
1 345
2 34
DROP TABLE t1;
mysql-test/t/func_str.test
View file @
38e5832c
...
@@ -154,3 +154,12 @@ INSERT INTO t1 VALUES ('House passes the CAREERS bill');
...
@@ -154,3 +154,12 @@ INSERT INTO t1 VALUES ('House passes the CAREERS bill');
SELECT
CONCAT
(
"</a>"
,
RPAD
(
""
,(
55
-
LENGTH
(
title
)),
"."
))
from
t1
;
SELECT
CONCAT
(
"</a>"
,
RPAD
(
""
,(
55
-
LENGTH
(
title
)),
"."
))
from
t1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# test for Bug #2290 "output truncated with ELT when using DISTINCT"
#
CREATE
TABLE
t1
(
i
int
,
j
int
);
INSERT
INTO
t1
VALUES
(
1
,
1
),(
2
,
2
);
SELECT
DISTINCT
i
,
ELT
(
j
,
'345'
,
'34'
)
FROM
t1
;
DROP
TABLE
t1
;
sql/item_strfunc.cc
View file @
38e5832c
...
@@ -1507,7 +1507,14 @@ void Item_func_elt::fix_length_and_dec()
...
@@ -1507,7 +1507,14 @@ void Item_func_elt::fix_length_and_dec()
{
{
max_length
=
0
;
max_length
=
0
;
decimals
=
0
;
decimals
=
0
;
for
(
uint
i
=
1
;
i
<
arg_count
;
i
++
)
/*
first numeric argument isn't in args (3.23 and 4.0)
but since 4.1 the cycle should start from 1
so this change
should NOT be merged into 4.1!!!
*/
for
(
uint
i
=
0
;
i
<
arg_count
;
i
++
)
{
{
set_if_bigger
(
max_length
,
args
[
i
]
->
max_length
);
set_if_bigger
(
max_length
,
args
[
i
]
->
max_length
);
set_if_bigger
(
decimals
,
args
[
i
]
->
decimals
);
set_if_bigger
(
decimals
,
args
[
i
]
->
decimals
);
...
...
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