bk commit into 5.1 tree (sergefp:1.1996)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1996 05/12/26 19:46:06 sergefp@stripped +1 -0
  WL#2985: fix typo bug when partitioning is not compiled in

  sql/sql_select.cc
    1.380 05/12/26 19:45:58 sergefp@stripped +1 -1
    WL#2985: fix typo bug when partitioning is not compiled in

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.1-ppruning-r4-fix

--- 1.379/sql/sql_select.cc	2005-12-26 14:53:40 +03:00
+++ 1.380/sql/sql_select.cc	2005-12-26 19:45:58 +03:00
@@ -2036,7 +2036,7 @@
 #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.