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
03f9b2ce
Commit
03f9b2ce
authored
Dec 12, 2008
by
Gleb Shchepa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rollback of bug #40761 fix
parent
ce8ad64d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
56 deletions
+29
-56
mysql-test/r/func_if.result
mysql-test/r/func_if.result
+0
-9
mysql-test/t/func_if.test
mysql-test/t/func_if.test
+0
-13
sql/item_cmpfunc.cc
sql/item_cmpfunc.cc
+28
-22
sql/item_cmpfunc.h
sql/item_cmpfunc.h
+1
-0
sql/item_func.cc
sql/item_func.cc
+0
-10
sql/item_func.h
sql/item_func.h
+0
-2
No files found.
mysql-test/r/func_if.result
View file @
03f9b2ce
...
@@ -176,13 +176,4 @@ IF((ROUND(t1.a,2)=1), 2,
...
@@ -176,13 +176,4 @@ IF((ROUND(t1.a,2)=1), 2,
IF((ROUND(t1.a,2)=1), 2,
IF((ROUND(t1.a,2)=1), 2,
IF((R
IF((R
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (c LONGTEXT);
INSERT INTO t1 VALUES(1), (2), (3), (4), ('12345678901234567890');
SELECT * FROM (SELECT MAX(IF(1, CAST(c AS UNSIGNED), 0)) FROM t1) AS te;
MAX(IF(1, CAST(c AS UNSIGNED), 0))
12345678901234567890
SELECT * FROM (SELECT MAX(IFNULL(CAST(c AS UNSIGNED), 0)) FROM t1) AS te;
MAX(IFNULL(CAST(c AS UNSIGNED), 0))
12345678901234567890
DROP TABLE t1;
End of 5.0 tests
End of 5.0 tests
mysql-test/t/func_if.test
View file @
03f9b2ce
...
@@ -150,17 +150,4 @@ FROM t1;
...
@@ -150,17 +150,4 @@ FROM t1;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# Bug #40761: Assert on sum func on IF(..., CAST(longtext AS UNSIGNED), signed)
# (was: LEFT JOIN on inline view crashes server)
#
CREATE
TABLE
t1
(
c
LONGTEXT
);
INSERT
INTO
t1
VALUES
(
1
),
(
2
),
(
3
),
(
4
),
(
'12345678901234567890'
);
SELECT
*
FROM
(
SELECT
MAX
(
IF
(
1
,
CAST
(
c
AS
UNSIGNED
),
0
))
FROM
t1
)
AS
te
;
SELECT
*
FROM
(
SELECT
MAX
(
IFNULL
(
CAST
(
c
AS
UNSIGNED
),
0
))
FROM
t1
)
AS
te
;
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
sql/item_cmpfunc.cc
View file @
03f9b2ce
...
@@ -2069,23 +2069,21 @@ Item_func_ifnull::fix_length_and_dec()
...
@@ -2069,23 +2069,21 @@ Item_func_ifnull::fix_length_and_dec()
{
{
agg_result_type
(
&
hybrid_type
,
args
,
2
);
agg_result_type
(
&
hybrid_type
,
args
,
2
);
maybe_null
=
args
[
1
]
->
maybe_null
;
maybe_null
=
args
[
1
]
->
maybe_null
;
decimals
=
max
(
args
[
0
]
->
decimals
,
args
[
1
]
->
decimals
);
unsigned_flag
=
args
[
0
]
->
unsigned_flag
&&
args
[
1
]
->
unsigned_flag
;
if
(
hybrid_type
==
DECIMAL_RESULT
||
hybrid_type
==
INT_RESULT
)
if
(
hybrid_type
==
DECIMAL_RESULT
||
hybrid_type
==
INT_RESULT
)
{
{
max_length
=
0
;
int
len0
=
args
[
0
]
->
max_length
-
args
[
0
]
->
decimals
decimals
=
0
;
-
(
args
[
0
]
->
unsigned_flag
?
0
:
1
)
;
unsigned_flag
=
TRUE
;
agg_num_lengths
(
args
[
0
]);
int
len1
=
args
[
1
]
->
max_length
-
args
[
1
]
->
decimals
agg_num_lengths
(
args
[
1
]
);
-
(
args
[
1
]
->
unsigned_flag
?
0
:
1
);
max_length
=
my_decimal_precision_to_length
(
max_length
+
decimals
,
decimals
,
unsigned_flag
);
max_length
=
max
(
len0
,
len1
)
+
decimals
+
(
unsigned_flag
?
0
:
1
);
}
}
else
else
{
max_length
=
max
(
args
[
0
]
->
max_length
,
args
[
1
]
->
max_length
);
max_length
=
max
(
args
[
0
]
->
max_length
,
args
[
1
]
->
max_length
);
decimals
=
max
(
args
[
0
]
->
decimals
,
args
[
1
]
->
decimals
);
unsigned_flag
=
args
[
0
]
->
unsigned_flag
&&
args
[
1
]
->
unsigned_flag
;
}
switch
(
hybrid_type
)
{
switch
(
hybrid_type
)
{
case
STRING_RESULT
:
case
STRING_RESULT
:
...
@@ -2240,6 +2238,8 @@ void
...
@@ -2240,6 +2238,8 @@ void
Item_func_if
::
fix_length_and_dec
()
Item_func_if
::
fix_length_and_dec
()
{
{
maybe_null
=
args
[
1
]
->
maybe_null
||
args
[
2
]
->
maybe_null
;
maybe_null
=
args
[
1
]
->
maybe_null
||
args
[
2
]
->
maybe_null
;
decimals
=
max
(
args
[
1
]
->
decimals
,
args
[
2
]
->
decimals
);
unsigned_flag
=
args
[
1
]
->
unsigned_flag
&&
args
[
2
]
->
unsigned_flag
;
enum
Item_result
arg1_type
=
args
[
1
]
->
result_type
();
enum
Item_result
arg1_type
=
args
[
1
]
->
result_type
();
enum
Item_result
arg2_type
=
args
[
2
]
->
result_type
();
enum
Item_result
arg2_type
=
args
[
2
]
->
result_type
();
...
@@ -2276,20 +2276,16 @@ Item_func_if::fix_length_and_dec()
...
@@ -2276,20 +2276,16 @@ Item_func_if::fix_length_and_dec()
if
((
cached_result_type
==
DECIMAL_RESULT
)
if
((
cached_result_type
==
DECIMAL_RESULT
)
||
(
cached_result_type
==
INT_RESULT
))
||
(
cached_result_type
==
INT_RESULT
))
{
{
max_length
=
0
;
int
len1
=
args
[
1
]
->
max_length
-
args
[
1
]
->
decimals
decimals
=
0
;
-
(
args
[
1
]
->
unsigned_flag
?
0
:
1
)
;
unsigned_flag
=
TRUE
;
agg_num_lengths
(
args
[
1
]);
int
len2
=
args
[
2
]
->
max_length
-
args
[
2
]
->
decimals
agg_num_lengths
(
args
[
2
]
);
-
(
args
[
2
]
->
unsigned_flag
?
0
:
1
);
max_length
=
my_decimal_precision_to_length
(
max_length
+
decimals
,
decimals
,
unsigned_flag
);
max_length
=
max
(
len1
,
len2
)
+
decimals
+
(
unsigned_flag
?
0
:
1
);
}
}
else
else
{
max_length
=
max
(
args
[
1
]
->
max_length
,
args
[
2
]
->
max_length
);
max_length
=
max
(
args
[
1
]
->
max_length
,
args
[
2
]
->
max_length
);
decimals
=
max
(
args
[
1
]
->
decimals
,
args
[
2
]
->
decimals
);
unsigned_flag
=
args
[
1
]
->
unsigned_flag
&&
args
[
2
]
->
unsigned_flag
;
}
}
}
...
@@ -2637,6 +2633,16 @@ void Item_func_case::agg_str_lengths(Item* arg)
...
@@ -2637,6 +2633,16 @@ void Item_func_case::agg_str_lengths(Item* arg)
}
}
void
Item_func_case
::
agg_num_lengths
(
Item
*
arg
)
{
uint
len
=
my_decimal_length_to_precision
(
arg
->
max_length
,
arg
->
decimals
,
arg
->
unsigned_flag
)
-
arg
->
decimals
;
set_if_bigger
(
max_length
,
len
);
set_if_bigger
(
decimals
,
arg
->
decimals
);
unsigned_flag
=
unsigned_flag
&&
arg
->
unsigned_flag
;
}
void
Item_func_case
::
fix_length_and_dec
()
void
Item_func_case
::
fix_length_and_dec
()
{
{
Item
**
agg
;
Item
**
agg
;
...
...
sql/item_cmpfunc.h
View file @
03f9b2ce
...
@@ -759,6 +759,7 @@ public:
...
@@ -759,6 +759,7 @@ public:
Item
*
find_item
(
String
*
str
);
Item
*
find_item
(
String
*
str
);
CHARSET_INFO
*
compare_collation
()
{
return
cmp_collation
.
collation
;
}
CHARSET_INFO
*
compare_collation
()
{
return
cmp_collation
.
collation
;
}
void
agg_str_lengths
(
Item
*
arg
);
void
agg_str_lengths
(
Item
*
arg
);
void
agg_num_lengths
(
Item
*
arg
);
};
};
...
...
sql/item_func.cc
View file @
03f9b2ce
...
@@ -5668,13 +5668,3 @@ void Item_func_sp::update_used_tables()
...
@@ -5668,13 +5668,3 @@ void Item_func_sp::update_used_tables()
const_item_cache
=
FALSE
;
const_item_cache
=
FALSE
;
}
}
}
}
void
Item_func
::
agg_num_lengths
(
Item
*
arg
)
{
uint
len
=
my_decimal_length_to_precision
(
arg
->
max_length
,
arg
->
decimals
,
arg
->
unsigned_flag
)
-
arg
->
decimals
;
set_if_bigger
(
max_length
,
len
);
set_if_bigger
(
decimals
,
arg
->
decimals
);
unsigned_flag
=
unsigned_flag
&&
arg
->
unsigned_flag
;
}
sql/item_func.h
View file @
03f9b2ce
...
@@ -193,8 +193,6 @@ public:
...
@@ -193,8 +193,6 @@ public:
void
*
arg
,
traverse_order
order
);
void
*
arg
,
traverse_order
order
);
bool
is_expensive_processor
(
byte
*
arg
);
bool
is_expensive_processor
(
byte
*
arg
);
virtual
bool
is_expensive
()
{
return
0
;
}
virtual
bool
is_expensive
()
{
return
0
;
}
protected:
void
agg_num_lengths
(
Item
*
arg
);
};
};
...
...
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