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

MDEV-241 lp:992722 - Server crashes in get_datetime_value

Browse Source 
Create an Item_cache based on item's cmp_type, not result_type in 
subselect_engine.

Use result_field in Item_cache_temporal::cache_value(),
just like all other Item_cache*::cache_value() do.
This commit is contained in:
Sergei Golubchik 2012-05-02 15:22:47 +02:00
parent 6920491587
commit beec2a2b1d
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/in_datetime_241.result Normal file
View File

@ -0,0 +1,5 @@
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 ( a DATE );
SELECT * FROM t1 WHERE ( SELECT a FROM t1 ) IN ('2012-04-25','2012-04-26');
a
DROP TABLE t1;

9
mysql-test/t/in_datetime_241.test Normal file
View File

@ -0,0 +1,9 @@
#
# MDEV-241 lp:992722 - Server crashes in get_datetime_value
#
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
CREATE TABLE t1 ( a DATE );
SELECT * FROM t1 WHERE ( SELECT a FROM t1 ) IN ('2012-04-25','2012-04-26');
DROP TABLE t1;

2
sql/item.cc
View File

@ -8329,7 +8329,7 @@ bool Item_cache_temporal::cache_value()
value_cached= true; value_cached= true;
MYSQL_TIME ltime; MYSQL_TIME ltime;
if (example->get_date(&ltime, TIME_FUZZY_DATE)) if (example->get_date_result(&ltime, TIME_FUZZY_DATE))
value=0; value=0;
else else
value= pack_time(&ltime); value= pack_time(&ltime);

2
sql/item_subselect.cc
View File

@ -2893,7 +2893,7 @@ void subselect_engine::set_row(List<Item> &item_list, Item_cache **row)
item->decimals= sel_item->decimals; item->decimals= sel_item->decimals;
item->unsigned_flag= sel_item->unsigned_flag; item->unsigned_flag= sel_item->unsigned_flag;
maybe_null= sel_item->maybe_null; maybe_null= sel_item->maybe_null;
if (!(row[i]= Item_cache::get_cache(sel_item))) if (!(row[i]= Item_cache::get_cache(sel_item, sel_item->cmp_type())))
return; return;
row[i]->setup(sel_item); row[i]->setup(sel_item);
//psergey-backport-timours: row[i]->store(sel_item); //psergey-backport-timours: row[i]->store(sel_item);