maria-developers team mailing list archive

[Sergei Petrunia <psergey@xxxxxxxxxxxx>]

Hi Sanja,

On Thu, Jul 18, 2013 at 11:16:21AM +0300, sanja@xxxxxxxxxxxxxxxx wrote:
> At file:///home/bell/maria/bzr/work-maria-5.5-valgrind/
> 
> ------------------------------------------------------------
> revno: 3839
> revision-id: sanja@xxxxxxxxxxxxxxxx-20130718081618-6ax63urznfnqmzgt
> parent: sanja@xxxxxxxxxxxxxxxx-20130717140359-123bw8dzelj6wddn
> committer: sanja@xxxxxxxxxxxxxxxx
> branch nick: work-maria-5.5-valgrind
> timestamp: Thu 2013-07-18 11:16:18 +0300
> message:
>   Fix of using uninitialized variadle.

> === modified file 'sql/sql_select.cc'
> --- a/sql/sql_select.cc	2013-07-17 13:42:13 +0000
> +++ b/sql/sql_select.cc	2013-07-18 08:16:18 +0000
> @@ -15674,6 +15674,8 @@ create_internal_tmp_table_from_heap2(THD
>    const char *save_proc_info;
>    int write_err= 0;
>    DBUG_ENTER("create_internal_tmp_table_from_heap2");
> +  if (is_duplicate)
> +    *is_duplicate= FALSE;
>  
>    if (table->s->db_type() != heap_hton || 
>        error != HA_ERR_RECORD_FILE_FULL)
> 
> === modified file 'sql/sql_union.cc'
> --- a/sql/sql_union.cc	2013-07-16 05:22:17 +0000
> +++ b/sql/sql_union.cc	2013-07-18 08:16:18 +0000
> @@ -83,7 +83,7 @@ int select_union::send_data(List<Item> &
>        */
>        return -1;
>      }
> -    bool is_duplicate;
> +    bool is_duplicate= FALSE;
If you do the part in create_internal_tmp_table_from_heap2(), is this change
really necessary?

>      /* create_internal_tmp_table_from_heap will generate error if needed */
>      if (table->file->is_fatal_error(write_err, HA_CHECK_DUP) &&
>          create_internal_tmp_table_from_heap(thd, table,
> 

Ok to push either way.

BR
 Sergei
-- 
Sergei Petrunia, Software Developer
Monty Program AB, http://askmonty.org
Blog: http://s.petrunia.net/blog