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
7ba944c4
Commit
7ba944c4
authored
Apr 02, 2011
by
Gleb Shchepa
Browse files
Options
Browse Files
Download
Plain Diff
auto-merge 5.1-->5.5 (bug 11766094)
parents
8e2b0dc6
7aa81e2a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
mysql-test/r/func_group.result
mysql-test/r/func_group.result
+9
-0
mysql-test/t/func_group.test
mysql-test/t/func_group.test
+10
-0
sql/item.cc
sql/item.cc
+1
-1
No files found.
mysql-test/r/func_group.result
View file @
7ba944c4
...
@@ -1737,6 +1737,15 @@ SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b11111111111111111111111111111111
...
@@ -1737,6 +1737,15 @@ SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b11111111111111111111111111111111
SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
SELECT RELEASE_LOCK('aaaaaaaaaaaaaaaaa');
SELECT RELEASE_LOCK('aaaaaaaaaaaaaaaaa');
#
#
# Bug #11766094 - 59132: MIN() AND MAX() REMOVE UNSIGNEDNESS
#
CREATE TABLE t1 (a BIGINT UNSIGNED);
INSERT INTO t1 VALUES (18446668621106209655);
SELECT MAX(LENGTH(a)), LENGTH(MAX(a)), MIN(a), MAX(a), CONCAT(MIN(a)), CONCAT(MAX(a)) FROM t1;
MAX(LENGTH(a)) LENGTH(MAX(a)) MIN(a) MAX(a) CONCAT(MIN(a)) CONCAT(MAX(a))
20 20 18446668621106209655 18446668621106209655 18446668621106209655 18446668621106209655
DROP TABLE t1;
#
End of 5.1 tests
End of 5.1 tests
#
#
# Bug#52123 Assertion failed: aggregator == aggr->Aggrtype(),
# Bug#52123 Assertion failed: aggregator == aggr->Aggrtype(),
...
...
mysql-test/t/func_group.test
View file @
7ba944c4
...
@@ -1117,6 +1117,16 @@ SELECT RELEASE_LOCK('aaaaaaaaaaaaaaaaa');
...
@@ -1117,6 +1117,16 @@ SELECT RELEASE_LOCK('aaaaaaaaaaaaaaaaa');
--
enable_result_log
--
enable_result_log
--
echo
#
--
echo
# Bug #11766094 - 59132: MIN() AND MAX() REMOVE UNSIGNEDNESS
--
echo
#
CREATE
TABLE
t1
(
a
BIGINT
UNSIGNED
);
INSERT
INTO
t1
VALUES
(
18446668621106209655
);
SELECT
MAX
(
LENGTH
(
a
)),
LENGTH
(
MAX
(
a
)),
MIN
(
a
),
MAX
(
a
),
CONCAT
(
MIN
(
a
)),
CONCAT
(
MAX
(
a
))
FROM
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
#
--
echo
End
of
5.1
tests
--
echo
End
of
5.1
tests
...
...
sql/item.cc
View file @
7ba944c4
...
@@ -7472,7 +7472,7 @@ String *Item_cache_int::val_str(String *str)
...
@@ -7472,7 +7472,7 @@ String *Item_cache_int::val_str(String *str)
DBUG_ASSERT
(
fixed
==
1
);
DBUG_ASSERT
(
fixed
==
1
);
if
(
!
has_value
())
if
(
!
has_value
())
return
NULL
;
return
NULL
;
str
->
set
(
value
,
default_charset
());
str
->
set
_int
(
value
,
unsigned_flag
,
default_charset
());
return
str
;
return
str
;
}
}
...
...
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