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
59d847bd
Commit
59d847bd
authored
Apr 15, 2015
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-7814 Assertion `args[0]->fixed' fails in Item_func_conv_charset::Item_func_conv_charset
Removing a wrong assertion.
parent
b9a75862
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
mysql-test/r/ctype_utf8.result
mysql-test/r/ctype_utf8.result
+8
-0
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8.test
+8
-0
sql/item_strfunc.h
sql/item_strfunc.h
+0
-1
No files found.
mysql-test/r/ctype_utf8.result
View file @
59d847bd
...
...
@@ -5134,5 +5134,13 @@ a 1024
Warnings:
Warning 1260 Row 2 was cut by GROUP_CONCAT()
#
# MDEV-7814 Assertion `args[0]->fixed' fails in Item_func_conv_charset::Item_func_conv_charset
#
CREATE TABLE t1(a CHAR(1) CHARACTER SET latin1, b INT NOT NULL);
CREATE TABLE t2(a CHAR(1) CHARACTER SET utf8 COLLATE utf8_general_ci, b INT NOT NULL);
SELECT (SELECT t2.a FROM t2 WHERE t2.a=t1.a) AS aa, b, COUNT(b) FROM t1 GROUP BY aa;
aa b COUNT(b)
DROP TABLE t1,t2;
#
# End of 5.5 tests
#
mysql-test/t/ctype_utf8.test
View file @
59d847bd
...
...
@@ -1596,6 +1596,14 @@ FROM (SELECT 'a' AS id, REPEAT('foo bar', 100) AS body
UNION
ALL
SELECT
'a'
AS
id
,
REPEAT
(
'bla bla'
,
100
)
AS
body
)
t1
;
--
echo
#
--
echo
# MDEV-7814 Assertion `args[0]->fixed' fails in Item_func_conv_charset::Item_func_conv_charset
--
echo
#
CREATE
TABLE
t1
(
a
CHAR
(
1
)
CHARACTER
SET
latin1
,
b
INT
NOT
NULL
);
CREATE
TABLE
t2
(
a
CHAR
(
1
)
CHARACTER
SET
utf8
COLLATE
utf8_general_ci
,
b
INT
NOT
NULL
);
SELECT
(
SELECT
t2
.
a
FROM
t2
WHERE
t2
.
a
=
t1
.
a
)
AS
aa
,
b
,
COUNT
(
b
)
FROM
t1
GROUP
BY
aa
;
DROP
TABLE
t1
,
t2
;
--
echo
#
--
echo
# End of 5.5 tests
--
echo
#
sql/item_strfunc.h
View file @
59d847bd
...
...
@@ -827,7 +827,6 @@ public:
Item_func_conv_charset
(
Item
*
a
,
CHARSET_INFO
*
cs
,
bool
cache_if_const
)
:
Item_str_func
(
a
)
{
DBUG_ASSERT
(
args
[
0
]
->
fixed
);
conv_charset
=
cs
;
if
(
cache_if_const
&&
args
[
0
]
->
const_item
()
&&
!
args
[
0
]
->
is_expensive
())
{
...
...
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