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

into mysql.com:/home/mydev/mysql-5.1-bug5390

Merge mysql.com:/home/mydev/mysql-5.1
into mysql.com:/home/mydev/mysql-5.1-bug5390
b3803a49 · ingo@mysql.com · 864f5756 · 530cddb6 · b3803a49
Commit b3803a49 authored Dec 26, 2005 by ingo@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_select.cc sql/sql_select.cc +1 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -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.