From: Date: February 14 2006 9:52am
Subject: bk commit into 5.1 tree (gluh:1.2098) BUG#16695
List-Archive: http://lists.mysql.com/commits/2576
X-Bug: 16695
Message-Id: <20060214085249.CA8F05288D4@eagle.intranet.mysql.r18.ru>

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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.2098 06/02/14 12:52:38 gluh@stripped +1 -0
  Bug#16591 Partitions: crash using information_schema.partitions
  Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
   issue a warning in case of error during table opening

  sql/sql_show.cc
    1.304 06/02/14 12:52:31 gluh@stripped +5 -5
    Bug#16591 Partitions: crash using information_schema.partitions
    Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
     issue a warning in case of error during table opening

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.1-new

--- 1.303/sql/sql_show.cc	Tue Feb 14 00:55:41 2006
+++ 1.304/sql/sql_show.cc	Tue Feb 14 12:52:31 2006
@@ -3583,23 +3583,23 @@ static int get_schema_partitions_record(
   String tmp_str;
   TIME time;
   TABLE *show_table= tables->table;
-  handler *file= show_table->file;
+  handler *file;
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-  partition_info *part_info= show_table->part_info;
+  partition_info *part_info;
 #endif
   DBUG_ENTER("get_schema_partitions_record");
 
   if (res)
   {
-#ifdef WITH_PARTITION_STORAGE_ENGINE
-    if (part_info)
+    if (!tables->view)
       push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                    thd->net.last_errno, thd->net.last_error);
-#endif
     thd->clear_error();
     DBUG_RETURN(0);
   }
+  file= show_table->file;
 #ifdef WITH_PARTITION_STORAGE_ENGINE
+  part_info= show_table->part_info;
   if (part_info)
   {
     partition_element *part_elem;