database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Auto-merged fix for the bug#48508.

Browse Source
This commit is contained in:
Evgeny Potemkin
2009-12-02 16:47:12 +03:00
parent ee136e3fa5 7853f553be
commit d969cbc578
5 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/r/ps.result
View File

@ -1891,4 +1891,27 @@ execute stmt using @arg;
? ?
-12345.5432100000 -12345.5432100000
deallocate prepare stmt; deallocate prepare stmt;
#
# Bug#48508: Crash on prepared statement re-execution.
#
create table t1(b int);
insert into t1 values (0);
create view v1 AS select 1 as a from t1 where b;
prepare stmt from "select * from v1 where a";
execute stmt;
a
execute stmt;
a
drop table t1;
drop view v1;
create table t1(a bigint);
create table t2(b tinyint);
insert into t2 values (null);
prepare stmt from "select 1 from t1 join t2 on a xor b where b > 1 and a =1";
execute stmt;
1
execute stmt;
1
drop table t1,t2;
#
End of 5.0 tests. End of 5.0 tests.

21
mysql-test/t/ps.test
View File

@ -1973,4 +1973,25 @@ select @arg;
execute stmt using @arg; execute stmt using @arg;
deallocate prepare stmt; deallocate prepare stmt;
--echo #
--echo # Bug#48508: Crash on prepared statement re-execution.
--echo #
create table t1(b int);
insert into t1 values (0);
create view v1 AS select 1 as a from t1 where b;
prepare stmt from "select * from v1 where a";
execute stmt;
execute stmt;
drop table t1;
drop view v1;
create table t1(a bigint);
create table t2(b tinyint);
insert into t2 values (null);
prepare stmt from "select 1 from t1 join t2 on a xor b where b > 1 and a =1";
execute stmt;
execute stmt;
drop table t1,t2;
--echo #
--echo End of 5.0 tests. --echo End of 5.0 tests.

2
sql/item_cmpfunc.cc
View File

@ -3907,7 +3907,7 @@ Item *Item_cond::compile(Item_analyzer analyzer, byte **arg_p,
byte *arg_v= *arg_p; byte *arg_v= *arg_p;
Item *new_item= item->compile(analyzer, &arg_v, transformer, arg_t); Item *new_item= item->compile(analyzer, &arg_v, transformer, arg_t);
if (new_item && new_item != item) if (new_item && new_item != item)
li.replace(new_item); current_thd->change_item_tree(li.ref(), new_item);
} }
return Item_func::transform(transformer, arg_t); return Item_func::transform(transformer, arg_t);
} }

3
sql/sql_base.cc
View File

@ -3481,7 +3481,8 @@ find_field_in_view(THD *thd, TABLE_LIST *table_list,
if (!my_strcasecmp(system_charset_info, field_it.name(), name)) if (!my_strcasecmp(system_charset_info, field_it.name(), name))
{ {
// in PS use own arena or data will be freed after prepare // in PS use own arena or data will be freed after prepare
if (register_tree_change && thd->stmt_arena->is_stmt_prepare_or_first_sp_execute()) if (register_tree_change &&
thd->stmt_arena->is_stmt_prepare_or_first_stmt_execute())
arena= thd->activate_stmt_arena_if_needed(&backup); arena= thd->activate_stmt_arena_if_needed(&backup);
/* /*
create_item() may, or may not create a new Item, depending on create_item() may, or may not create a new Item, depending on

2
sql/sql_class.h
View File

@ -759,6 +759,8 @@ public:
{ return state == INITIALIZED_FOR_SP; } { return state == INITIALIZED_FOR_SP; }
inline bool is_stmt_prepare_or_first_sp_execute() const inline bool is_stmt_prepare_or_first_sp_execute() const
{ return (int)state < (int)PREPARED; } { return (int)state < (int)PREPARED; }
inline bool is_stmt_prepare_or_first_stmt_execute() const
{ return (int)state <= (int)PREPARED; }
inline bool is_first_stmt_execute() const { return state == PREPARED; } inline bool is_first_stmt_execute() const { return state == PREPARED; }
inline bool is_stmt_execute() const inline bool is_stmt_execute() const
{ return state == PREPARED || state == EXECUTED; } { return state == PREPARED || state == EXECUTED; }