Commit caa73f22 authored by Sergey Glukhov's avatar Sergey Glukhov

automerge

parents 903c4dcf fbb6efeb
...@@ -155,3 +155,18 @@ id select_type table type possible_keys key key_len ref rows filtered Extra ...@@ -155,3 +155,18 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
Warnings: Warnings:
Note 1003 select 1 AS `1` from (select count(distinct `test`.`t1`.`a`) AS `COUNT(DISTINCT t1.a)` from `test`.`t1` join `test`.`t2` group by `test`.`t1`.`a`) `s1` Note 1003 select 1 AS `1` from (select count(distinct `test`.`t1`.`a`) AS `COUNT(DISTINCT t1.a)` from `test`.`t1` join `test`.`t2` group by `test`.`t1`.`a`) `s1`
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# Bug#37870: Usage of uninitialized value caused failed assertion.
#
create table t1 (dt datetime not null);
create table t2 (dt datetime not null);
insert into t1 values ('2001-01-01 1:1:1'), ('2001-01-01 1:1:1');
insert into t2 values ('2001-01-01 1:1:1'), ('2001-01-01 1:1:1');
flush tables;
EXPLAIN SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN (SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.dt IS NULL );
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY OUTR ALL NULL NULL NULL NULL 2 Using where
2 DEPENDENT SUBQUERY INNR ALL NULL NULL NULL NULL 2 Using where
SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN (SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.dt IS NULL );
dt
drop tables t1, t2;
...@@ -123,4 +123,16 @@ execute s1; ...@@ -123,4 +123,16 @@ execute s1;
DROP TABLE t1,t2; DROP TABLE t1,t2;
--echo #
--echo # Bug#37870: Usage of uninitialized value caused failed assertion.
--echo #
create table t1 (dt datetime not null);
create table t2 (dt datetime not null);
insert into t1 values ('2001-01-01 1:1:1'), ('2001-01-01 1:1:1');
insert into t2 values ('2001-01-01 1:1:1'), ('2001-01-01 1:1:1');
flush tables;
EXPLAIN SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN (SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.dt IS NULL );
SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN (SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.dt IS NULL );
drop tables t1, t2;
# End of 5.0 tests. # End of 5.0 tests.
...@@ -415,8 +415,9 @@ static bool convert_constant_item(THD *thd, Item_field *field_item, ...@@ -415,8 +415,9 @@ static bool convert_constant_item(THD *thd, Item_field *field_item,
/* /*
Store the value of the field if it references an outer field because Store the value of the field if it references an outer field because
the call to save_in_field below overrides that value. the call to save_in_field below overrides that value.
Don't store it for EXPLAIN since it's not initialized.
*/ */
if (field_item->depended_from) if (field_item->depended_from && !thd->lex->describe)
orig_field_val= field->val_int(); orig_field_val= field->val_int();
if (!(*item)->is_null() && !(*item)->save_in_field(field, 1)) if (!(*item)->is_null() && !(*item)->save_in_field(field, 1))
{ {
...@@ -427,7 +428,7 @@ static bool convert_constant_item(THD *thd, Item_field *field_item, ...@@ -427,7 +428,7 @@ static bool convert_constant_item(THD *thd, Item_field *field_item,
result= 1; // Item was replaced result= 1; // Item was replaced
} }
/* Restore the original field value. */ /* Restore the original field value. */
if (field_item->depended_from) if (field_item->depended_from && !thd->lex->describe)
{ {
result= field->store(orig_field_val, TRUE); result= field->store(orig_field_val, TRUE);
/* orig_field_val must be a valid value that can be restored back. */ /* orig_field_val must be a valid value that can be restored back. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment