1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A fix (Bug #4878: Service crashes on query execution)

Browse Source
This commit is contained in:
ram@gw.mysql.r18.ru 2004-08-12 11:28:39 +05:00
parent 31c0ecb28e
commit 74c64904c7
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/func_str.result
View File

@ -673,3 +673,6 @@ c1 c2
2147483647 4294967295 2147483647 4294967295
-2147483648 0 -2147483648 0
drop table t1; drop table t1;
select left(1234, 3) + 0;
left(1234, 3) + 0
123

6
mysql-test/t/func_str.test
View File

@ -402,3 +402,9 @@ insert into t1 values ('-21474836461','-21474836461');
show warnings; show warnings;
select * from t1; select * from t1;
drop table t1; drop table t1;
#
# Bug #4878: LEFT() in integer/float context
#
select left(1234, 3) + 0;

5
sql/item_strfunc.cc
View File

@ -984,7 +984,10 @@ String *Item_func_left::val_str(String *str)
return &my_empty_string; return &my_empty_string;
if (res->length() <= (uint) length) if (res->length() <= (uint) length)
return res; return res;
str_value.set(*res, 0, res->charpos(length)); if (&str_value == res)
str_value.length(res->charpos(length));
else
str_value.set(*res, 0, res->charpos(length));
return &str_value; return &str_value;
} }

1
sql/sql_string.h
View File

@ -98,6 +98,7 @@ public:
void set(String &str,uint32 offset,uint32 arg_length) void set(String &str,uint32 offset,uint32 arg_length)
{ {
DBUG_ASSERT(&str != this);
free(); free();
Ptr=(char*) str.ptr()+offset; str_length=arg_length; alloced=0; Ptr=(char*) str.ptr()+offset; str_length=arg_length; alloced=0;
if (str.Alloced_length) if (str.Alloced_length)