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
c773b320
Commit
c773b320
authored
Jul 10, 2015
by
Sreeharsha Ramanavarapu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mysql-5.1' into mysql-5.5
parents
7255ae6c
33a2e5ab
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
173 additions
and
47 deletions
+173
-47
mysql-test/r/partition_utf8.result
mysql-test/r/partition_utf8.result
+6
-0
mysql-test/r/plugin_auth_qa.result
mysql-test/r/plugin_auth_qa.result
+9
-0
mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
...uite/engines/iuds/r/strings_charsets_update_delete.result
+0
-0
mysql-test/suite/sys_vars/r/character_set_connection_func.result
...est/suite/sys_vars/r/character_set_connection_func.result
+6
-0
sql/item.cc
sql/item.cc
+32
-22
sql/item.h
sql/item.h
+8
-1
sql/item_strfunc.cc
sql/item_strfunc.cc
+13
-5
sql/sql_class.cc
sql/sql_class.cc
+22
-15
sql/sql_string.cc
sql/sql_string.cc
+67
-1
sql/sql_string.h
sql/sql_string.h
+4
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+6
-2
No files found.
mysql-test/r/partition_utf8.result
View file @
c773b320
...
@@ -2,6 +2,10 @@ set names utf8;
...
@@ -2,6 +2,10 @@ set names utf8;
create table t1 (a varchar(2) character set cp1250)
create table t1 (a varchar(2) character set cp1250)
partition by list columns (a)
partition by list columns (a)
( partition p0 values in (0x81));
( partition p0 values in (0x81));
Warnings:
Warning 1300 Invalid cp1250 character string: '81'
Warning 1300 Invalid cp1250 character string: '81'
Warning 1300 Invalid cp1250 character string: '81'
show create table t1;
show create table t1;
Table Create Table
Table Create Table
t1 CREATE TABLE `t1` (
t1 CREATE TABLE `t1` (
...
@@ -9,6 +13,8 @@ t1 CREATE TABLE `t1` (
...
@@ -9,6 +13,8 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1
/*!50500 PARTITION BY LIST COLUMNS(a)
/*!50500 PARTITION BY LIST COLUMNS(a)
(PARTITION p0 VALUES IN (_cp1250 0x81) ENGINE = MyISAM) */
(PARTITION p0 VALUES IN (_cp1250 0x81) ENGINE = MyISAM) */
Warnings:
Warning 1300 Invalid cp1250 character string: '81'
drop table t1;
drop table t1;
create table t1 (a varchar(2) character set cp1250)
create table t1 (a varchar(2) character set cp1250)
partition by list columns (a)
partition by list columns (a)
...
...
mysql-test/r/plugin_auth_qa.result
View file @
c773b320
...
@@ -214,15 +214,24 @@ plüg_dest NULL
...
@@ -214,15 +214,24 @@ plüg_dest NULL
DROP USER plüg_dest;
DROP USER plüg_dest;
SET NAMES ascii;
SET NAMES ascii;
CREATE USER 'plüg' IDENTIFIED WITH 'test_plugin_server' AS 'plüg_dest';
CREATE USER 'plüg' IDENTIFIED WITH 'test_plugin_server' AS 'plüg_dest';
Warnings:
Warning 1300 Invalid ascii character string: 'pl\xC3\xBCg'
Warning 1300 Invalid ascii character string: 'pl\xC3\xBCg_...'
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
user plugin authentication_string
user plugin authentication_string
pl??g test_plugin_server pl??g_dest
pl??g test_plugin_server pl??g_dest
DROP USER 'plüg';
DROP USER 'plüg';
Warnings:
Warning 1300 Invalid ascii character string: 'pl\xC3\xBCg'
CREATE USER 'plüg_dest' IDENTIFIED BY 'plug_dest_passwd';
CREATE USER 'plüg_dest' IDENTIFIED BY 'plug_dest_passwd';
Warnings:
Warning 1300 Invalid ascii character string: 'pl\xC3\xBCg_...'
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root';
user plugin authentication_string
user plugin authentication_string
pl??g_dest NULL
pl??g_dest NULL
DROP USER 'plüg_dest';
DROP USER 'plüg_dest';
Warnings:
Warning 1300 Invalid ascii character string: 'pl\xC3\xBCg_...'
SET NAMES latin1;
SET NAMES latin1;
========== test 1.1.1.5 ====================================
========== test 1.1.1.5 ====================================
CREATE USER 'plüg' IDENTIFIED WITH 'test_plügin_server' AS 'plüg_dest';
CREATE USER 'plüg' IDENTIFIED WITH 'test_plügin_server' AS 'plüg_dest';
...
...
mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
View file @
c773b320
No preview for this file type
mysql-test/suite/sys_vars/r/character_set_connection_func.result
View file @
c773b320
...
@@ -23,6 +23,8 @@ SET @@session.character_set_connection = latin1;
...
@@ -23,6 +23,8 @@ SET @@session.character_set_connection = latin1;
SELECT 'ЁЂЃЄ' AS utf_text;
SELECT 'ЁЂЃЄ' AS utf_text;
utf_text
utf_text
????
????
Warnings:
Warning 1300 Invalid utf8 character string: '\xD0\x81\xD0\x82\xD0\x83...'
SET @@session.character_set_connection = utf8;
SET @@session.character_set_connection = utf8;
SELECT 'ЁЂЃЄ' AS utf_text;
SELECT 'ЁЂЃЄ' AS utf_text;
utf_text
utf_text
...
@@ -30,6 +32,8 @@ utf_text
...
@@ -30,6 +32,8 @@ utf_text
'---now inserting utf8 string with different character_set_connection--'
'---now inserting utf8 string with different character_set_connection--'
SET @@session.character_set_connection = ascii;
SET @@session.character_set_connection = ascii;
INSERT INTO t1 VALUES('ЁЂЃЄ');
INSERT INTO t1 VALUES('ЁЂЃЄ');
Warnings:
Warning 1300 Invalid utf8 character string: '\xD0\x81\xD0\x82\xD0\x83...'
SELECT * FROM t1;
SELECT * FROM t1;
b
b
????
????
...
@@ -39,6 +43,8 @@ SET @@session.character_set_connection = ascii;
...
@@ -39,6 +43,8 @@ SET @@session.character_set_connection = ascii;
SET @@session.character_set_client = latin1;
SET @@session.character_set_client = latin1;
SET @@session.character_set_results = latin1;
SET @@session.character_set_results = latin1;
INSERT INTO t1 VALUES('ЁЂЃЄ');
INSERT INTO t1 VALUES('ЁЂЃЄ');
Warnings:
Warning 1300 Invalid latin1 character string: '\xD0\x81\xD0\x82\xD0\x83...'
SELECT * FROM t1;
SELECT * FROM t1;
b
b
????????
????????
...
...
sql/item.cc
View file @
c773b320
/*
/*
Copyright (c) 2000, 201
4
, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2000, 201
5
, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -5146,45 +5146,55 @@ enum_field_types Item::field_type() const
...
@@ -5146,45 +5146,55 @@ enum_field_types Item::field_type() const
/**
/**
Verifies that the input string is well-formed according to its character set.
Verifies that the input string is well-formed according to its character set.
@param send_error If true, call my_error if string is not well-formed.
@param send_error If true, call my_error if string is not well-formed.
@param truncate If true, set to null/truncate if not well-formed.
Will truncate input string if it is not well-formed.
@return
@return
If well-formed: input string.
If well-formed: input string.
If not well-formed:
If not well-formed:
if strict mode: NULL pointer and we set this Item's value to NULL
if truncate is true and strict mode: NULL pointer and we set this
if not strict mode: input string truncated up to last good character
Item's value to NULL.
if truncate is true and not strict mode: input string truncated up to
last good character.
if truncate is false: input string is returned.
*/
*/
String
*
Item
::
check_well_formed_result
(
String
*
str
,
bool
send_error
)
String
*
Item
::
check_well_formed_result
(
String
*
str
,
bool
send_error
,
bool
truncate
)
{
{
/* Check whether we got a well-formed string */
/* Check whether we got a well-formed string */
CHARSET_INFO
*
cs
=
str
->
charset
();
CHARSET_INFO
*
cs
=
str
->
charset
();
int
well_formed_error
;
uint
wlen
=
cs
->
cset
->
well_formed_len
(
cs
,
size_t
valid_length
;
str
->
ptr
(),
str
->
ptr
()
+
str
->
length
(),
bool
length_error
;
str
->
length
(),
&
well_formed_error
);
if
(
wlen
<
str
->
length
())
if
(
validate_string
(
cs
,
str
->
ptr
(),
str
->
length
(),
&
valid_length
,
&
length_error
))
{
{
const
char
*
str_end
=
str
->
ptr
()
+
str
->
length
();
const
char
*
print_byte
=
str
->
ptr
()
+
valid_length
;
THD
*
thd
=
current_thd
;
THD
*
thd
=
current_thd
;
char
hexbuf
[
7
];
char
hexbuf
[
7
];
uint
diff
=
str
->
length
()
-
wlen
;
uint
diff
=
str
_end
-
print_byte
;
set_if_smaller
(
diff
,
3
);
set_if_smaller
(
diff
,
3
);
octet2hex
(
hexbuf
,
str
->
ptr
()
+
wlen
,
diff
);
octet2hex
(
hexbuf
,
print_byte
,
diff
);
if
(
send_error
)
if
(
send_error
&&
length_error
)
{
{
my_error
(
ER_INVALID_CHARACTER_STRING
,
MYF
(
0
),
my_error
(
ER_INVALID_CHARACTER_STRING
,
MYF
(
0
),
cs
->
csname
,
hexbuf
);
cs
->
csname
,
hexbuf
);
return
0
;
return
0
;
}
}
if
((
thd
->
variables
.
sql_mode
&
if
(
truncate
&&
length_error
)
(
MODE_STRICT_TRANS_TABLES
|
MODE_STRICT_ALL_TABLES
)))
{
null_value
=
1
;
str
=
0
;
}
else
{
{
str
->
length
(
wlen
);
if
((
thd
->
variables
.
sql_mode
&
(
MODE_STRICT_TRANS_TABLES
|
MODE_STRICT_ALL_TABLES
)))
{
null_value
=
1
;
str
=
0
;
}
else
{
str
->
length
(
valid_length
);
}
}
}
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_INVALID_CHARACTER_STRING
,
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_INVALID_CHARACTER_STRING
,
ER
(
ER_INVALID_CHARACTER_STRING
),
cs
->
csname
,
hexbuf
);
ER
(
ER_INVALID_CHARACTER_STRING
),
cs
->
csname
,
hexbuf
);
...
...
sql/item.h
View file @
c773b320
...
@@ -1214,7 +1214,9 @@ public:
...
@@ -1214,7 +1214,9 @@ public:
}
}
virtual
Field
::
geometry_type
get_geometry_type
()
const
virtual
Field
::
geometry_type
get_geometry_type
()
const
{
return
Field
::
GEOM_GEOMETRY
;
};
{
return
Field
::
GEOM_GEOMETRY
;
};
String
*
check_well_formed_result
(
String
*
str
,
bool
send_error
=
0
);
String
*
check_well_formed_result
(
String
*
str
,
bool
send_error
,
bool
truncate
);
bool
eq_by_collation
(
Item
*
item
,
bool
binary_cmp
,
CHARSET_INFO
*
cs
);
bool
eq_by_collation
(
Item
*
item
,
bool
binary_cmp
,
CHARSET_INFO
*
cs
);
uint32
max_char_length
()
const
uint32
max_char_length
()
const
{
return
max_length
/
collation
.
collation
->
mbmaxlen
;
}
{
return
max_length
/
collation
.
collation
->
mbmaxlen
;
}
...
@@ -2193,6 +2195,11 @@ public:
...
@@ -2193,6 +2195,11 @@ public:
decimals
=
NOT_FIXED_DEC
;
decimals
=
NOT_FIXED_DEC
;
// it is constant => can be used without fix_fields (and frequently used)
// it is constant => can be used without fix_fields (and frequently used)
fixed
=
1
;
fixed
=
1
;
/*
Check if the string has any character that can't be
interpreted using the relevant charset.
*/
check_well_formed_result
(
&
str_value
,
false
,
false
);
}
}
/* Just create an item and do not fill string representation */
/* Just create an item and do not fill string representation */
Item_string
(
CHARSET_INFO
*
cs
,
Derivation
dv
=
DERIVATION_COERCIBLE
)
Item_string
(
CHARSET_INFO
*
cs
,
Derivation
dv
=
DERIVATION_COERCIBLE
)
...
...
sql/item_strfunc.cc
View file @
c773b320
/*
/*
Copyright (c) 2000, 201
4
, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2000, 201
5
, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -2652,7 +2652,9 @@ String *Item_func_char::val_str(String *str)
...
@@ -2652,7 +2652,9 @@ String *Item_func_char::val_str(String *str)
}
}
}
}
str
->
realloc
(
str
->
length
());
// Add end 0 (for Purify)
str
->
realloc
(
str
->
length
());
// Add end 0 (for Purify)
return
check_well_formed_result
(
str
);
return
check_well_formed_result
(
str
,
false
,
// send warning
true
);
// truncate
}
}
...
@@ -2818,7 +2820,9 @@ String *Item_func_rpad::val_str(String *str)
...
@@ -2818,7 +2820,9 @@ String *Item_func_rpad::val_str(String *str)
if
(
use_mb
(
rpad
->
charset
()))
if
(
use_mb
(
rpad
->
charset
()))
{
{
// This will chop off any trailing illegal characters from rpad.
// This will chop off any trailing illegal characters from rpad.
String
*
well_formed_pad
=
args
[
2
]
->
check_well_formed_result
(
rpad
,
false
);
String
*
well_formed_pad
=
args
[
2
]
->
check_well_formed_result
(
rpad
,
false
,
//send warning
true
);
//truncate
if
(
!
well_formed_pad
)
if
(
!
well_formed_pad
)
goto
err
;
goto
err
;
}
}
...
@@ -2931,7 +2935,9 @@ String *Item_func_lpad::val_str(String *str)
...
@@ -2931,7 +2935,9 @@ String *Item_func_lpad::val_str(String *str)
if
(
use_mb
(
pad
->
charset
()))
if
(
use_mb
(
pad
->
charset
()))
{
{
// This will chop off any trailing illegal characters from pad.
// This will chop off any trailing illegal characters from pad.
String
*
well_formed_pad
=
args
[
2
]
->
check_well_formed_result
(
pad
,
false
);
String
*
well_formed_pad
=
args
[
2
]
->
check_well_formed_result
(
pad
,
false
,
// send warning
true
);
// truncate
if
(
!
well_formed_pad
)
if
(
!
well_formed_pad
)
goto
err
;
goto
err
;
}
}
...
@@ -3047,7 +3053,9 @@ String *Item_func_conv_charset::val_str(String *str)
...
@@ -3047,7 +3053,9 @@ String *Item_func_conv_charset::val_str(String *str)
}
}
null_value
=
tmp_value
.
copy
(
arg
->
ptr
(),
arg
->
length
(),
arg
->
charset
(),
null_value
=
tmp_value
.
copy
(
arg
->
ptr
(),
arg
->
length
(),
arg
->
charset
(),
conv_charset
,
&
dummy_errors
);
conv_charset
,
&
dummy_errors
);
return
null_value
?
0
:
check_well_formed_result
(
&
tmp_value
);
return
null_value
?
0
:
check_well_formed_result
(
&
tmp_value
,
false
,
// send warning
true
);
// truncate
}
}
void
Item_func_conv_charset
::
fix_length_and_dec
()
void
Item_func_conv_charset
::
fix_length_and_dec
()
...
...
sql/sql_class.cc
View file @
c773b320
...
@@ -1805,21 +1805,17 @@ LEX_STRING *THD::make_lex_string(LEX_STRING *lex_str,
...
@@ -1805,21 +1805,17 @@ LEX_STRING *THD::make_lex_string(LEX_STRING *lex_str,
/*
/*
Convert a string to another character set
Convert a string to another character set
SYNOPSIS
@param to Store new allocated string here
convert_string()
@param to_cs New character set for allocated string
to Store new allocated string here
@param from String to convert
to_cs New character set for allocated string
@param from_length Length of string to convert
from String to convert
@param from_cs Original character set
from_length Length of string to convert
from_cs Original character set
NOTES
@note to will be 0-terminated to make it easy to pass to system funcs
to will be 0-terminated to make it easy to pass to system funcs
RETURN
@retval false ok
0 ok
@retval true End of memory.
1 End of memory.
In this case to->str will point to 0 and to->length will be 0.
In this case to->str will point to 0 and to->length will be 0.
*/
*/
bool
THD
::
convert_string
(
LEX_STRING
*
to
,
CHARSET_INFO
*
to_cs
,
bool
THD
::
convert_string
(
LEX_STRING
*
to
,
CHARSET_INFO
*
to_cs
,
...
@@ -1828,15 +1824,26 @@ bool THD::convert_string(LEX_STRING *to, CHARSET_INFO *to_cs,
...
@@ -1828,15 +1824,26 @@ bool THD::convert_string(LEX_STRING *to, CHARSET_INFO *to_cs,
{
{
DBUG_ENTER
(
"convert_string"
);
DBUG_ENTER
(
"convert_string"
);
size_t
new_length
=
to_cs
->
mbmaxlen
*
from_length
;
size_t
new_length
=
to_cs
->
mbmaxlen
*
from_length
;
uint
dummy_errors
;
uint
errors
=
0
;
if
(
!
(
to
->
str
=
(
char
*
)
alloc
(
new_length
+
1
)))
if
(
!
(
to
->
str
=
(
char
*
)
alloc
(
new_length
+
1
)))
{
{
to
->
length
=
0
;
// Safety fix
to
->
length
=
0
;
// Safety fix
DBUG_RETURN
(
1
);
// EOM
DBUG_RETURN
(
1
);
// EOM
}
}
to
->
length
=
copy_and_convert
((
char
*
)
to
->
str
,
new_length
,
to_cs
,
to
->
length
=
copy_and_convert
((
char
*
)
to
->
str
,
new_length
,
to_cs
,
from
,
from_length
,
from_cs
,
&
dummy_
errors
);
from
,
from_length
,
from_cs
,
&
errors
);
to
->
str
[
to
->
length
]
=
0
;
// Safety
to
->
str
[
to
->
length
]
=
0
;
// Safety
if
(
errors
!=
0
)
{
char
printable_buff
[
32
];
convert_to_printable
(
printable_buff
,
sizeof
(
printable_buff
),
from
,
from_length
,
from_cs
,
6
);
push_warning_printf
(
this
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_INVALID_CHARACTER_STRING
,
ER_THD
(
this
,
ER_INVALID_CHARACTER_STRING
),
from_cs
->
csname
,
printable_buff
);
}
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
...
...
sql/sql_string.cc
View file @
c773b320
/* Copyright (c) 2000, 201
3
, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2000, 201
5
, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -1281,3 +1281,69 @@ uint convert_to_printable(char *to, size_t to_len,
...
@@ -1281,3 +1281,69 @@ uint convert_to_printable(char *to, size_t to_len,
*
t
=
'\0'
;
*
t
=
'\0'
;
return
t
-
to
;
return
t
-
to
;
}
}
/**
Check if an input byte sequence is a valid character string of a given charset
@param cs The input character set.
@param str The input byte sequence to validate.
@param length A byte length of the str.
@param [out] valid_length A byte length of a valid prefix of the str.
@param [out] length_error True in the case of a character length error:
some byte[s] in the input is not a valid
prefix for a character, i.e. the byte length
of that invalid character is undefined.
@retval true if the whole input byte sequence is a valid character string.
The length_error output parameter is undefined.
@return
if the whole input byte sequence is a valid character string
then
return false
else
if the length of some character in the input is undefined (MY_CS_ILSEQ)
or the last character is truncated (MY_CS_TOOSMALL)
then
*length_error= true; // fatal error!
else
*length_error= false; // non-fatal error: there is no wide character
// encoding for some input character
return true
*/
bool
validate_string
(
CHARSET_INFO
*
cs
,
const
char
*
str
,
uint32
length
,
size_t
*
valid_length
,
bool
*
length_error
)
{
if
(
cs
->
mbmaxlen
>
1
)
{
int
well_formed_error
;
*
valid_length
=
cs
->
cset
->
well_formed_len
(
cs
,
str
,
str
+
length
,
length
,
&
well_formed_error
);
*
length_error
=
well_formed_error
;
return
well_formed_error
;
}
/*
well_formed_len() is not functional on single-byte character sets,
so use mb_wc() instead:
*/
*
length_error
=
false
;
const
uchar
*
from
=
reinterpret_cast
<
const
uchar
*>
(
str
);
const
uchar
*
from_end
=
from
+
length
;
my_charset_conv_mb_wc
mb_wc
=
cs
->
cset
->
mb_wc
;
while
(
from
<
from_end
)
{
my_wc_t
wc
;
int
cnvres
=
(
*
mb_wc
)(
cs
,
&
wc
,
(
uchar
*
)
from
,
from_end
);
if
(
cnvres
<=
0
)
{
*
valid_length
=
from
-
reinterpret_cast
<
const
uchar
*>
(
str
);
return
true
;
}
from
+=
cnvres
;
}
*
valid_length
=
length
;
return
false
;
}
sql/sql_string.h
View file @
c773b320
#ifndef SQL_STRING_INCLUDED
#ifndef SQL_STRING_INCLUDED
#define SQL_STRING_INCLUDED
#define SQL_STRING_INCLUDED
/* Copyright (c) 2000, 201
3
, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2000, 201
5
, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -432,4 +432,7 @@ static inline bool check_if_only_end_space(CHARSET_INFO *cs, char *str,
...
@@ -432,4 +432,7 @@ static inline bool check_if_only_end_space(CHARSET_INFO *cs, char *str,
return
str
+
cs
->
cset
->
scan
(
cs
,
str
,
end
,
MY_SEQ_SPACES
)
==
end
;
return
str
+
cs
->
cset
->
scan
(
cs
,
str
,
end
,
MY_SEQ_SPACES
)
==
end
;
}
}
bool
validate_string
(
CHARSET_INFO
*
cs
,
const
char
*
str
,
uint32
length
,
size_t
*
valid_length
,
bool
*
length_error
);
#endif
/* SQL_STRING_INCLUDED */
#endif
/* SQL_STRING_INCLUDED */
sql/sql_yacc.yy
View file @
c773b320
...
@@ -11932,7 +11932,9 @@ literal:
...
@@ -11932,7 +11932,9 @@ literal:
str ? str->length() : 0,
str ? str->length() : 0,
$1);
$1);
if (!item_str ||
if (!item_str ||
!item_str->check_well_formed_result(&item_str->str_value, TRUE))
!item_str->check_well_formed_result(&item_str->str_value,
true, //send error
true)) //truncate
{
{
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
...
@@ -11961,7 +11963,9 @@ literal:
...
@@ -11961,7 +11963,9 @@ literal:
str ? str->length() : 0,
str ? str->length() : 0,
$1);
$1);
if (!item_str ||
if (!item_str ||
!item_str->check_well_formed_result(&item_str->str_value, TRUE))
!item_str->check_well_formed_result(&item_str->str_value,
true, //send error
true)) //truncate
{
{
MYSQL_YYABORT;
MYSQL_YYABORT;
}
}
...
...
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