mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

LP BUG#978847 fixed.

Browse source 
Fixed incorrect type casting which made all fields (except very first) changes to materialized table incorrect.
Saved list of view/derived table used items after expanding '*'.
This commit is contained in:
unknown 2012-04-19 09:16:30 +03:00
parent b9bbe4a18b
commit 9997b78ae4
4 changed files with 84 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
mysql-test/r/derived_view.result
View file

@ -2034,6 +2034,59 @@ a
drop table t1,t2;
set optimizer_switch=@save968720_optimizer_switch;
#
# LP BUG#978847 Server crashes in Item_ref::real_item on
# INSERT .. SELECT with FROM subquery and derived_merge=ON
SET @save978847_optimizer_switch=@@optimizer_switch;
SET optimizer_switch = 'derived_merge=on';
CREATE TABLE t1 ( a INT, b INT );
INSERT INTO t1 VALUES (2,1),(3,2);
select * from t1;
a b
2 1
3 2
INSERT INTO t1 SELECT * FROM
( SELECT * FROM t1 ) AS alias;
select * from t1;
a b
2 1
3 2
2 1
3 2
prepare stmt1 from 'INSERT INTO t1 SELECT SQL_BIG_RESULT * FROM
( SELECT * FROM t1 ) AS alias';
execute stmt1;
select * from t1;
a b
2 1
3 2
2 1
3 2
2 1
3 2
2 1
3 2
execute stmt1;
select * from t1;
a b
2 1
3 2
2 1
3 2
2 1
3 2
2 1
3 2
2 1
3 2
2 1
3 2
2 1
3 2
2 1
3 2
drop table t1;
set optimizer_switch=@save978847_optimizer_switch;
#
# end of 5.3 tests
#
set optimizer_switch=@exit_optimizer_switch;

24
mysql-test/t/derived_view.test
View file

@ -1413,6 +1413,30 @@ SELECT * FROM t1;
drop table t1,t2;
set optimizer_switch=@save968720_optimizer_switch;
--echo #
--echo # LP BUG#978847 Server crashes in Item_ref::real_item on
--echo # INSERT .. SELECT with FROM subquery and derived_merge=ON
SET @save978847_optimizer_switch=@@optimizer_switch;
SET optimizer_switch = 'derived_merge=on';
CREATE TABLE t1 ( a INT, b INT );
INSERT INTO t1 VALUES (2,1),(3,2);
select * from t1;
INSERT INTO t1 SELECT * FROM
( SELECT * FROM t1 ) AS alias;
select * from t1;
prepare stmt1 from 'INSERT INTO t1 SELECT SQL_BIG_RESULT * FROM
( SELECT * FROM t1 ) AS alias';
execute stmt1;
select * from t1;
execute stmt1;
select * from t1;
drop table t1;
set optimizer_switch=@save978847_optimizer_switch;
--echo #
--echo # end of 5.3 tests
--echo #

5
sql/sql_base.cc
View file

@ -8326,6 +8326,11 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
}
}
#endif
/*
field_iterator.create_item() builds used_items which we
have to save because changes made once and they are persistent
*/
tables->persistent_used_items= tables->used_items;
if ((field= field_iterator.field()))
{

3
sql/table.cc
View file

@ -6088,7 +6088,8 @@ bool TABLE_LIST::change_refs_to_fields()
We need to restore the pointers after the execution of the
prepared statement.
*/
thd->change_item_tree((Item **)&ref->ref, (Item*)materialized_items + idx);
thd->change_item_tree((Item **)&ref->ref,
(Item*)(materialized_items + idx));
}
return FALSE;