bzr push into mysql-trunk branch (vasil.dimov:3858 to 3859)

[vasil.dimov]

 3859 Vasil Dimov	2012-02-08
      Fix compilation failure when compiling with partitioning disabled.
      partition_names is not defined in this case.
      
      Reviewed by:	mattiasj (via IM)

    modified:
      sql/sql_lex.cc
 3858 Rohit Kalhans	2012-02-08 [merge]
      null merge from mysql-5.5 -> mysql-trunk

=== modified file 'sql/sql_lex.cc'
--- a/sql/sql_lex.cc	revid:rohit.kalhans@stripped
+++ b/sql/sql_lex.cc	revid:vasil.dimov@stripped
@@ -2494,6 +2494,7 @@ void TABLE_LIST::print(THD *thd, String 
         append_identifier(thd, str, table_name, table_name_length);
         cmp_name= table_name;
       }
+#ifdef WITH_PARTITION_STORAGE_ENGINE
       if (partition_names && partition_names->elements)
       {
         int i, num_parts= partition_names->elements;
@@ -2508,6 +2509,7 @@ void TABLE_LIST::print(THD *thd, String 
         }
         str->append(')');
       }
+#endif /* WITH_PARTITION_STORAGE_ENGINE */
     }
     if (my_strcasecmp(table_alias_charset, cmp_name, alias))
     {

No bundle (reason: useless for push emails).