diff options
| author | unknown <konstantin@mysql.com> | 2004-10-22 20:21:55 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-10-22 20:21:55 +0400 |
| commit | 1cd249e0edb9aeeb46686ef548a4901c5a5340b2 (patch) | |
| tree | c948d54877b78b0e413be75c01fccd4eb2245aaf /sql/sql_union.cc | |
| parent | 4edadc7949ef9098db02e7d8f897989719d55c8e (diff) | |
| download | mariadb-git-1cd249e0edb9aeeb46686ef548a4901c5a5340b2.tar.gz | |
Followup to fix for bug#6050: fix valgrind warnings.
sql/item.cc:
Fix valgrind errors: we need Item::name to point to PS memory
as well.
sql/item.h:
set_field no longer can be reused as is for PS purposes.
sql/sql_union.cc:
Item_field::set_field -> Item_field::reset_field.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index cd1127f9683..44004e1238d 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -360,7 +360,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, { Item_field *item_field= (Item_field*) it++; DBUG_ASSERT(item_field); - item_field->set_field(*field); + item_field->reset_field(*field); } } } |