Bugs, found by valgrind

MariaDB · Oct 5, 2015 · d8df2b9 · d8df2b9
1 parent ae2cdc1
commit d8df2b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -6278,8 +6278,8 @@ longlong Item_equal::val_int()
   while ((item= it++))
   {
     Field *field= it.get_curr_field();
-    /* Skip fields of non-const tables. They haven't been read yet */
-    if (field->table->const_table)
+    /* Skip fields of tables that has not been read yet */
+    if (!field->table->status || (field->table->status & STATUS_NULL_ROW))
     {
       if (eval_item->cmp(item) || (null_value= item->null_value))
         return 0;

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -24183,6 +24183,8 @@ int JOIN::save_explain_data_intern(Explain_query *output, bool need_tmp_table,
 
     explain->select_id= join->select_lex->select_number;
     explain->select_type= join->select_lex->type;
+    explain->using_temporary= need_tmp;
+    explain->using_filesort=  need_order;
     /* Setting explain->message means that all other members are invalid */
     explain->message= message;