1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
This commit is contained in:
unknown 2006-02-14 12:53:49 +04:00
commit e98c80737f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_show.cc
View File

@ -3583,23 +3583,23 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
String tmp_str; String tmp_str;
TIME time; TIME time;
TABLE *show_table= tables->table; TABLE *show_table= tables->table;
handler *file= show_table->file; handler *file;
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *part_info= show_table->part_info; partition_info *part_info;
#endif #endif
DBUG_ENTER("get_schema_partitions_record"); DBUG_ENTER("get_schema_partitions_record");
if (res) if (res)
{ {
#ifdef WITH_PARTITION_STORAGE_ENGINE if (!tables->view)
if (part_info)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
thd->net.last_errno, thd->net.last_error); thd->net.last_errno, thd->net.last_error);
#endif
thd->clear_error(); thd->clear_error();
DBUG_RETURN(0); DBUG_RETURN(0);
} }
file= show_table->file;
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
part_info= show_table->part_info;
if (part_info) if (part_info)
{ {
partition_element *part_elem; partition_element *part_elem;