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
b088609a
Commit
b088609a
authored
Sep 02, 2014
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A clean-up for the previous patch
parent
1427e1db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
0 deletions
+14
-0
mysql-test/r/ctype_utf8.result
mysql-test/r/ctype_utf8.result
+7
-0
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8.test
+5
-0
sql/item.cc
sql/item.cc
+2
-0
No files found.
mysql-test/r/ctype_utf8.result
View file @
b088609a
...
@@ -5954,6 +5954,13 @@ SET @arg00=_binary 0xFF;
...
@@ -5954,6 +5954,13 @@ SET @arg00=_binary 0xFF;
EXECUTE stmt USING @arg00;
EXECUTE stmt USING @arg00;
ERROR HY000: Invalid utf8 character string: 'FF'
ERROR HY000: Invalid utf8 character string: 'FF'
DEALLOCATE PREPARE stmt;
DEALLOCATE PREPARE stmt;
SET NAMES latin1;
PREPARE stmt FROM "SELECT CONCAT(_utf8'a' COLLATE utf8_unicode_ci, ?)";
EXECUTE stmt USING @no_such_var;
CONCAT(_utf8'a' COLLATE utf8_unicode_ci, ?)
NULL
DEALLOCATE PREPARE stmt;
SET NAMES utf8;
#
#
# End of 10.0 tests
# End of 10.0 tests
#
#
mysql-test/t/ctype_utf8.test
View file @
b088609a
...
@@ -1675,6 +1675,11 @@ SET @arg00=_binary 0xFF;
...
@@ -1675,6 +1675,11 @@ SET @arg00=_binary 0xFF;
--
error
ER_INVALID_CHARACTER_STRING
--
error
ER_INVALID_CHARACTER_STRING
EXECUTE
stmt
USING
@
arg00
;
EXECUTE
stmt
USING
@
arg00
;
DEALLOCATE
PREPARE
stmt
;
DEALLOCATE
PREPARE
stmt
;
SET
NAMES
latin1
;
PREPARE
stmt
FROM
"SELECT CONCAT(_utf8'a' COLLATE utf8_unicode_ci, ?)"
;
EXECUTE
stmt
USING
@
no_such_var
;
DEALLOCATE
PREPARE
stmt
;
SET
NAMES
utf8
;
--
echo
#
--
echo
#
--
echo
# End of 10.0 tests
--
echo
# End of 10.0 tests
...
...
sql/item.cc
View file @
b088609a
...
@@ -1274,6 +1274,8 @@ Item *Item_param::safe_charset_converter(CHARSET_INFO *tocs)
...
@@ -1274,6 +1274,8 @@ Item *Item_param::safe_charset_converter(CHARSET_INFO *tocs)
*/
*/
if
(
const_item
())
if
(
const_item
())
{
{
if
(
state
==
NULL_VALUE
)
return
this
;
uint
cnv_errors
;
uint
cnv_errors
;
String
*
ostr
=
val_str
(
&
cnvstr
);
String
*
ostr
=
val_str
(
&
cnvstr
);
if
(
!
needs_charset_converter
(
tocs
))
if
(
!
needs_charset_converter
(
tocs
))
...
...
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