Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/alexi/innodb/mysql-5.1-merged

sql/sql_show.cc

@@ -2722,9 +2722,9 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
                   ha_row_type[(uint) share->row_type],
                   NullS);
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-    if (share->db_type == &partition_hton &&
-        share->partition_info != NULL && 
-        ((partition_info*)share->partition_info)->no_parts > 0)
+    if (show_table->s->db_type == &partition_hton && 
+        show_table->part_info != NULL && 
+        show_table->part_info->no_parts > 0)
       ptr= strmov(ptr, " partitioned");
 #endif
     table->field[19]->store(option_buff+1,