after merge fix
This commit is contained in:
parent
937504e7a0
commit
048cb42dbf
@ -9958,7 +9958,7 @@ literal:
|
|||||||
$$= new Item_string(NULL, /* name will be set in select_item */
|
$$= new Item_string(NULL, /* name will be set in select_item */
|
||||||
str ? str->ptr() : "",
|
str ? str->ptr() : "",
|
||||||
str ? str->length() : 0,
|
str ? str->length() : 0,
|
||||||
Lex->underscore_charset);
|
$1);
|
||||||
if ($$ && !$$->check_well_formed_result(&$$->str_value))
|
if ($$ && !$$->check_well_formed_result(&$$->str_value))
|
||||||
{
|
{
|
||||||
$$= new Item_null();
|
$$= new Item_null();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user