Commit ceb41693 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-bug5390
parents 78ac54aa 3862ee76

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -2036,7 +2036,7 @@ make_join_statistics(JOIN *join, TABLE_LIST *tables, COND *conds, 
#ifdef WITH_PARTITION_STORAGE_ENGINE

      if ((!table->file->records || table->no_partitions_used) && !embedding)

#else

      if (!table->file->records || && !embedding)

      if (!table->file->records && !embedding)

#endif

      {						// Empty table

        s->dependent= 0;                        // Ignore LEFT JOIN depend.